lhs 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d5463ddb8aecb066995d59a8ef055bafd5b98ea
-  data.tar.gz: 13ff6360d6817f2615adde2c9a833abd3681e6d2
+  metadata.gz: c65a63aa10738241bdb3ba6c085025cee24281c2
+  data.tar.gz: 5e2dbd3c4d0c7860059728ea694a399b6d53eec4
 SHA512:
-  metadata.gz: 153293dfe1a6c8619a50e43d2f64d4616bd5fae5045aa95052b719d10bac03735aa0fe81f184792c74ef29ab31d83423b6b6b6662fadc8e8ea0c880cff57493f
-  data.tar.gz: 947150959ead6112b621ea868e8f4e3481195397e5cbc4277caacbefabaae31beb9558bb0f8bb6ef458eb7b2df1f1428e00740ee00d04d8b265ed456033953bb
+  metadata.gz: 37868d94b6f13f08fa2ef796b210e682e4f9162275b1a6770fa37b73984fd1718092dc7c799c81190d8cd74edb4885284ac043ebe33fdf2807cbaa4c91c59b7f
+  data.tar.gz: fb80f7203c93908654728ba73df28ba159509904d3c665546f6874f73079b6fc6be6d53c909d390b9ae062c87fe52ca9bb8c76401139cd58bfe5963365be2572

data/lib/lhs/concerns/record/request.rb

@@ -38,23 +38,48 @@ class LHS::Record
       end
 
       # Extends existing raw data with additionaly fetched data
-      def extend_raw_data(data, addition, key)
+      def extend_raw_data!(data, addition, key)
         return if addition.empty?
         if data.collection?
-          data.each_with_index do |item, i|
-            item = item[i] if item.is_a? LHS::Collection
-            link = item[key.to_sym]
-            link.merge_raw!(addition[i]) if link.present?
-          end
+          extend_base_collection!(data, addition, key)
         elsif data[key]._raw.is_a? Array
-          data[key].zip(addition) do |item, additional_item|
-            item._raw.merge!(additional_item._raw)
-          end
-        elsif data._proxy.is_a? LHS::Item
+          extend_base_array!(data, addition, key)
+        elsif data.item?
+          extend_base_item!(data, addition, key)
+        end
+      end
+
+      def extend_base_collection!(data, addition, key)
+        data.each_with_index do |item, i|
+          item = item[i] if item.is_a? LHS::Collection
+          link = item[key.to_sym]
+          link.merge_raw!(addition[i]) if link.present?
+        end
+      end
+
+      def extend_base_array!(data, addition, key)
+        data[key].zip(addition) do |item, additional_item|
+          item._raw.merge!(additional_item._raw)
+        end
+      end
+
+      def extend_base_item!(data, addition, key)
+        if addition.collection?
+          extend_base_item_with_collection!(data, addition, key)
+        else # simple case merges hash into hash
           data._raw[key.to_sym].merge!(addition._raw)
         end
       end
 
+      def extend_base_item_with_collection!(data, addition, key)
+        target = data[key]
+        if target._raw.is_a? Array
+          data[key] = addition.map(&:_raw)
+        else # hash with items
+          target._raw[items_key] = addition.map(&:_raw)
+        end
+      end
+
       def handle_includes(includes, data)
         if includes.is_a? Hash
           includes.each { |included, sub_includes| handle_include(included, data, sub_includes) }
@@ -76,7 +101,7 @@ class LHS::Record
             url_option_for(data, included)
           end
         addition = load_include(options, data, sub_includes)
-        extend_raw_data(data, addition, included)
+        extend_raw_data!(data, addition, included)
       end
 
       def skip_loading_includes?(data, included)

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "5.6.4"
+  VERSION = "5.6.5"
 end

data/spec/record/includes_spec.rb

@@ -312,4 +312,28 @@ describe LHS::Record do
       expect(place.available_products.empty?).to eq true
     end
   end
+
+  context 'extend items with arrays' do
+    it 'extends base items with arrays' do
+      class Place < LHS::Record
+        endpoint ':datastore/place'
+        endpoint ':datastore/place/:id'
+      end
+
+      stub_request(:get, "#{datastore}/place/1")
+        .to_return(body: {
+          'contracts' => {
+            'items' => [{ 'href' => "#{datastore}/place/1/contacts/1" }]
+          }
+        }.to_json)
+
+      stub_request(:get, "#{datastore}/place/1/contacts/1")
+        .to_return(body: {
+          'products' => { 'href' => "#{datastore}/place/1/contacts/1/products" }
+        }.to_json)
+
+      place = Place.includes(:contracts).find(1)
+      expect(place.contracts.first.products.href).to eq "#{datastore}/place/1/contacts/1/products"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.6.5
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors