delivery-sdk-ruby 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c913795034972c715d77eaef5ef1d13c9a8615e4b6d87b9afcd4579fdd33795
-  data.tar.gz: a345e35c29c7cea72ccd1b86f059fbe388d09b2bb5b187963ef90e852fc4f729
+  metadata.gz: b78db9a74f7389d472bbc2ccb4e2abba26285835999c09bbe4a01bf5886b371e
+  data.tar.gz: fd1c7b62a50e45245569d48e136252011d780186ff15d2e1a972f7b032c40fce
 SHA512:
-  metadata.gz: 38e452048f7c53067e1b875dde68c1424c3bbda6f03f3cb613be48d04fbb431b81c8ce09931f467d616ed4fb5749d647f361afc0febbf30e3fa76f3f652f8639
-  data.tar.gz: 463ba10303423bade0c59538b58795d469e48cc1213fe14e1004180bb367f3138c7e5cec10fd56cd30f6f1951196c5d8fc31a388e9bbbbc76982ac1bf867d73d
+  metadata.gz: 45395875e18f12f54946d5c0638b1fbe6f9ceec2f1b5e47e168d604e1e566be77ba83cfca69ce829e0ce258003148a6bf0decdd23e96a9d7967dc01fb509156f
+  data.tar.gz: 208f83cb6e927c857a37cd6a152cdecb58715eb9055248453410ff44b17ca603b82743c0785a7301c028e76d3337859af451c1d7af5459d507705c2d0bc6cb52

data/README.md

@@ -1,9 +1,16 @@
- [![Join the chat at https://kentico-community.slack.com](https://img.shields.io/badge/join-slack-E6186D.svg)](https://kentico-community.slack.com) [![Version](https://img.shields.io/gem/v/delivery-sdk-ruby.svg?style=flat)](https://rubygems.org/gems/delivery-sdk-ruby)
+[![Build Status](https://api.travis-ci.org/Kentico/delivery-sdk-ruby.svg?branch=master)](https://travis-ci.org/Kentico/delivery-sdk-ruby)
+[![Join the chat at https://kentico-community.slack.com](https://img.shields.io/badge/join-slack-E6186D.svg)](https://kentico-community.slack.com)
+[![Stack Overflow](https://img.shields.io/badge/Stack%20Overflow-ASK%20NOW-FE7A16.svg?logo=stackoverflow&logoColor=white)](https://stackoverflow.com/tags/kentico-cloud)
+ [![Version](https://img.shields.io/gem/v/delivery-sdk-ruby.svg?style=flat)](https://rubygems.org/gems/delivery-sdk-ruby)
+ [![Maintainability](https://api.codeclimate.com/v1/badges/b2e3fae28a2b2601d815/maintainability)](https://codeclimate.com/github/Kentico/delivery-sdk-ruby/maintainability)
 
 # Delivery Ruby SDK
 
 The Delivery Ruby SDK can be used in Ruby/Rails projects to retrieve content from Kentico Cloud. This is a community project and not an official Kentico SDK. If you find a bug in the SDK or have a feature request, please submit a GitHub issue.
 
+See [environment setup fo Windows](https://github.com/Kentico/delivery-sdk-ruby/wiki/How-to-setup-development-environment-on-Windows) for local development.
+
+
 ## Demo Rails application
 
 This repository contains a very basic Rails application that you can run locally to see how the SDK can be used. To run the Dancing Goat demo application, clone this repository and open `/dancing_goat/app/controllers/application_controller.rb`. Add your project ID to the file here:

data/lib/delivery-sdk-ruby.rb

@@ -13,4 +13,5 @@ require File.dirname(__FILE__) + '/delivery/responses/delivery_taxonomy_response
 require File.dirname(__FILE__) + '/delivery/responses/delivery_element_response'
 require File.dirname(__FILE__) + '/delivery/resolvers/content_link_resolver'
 require File.dirname(__FILE__) + '/delivery/resolvers/inline_content_item_resolver'
+require File.dirname(__FILE__) + '/delivery/resolvers/linked_item_resolver'
 require File.dirname(__FILE__) + '/delivery/builders/image_transformation_builder'

data/lib/delivery/models/content_item.rb

@@ -23,21 +23,14 @@ module Delivery
       )
     end
 
-    def initialize(source, content_link_url_resolver, inline_content_item_resolver, modular_content = nil)
+    def initialize(source, content_link_url_resolver, inline_content_item_resolver, linked_items_resolver)
       @source =
         if source['item'].nil?
           source
         else
           source['item']
         end
-      # Multiple item responses have modular_content on the root, single item
-      # responses have modular content in the item
-      @modular_content =
-        if modular_content.nil?
-          source['modular_content']
-        else
-          modular_content
-        end
+      @linked_items_resolver = linked_items_resolver
       self.content_link_url_resolver = content_link_url_resolver
       self.inline_content_item_resolver = inline_content_item_resolver
     end
@@ -64,16 +57,14 @@ module Delivery
     # element with items from request's modular_content
     def get_links(code_name)
       element = get_element code_name
-      filtered = filter_modular_content element['value']
-      filtered.map { |n| ContentItem.new JSON.parse(JSON.generate(n)), content_link_url_resolver, inline_content_item_resolver }
+      get_linked_items element['value']
     end
 
     # Returns an array of ContentItems by comparing code names stored in the
     # modular_content object with items from request's modular_content
     def get_inline_items(code_name)
       element = get_element code_name
-      filtered = filter_modular_content element['modular_content']
-      filtered.map { |n| ContentItem.new JSON.parse(JSON.generate(n)), content_link_url_resolver, inline_content_item_resolver }
+      get_linked_items element['modular_content']
     end
 
     private
@@ -93,11 +84,11 @@ module Delivery
       @source['elements'][code_name]
     end
 
-    def filter_modular_content(codenames)
+    def get_linked_items(codenames)
       return [] unless codenames.class == Array
 
       codenames.each_with_object([]) do |codename, items|
-        item = @modular_content.values.find { |i| i['system']['codename'] == codename }
+        item = @linked_items_resolver.resolve codename
         items << item if item
       end
     end

data/lib/delivery/resolvers/linked_item_resolver.rb

@@ -0,0 +1,28 @@
+module Delivery
+  # Resolves a content item by its codename
+  # It contains the modular content of item/items response
+  class LinkedItemResolver
+    def initialize(modular_content, content_link_url_resolver, inline_content_item_resolver)
+      @modular_content = modular_content
+      @content_link_url_resolver = content_link_url_resolver
+      @inline_content_item_resolver = inline_content_item_resolver
+      @resolved_items = {}
+    end
+
+    # Resolves a content item
+    # If the link for a codename was resolved before,
+    # it returns the same instance of Content Item
+    # @param [String] codename Codename of the content item
+    # @return [ContentItem]
+    def resolve(codename)
+      @resolved_items[codename] ||= resolve_item(codename)
+    end
+
+    private
+
+    def resolve_item(codename)
+      item = @modular_content.values.find { |i| i['system']['codename'] == codename }
+      ContentItem.new JSON.parse(JSON.generate(item)), @content_link_url_resolver, @inline_content_item_resolver, self
+    end
+  end
+end

data/lib/delivery/responses/delivery_item_listing_response.rb

@@ -13,13 +13,14 @@ module Delivery
 
       def items
         @items unless @items.nil?
+        linked_items_resolver = LinkedItemResolver.new @response['modular_content'], @content_link_url_resolver, @inline_content_item_resolver
         items = []
         @response['items'].each do |n|
           items << Delivery::ContentItem.new(
             n,
             @content_link_url_resolver,
             @inline_content_item_resolver,
-            @response['modular_content']
+            linked_items_resolver
           )
         end
         @items = items

data/lib/delivery/responses/delivery_item_response.rb

@@ -7,10 +7,12 @@ module Delivery
     class DeliveryItemResponse < ResponseBase
       def item
         @item unless @item.nil?
+        linked_items_resolver = LinkedItemResolver.new @response['modular_content'], @content_link_url_resolver, @inline_content_item_resolver
         @item = Delivery::ContentItem.new(
           @response,
           @content_link_url_resolver,
-          @inline_content_item_resolver
+          @inline_content_item_resolver,
+          linked_items_resolver
         )
       end
 

data/lib/delivery/version.rb

@@ -1,3 +1,3 @@
 module Delivery
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delivery-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Eric Dugre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -50,6 +50,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0.rc1
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ files:
 - lib/delivery/query_parameters/query_string.rb
 - lib/delivery/resolvers/content_link_resolver.rb
 - lib/delivery/resolvers/inline_content_item_resolver.rb
+- lib/delivery/resolvers/linked_item_resolver.rb
 - lib/delivery/responses/delivery_element_response.rb
 - lib/delivery/responses/delivery_item_listing_response.rb
 - lib/delivery/responses/delivery_item_response.rb