Merge pull request #15 from contentstack/embedded_items

Embedded items feature support added

Author: uttamukkoji

.gitignore

@@ -8,4 +8,4 @@ coverage
 .DS_Store
 .bundle/
 */rspec_results.html
-vendor/
+vendor/

Gemfile

@@ -1,8 +1,3 @@
 # Gemfile
 source "https://rubygems.org"
-
-gem "rspec"
-gem "webmock"
-gem "simplecov"
-gem "activesupport"
-gem "yard"
+gemspec

Gemfile.lock

@@ -1,61 +1,75 @@
+PATH
+  remote: .
+  specs:
+    contentstack (0.2.0)
+      activesupport (> 3.2.5)
+      contentstack_utils (~> 1.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    concurrent-ruby (1.1.8)
+    contentstack_utils (1.0.0)
+      activesupport (~> 6.1.0)
+      nokogiri (~> 1.11.0)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     hashdiff (1.0.1)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    public_suffix (4.0.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    minitest (5.14.4)
+    nokogiri (1.11.2-arm64-darwin)
+      racc (~> 1.4)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    safe_yaml (1.0.5)
-    simplecov (0.18.5)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    webmock (3.8.3)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    webmock (3.11.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.25)
-    zeitwerk (2.3.0)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  universal-darwin-19
 
 DEPENDENCIES
-  activesupport
-  rspec
-  simplecov
-  webmock
-  yard
+  contentstack!
+  rspec (~> 3.10.0)
+  simplecov (~> 0.21.1)
+  webmock (~> 3.11.0)
+  yard (~> 0.9.26)
 
 BUNDLED WITH
-   2.1.4
+   2.2.7

contentstack.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activesupport', "> 3.2.5"
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'simplecov'
+  s.add_dependency "contentstack_utils", "~> 1.0.0"
+  
+  s.add_development_dependency 'rspec', '~> 3.10.0'
+  s.add_development_dependency 'webmock', '~> 3.11.0'
+  s.add_development_dependency 'simplecov', '~> 0.21.1'
+  s.add_development_dependency 'yard', '~> 0.9.26'
 end

lib/contentstack.rb

@@ -3,6 +3,7 @@
 require "contentstack/version"
 require "contentstack/client"
 require "contentstack/region"
+require "contentstack_utils"
 require "util"
 
 
@@ -22,4 +23,7 @@
 # ==== Query entries
 #   @stack.content_type('blog').query.regex('title', '.*hello.*').fetch
 module Contentstack
+    def self.render_content(content, options)
+        ContentstackUtils.render_content(content, options)
+    end
 end

lib/contentstack/entry.rb

@@ -152,6 +152,19 @@ def include_fallback(flag=true)
       self
     end
 
+    # Include Embedded Objects (Entries and Assets) along with entry/entries details.
+    #
+    # Example
+    #
+    #    @entry = @stack.content_type('product').entry(entry_uid)
+    #    @entry.include_embedded_items
+    #
+    # @return [Contentstack::Query]
+    def include_embedded_items()
+      @query[:include_embedded_items] = ['BASE']
+      self
+    end
+
     #
     # @return [Contentstack::Query]
     def include(field_uids)

lib/contentstack/query.rb

@@ -516,6 +516,19 @@ def include_fallback(flag=true)
       self
     end
 
+    # Include Embedded Objects (Entries and Assets) along with entry/entries details.
+    #
+    # Example
+    #
+    #    @query = @stack.content_type('product').query
+    #    @query.include_embedded_items
+    #
+    # @return [Contentstack::Query]
+    def include_embedded_items()
+      @query[:include_embedded_items] = ['BASE']
+      self
+    end
+
     # Include objects in 'Draft' mode in response
     #
     # Example

lib/contentstack/version.rb

@@ -1,3 +1,3 @@
 module Contentstack
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end