lhs 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c5dde69a8e71e9f37d3b769c04b865ec6d97cf
-  data.tar.gz: ceaf6a4a5c87d83448c317522d06b475aaf411ff
+  metadata.gz: 0073ba2cc1f6367f97cd507e4437aebb252f5f5b
+  data.tar.gz: 52687195c84cf5a5f5f122d41d8fb52389ff3b54
 SHA512:
-  metadata.gz: 0d2adc8b42d6f832313537ae26e2c5228a77dbfa9f917b338e365f972e21a198c5b79f703ac0c7c14bc0282aa59d73499d322f4100861c31461c8dc8e0aae151
-  data.tar.gz: 32a78f36ab5f8903386631cd84f005231f90453a0045f1d90045cb7a81e941cb2e49fbd8dbb85c14475582ac3db85998ff7854d2faf4d1116e5ce4832d9979c5
+  metadata.gz: 29226d8c8a1504a986321f5a25e0ff84358b50545404d5dfbb423af85dce4abeaeb9eaf0e68b19e64c1ce11e0b69df8b70e7fb45389bc051a9632520c5043747
+  data.tar.gz: 86a699cc56dad77686ed4e2b0428fd4ee56acb074d6dddde697001a61737b293242fdadb317f39662cd7b2e98d63e0ee59a92ebf825e7b770494a9fe34bce40f

data/README.md

@@ -27,6 +27,8 @@ Please store all defined LHS::Records in `app/models` as they are not autoloaded
 
 You setup a LHS::Record by configuring one or multiple endpoints. You can also add request options for an endpoint (see following example).
 
+The following example uses the `LHC::Caching` interceptor from [lhc-core-interceptors](https://github.com/local-ch/lhc-core-interceptors#cache-interceptor).
+
 ```ruby
 class Record < LHS::Record
 

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

@@ -61,7 +61,12 @@ class LHS::Record
         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?
+          next if link.blank?
+          link.merge_raw!(addition[i]) && next if !link.collection?
+
+          link.each_with_index do |item, j|
+            item.merge_raw!(addition[i + j]) if item.present?
+          end
         end
       end
 
@@ -175,7 +180,7 @@ class LHS::Record
       def load_and_merge_remaining_objects!(data, options)
         if paginated?(data._raw)
           load_and_merge_paginated_collection!(data, options)
-        elsif data.collection? && paginated?(data.first._raw)
+        elsif data.collection? && paginated?(data.first.try(:_raw))
           load_and_merge_set_of_paginated_collections!(data, options)
         end
       end
@@ -320,13 +325,13 @@ class LHS::Record
       def options_for_multiple(data, key = nil)
         data.map do |item|
           url_option_for(item, key)
-        end
+        end.flatten
       end
 
       def options_for_nested_items(data, key = nil)
         data[key].map do |item|
           url_option_for(item)
-        end
+        end.flatten
       end
 
       def options_for_next_batch(record, pagination, options, parent_data = nil)
@@ -406,7 +411,12 @@ class LHS::Record
 
       def url_option_for(item, key = nil)
         link = key ? item[key] : item
-        return { url: link.href } if link.present? && link.href.present?
+        return if link.blank?
+        return { url: link.href } if !link.collection?
+
+        link.map do |item|
+          { url: item.href } if item.present? && item.href.present?
+        end.compact
       end
     end
   end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "9.0.1"
+  VERSION = "9.0.2"
 end

data/spec/record/includes_all_spec.rb

@@ -115,5 +115,26 @@ describe LHS::Record do
       expect(products_request_page_2).to have_been_requested.at_least_once
       expect(products_request_page_3).to have_been_requested.at_least_once
     end
+
+    context 'includes for an empty array' do
+      before(:each) do
+        class Contract < LHS::Record
+          endpoint 'http://datastore/contracts/:id'
+        end
+        stub_request(:get, "http://datastore/contracts/1")
+          .to_return(body: {
+            options: []
+          }.to_json)
+      end
+
+      it 'includes_all in case of an empty array' do
+        expect(lambda do
+          Contract
+            .includes(:product)
+            .includes_all(:options)
+            .find(1)
+        end).not_to raise_error
+      end
+    end
   end
 end

data/spec/record/includes_spec.rb

@@ -469,4 +469,30 @@ describe LHS::Record do
       expect(place.contracts.to_a).to eq([])
     end
   end
+
+  context 'include and merge arrays when calling find in parallel' do
+    before(:each) do
+      class Place < LHS::Record
+        endpoint 'http://datastore/places/:id'
+      end
+      stub_request(:get, 'http://datastore/places/1')
+        .to_return(body: {
+          category_relations: [{ href: 'http://datastore/category/1' }, { href: 'http://datastore/category/2' }]
+        }.to_json)
+      stub_request(:get, 'http://datastore/places/2')
+        .to_return(body: {
+          category_relations: [{ href: 'http://datastore/category/2' }, { href: 'http://datastore/category/1' }]
+        }.to_json)
+      stub_request(:get, "http://datastore/category/1").to_return(body: { name: 'Food' }.to_json)
+      stub_request(:get, "http://datastore/category/2").to_return(body: { name: 'Drinks' }.to_json)
+    end
+
+    it 'includes and merges linked resources in case of an array of links' do
+      places = Place
+        .includes(:category_relations)
+        .find(1, 2)
+      expect(places[0].category_relations[0].name).to eq 'Food'
+      expect(places[1].category_relations[0].name).to eq 'Drinks'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc