lhs 11.3.1 → 11.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5038abb8bd075bd7aba160cdcf81b0e3de7cda4
-  data.tar.gz: 297b1925f5aedc7973493511a1ae318e39064a01
+  metadata.gz: 5bbf841e955ed23fe6c7efbf8f8fe7b05fc35538
+  data.tar.gz: d331ac41f574be37f783b10ff7c53fe43c592a8f
 SHA512:
-  metadata.gz: a252ae3732d5dc6e93e5ea5a625d8ec01d2f1e857b0e1f2e22146f1ec6d4a0057d2ef1f8ae0f42b4fce5ca0bf22ceadac3e6656b2c03f3ecbeadcf97383224ae
-  data.tar.gz: cbd5a929459c15e3bc02cd3094228215e63d3f987f851729a174045c0522f21c8e16a82ec55a7568b210bfc29856d0330a5660f1c0ceb4b007c88183c10a2ff2
+  metadata.gz: 3c0a3fee58998e8c51a25c16702a17b20cec97498979863040b2120d51a776e6333733c807e1940105f24e15b987d2d84e50a50c7fbf4846e1aff472b1e840d2
+  data.tar.gz: 6cb8b54105e3579b76e3ff9d9a26c3d738a85e73eb4ded2a93343a176b3231a99fc88bb7f39cc956faf3375bbc7bf46edd8b51088632ad7eb6cacb3aab8926d1

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

@@ -87,16 +87,16 @@ class LHS::Record
       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]
-          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
+        data.map do |item|
+          item_raw = item._raw[key]
+          item_raw.blank? ? [nil] : item_raw
         end
+          .flatten
+          .each_with_index do |item, index|
+            item_addition = addition[index]
+            next if item_addition.nil? || item.nil?
+            item.merge! item_addition._raw
+          end
       end
 
       def extend_base_array!(data, addition, key)
@@ -301,7 +301,7 @@ class LHS::Record
       # When including all resources on one level, don't forward :includes & :references
       # as we have to fetch all resources on this level first, before we continue_including
       def prepare_option_for_include_all_request!(option)
-        return option if option.empty? || option[:url].nil?
+        return option if option.blank? || option[:url].nil?
         uri = parse_uri(option[:url], option)
         get_params = Rack::Utils.parse_nested_query(uri.query)
           .symbolize_keys

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "11.3.1"
+  VERSION = "11.3.2"
 end

data/spec/record/includes_all_spec.rb

@@ -260,5 +260,83 @@ describe LHS::Record do
         expect(customer.contracts.first.entry.name).to eq 'Casa Ferlin'
       end
     end
+
+    context 'includes all for parallel loaded ids' do
+      before(:each) do
+        class Place < LHS::Record
+          endpoint 'http://datastore/places/:id'
+        end
+      end
+
+      let!(:place_request_1) do
+        stub_request(:get, %r{http://datastore/places/1})
+          .to_return(
+            body: {
+              category_relations: [
+                { href: 'http://datastore/category_relations/1' },
+                { href: 'http://datastore/category_relations/2' }
+              ]
+            }.to_json
+          )
+      end
+
+      let!(:place_request_2) do
+        stub_request(:get, %r{http://datastore/places/2})
+          .to_return(
+            body: {
+              category_relations: []
+            }.to_json
+          )
+      end
+
+      let!(:place_request_3) do
+        stub_request(:get, %r{http://datastore/places/3})
+          .to_return(
+            body: {
+              category_relations: [
+                { href: 'http://datastore/category_relations/1' },
+                { href: 'http://datastore/category_relations/3' }
+              ]
+            }.to_json
+          )
+      end
+
+      let!(:category_relation_request_1) do
+        stub_request(:get, %r{http://datastore/category_relations/1})
+          .to_return(
+            body: {
+              name: "Category 1"
+            }.to_json
+          )
+      end
+
+      let!(:category_relation_request_2) do
+        stub_request(:get, %r{http://datastore/category_relations/2})
+          .to_return(
+            body: {
+              name: "Category 2"
+            }.to_json
+          )
+      end
+
+      let!(:category_relation_request_3) do
+        stub_request(:get, %r{http://datastore/category_relations/3})
+          .to_return(
+            body: {
+              name: "Category 3"
+            }.to_json
+          )
+      end
+
+      let(:category_name) { 'Category Relation' }
+
+      it 'requests places in parallel and includes category relation' do
+        places = Place.includes_all(:category_relations).find(1, 2, 3)
+        expect(places[0].category_relations[0].name).to eq 'Category 1'
+        expect(places[0].category_relations[1].name).to eq 'Category 2'
+        expect(places[2].category_relations[0].name).to eq 'Category 1'
+        expect(places[2].category_relations[1].name).to eq 'Category 3'
+      end
+    end
   end
 end

data/spec/record/includes_spec.rb

@@ -264,12 +264,14 @@ describe LHS::Record do
   end
 
   context 'arrays' do
-    it 'includes items of arrays' do
+    before(:each) do
       class Place < LHS::Record
         endpoint ':datastore/place'
         endpoint ':datastore/place/:id'
       end
+    end
 
+    let!(:place_request) do
       stub_request(:get, "#{datastore}/place/1")
         .to_return(body: {
           'relations' => [
@@ -277,16 +279,39 @@ describe LHS::Record do
             { 'href' => "#{datastore}/place/relations/3" }
           ]
         }.to_json)
+    end
 
+    let!(:relation_request_1) do
       stub_request(:get, "#{datastore}/place/relations/2")
         .to_return(body: { name: 'Category' }.to_json)
+    end
+
+    let!(:relation_request_2) do
       stub_request(:get, "#{datastore}/place/relations/3")
         .to_return(body: { name: 'ZeFrank' }.to_json)
+    end
 
+    it 'includes items of arrays' do
       place = Place.includes(:relations).find(1)
       expect(place.relations.first.name).to eq 'Category'
       expect(place.relations[1].name).to eq 'ZeFrank'
     end
+
+    context 'parallel with empty links' do
+      let!(:place_request_2) do
+        stub_request(:get, "#{datastore}/place/2")
+          .to_return(body: {
+            'relations' => []
+          }.to_json)
+      end
+
+      it 'loads places in parallel and merges included data properly' do
+        place = Place.includes(:relations).find(2, 1)
+        expect(place[0].relations.empty?)
+        expect(place[1].relations[0].name).to eq 'Category'
+        expect(place[1].relations[1].name).to eq 'ZeFrank'
+      end
+    end
   end
 
   context 'empty collections' do

metadata

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