lhs 15.2.3.pre.favorites.1 → 15.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38ffdbc961e4017dc1d0d69061fd095dfb14bcd
-  data.tar.gz: 260c6c9c52daea2d9d87465d6b64e6454b0fff38
+  metadata.gz: ab8ba71d671d0e6b04f578b81bd6988a3caa5b28
+  data.tar.gz: 17222267f2563042bb2975fdc2c778662d1594db
 SHA512:
-  metadata.gz: 4adb473a75f4bdb1fb98d79a64ce3f520d18f4ed8d1e491e11d364d4d2e144ac7b85928d35b17e7b40bcf293f388325bd24fc0046dcbd985ef48c9f45d00a6f4
-  data.tar.gz: 9b62a3f7cea553e4b0602f4148db60ab6feb4a704ea90cf4d64ffc732bced80f21d95d106207dfbd41f96332bea6339edcaba1206c3a4dabfa9152bb1784c401
+  metadata.gz: 79414764f2beed745b3dcaa21cd9d9f099c432715080a54cfa0463d9c2d91ea4ccc55ac098353df21234b60a2661463152c984669b0590154c62aab8ac010757
+  data.tar.gz: 13cc0ab0000e9fde6e731835b8343a434dd4e2d64cd70f3a4a3c9ef6cdf5d707853e0dea6956b108297dfd804af5d7d98f99f317691fe5dea547c972dccbd9d0

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

@@ -267,18 +267,15 @@ class LHS::Record
 
       def load_and_merge_set_of_paginated_collections!(data, options)
         options_for_this_batch = []
-        data_record = data._record
-        data = data.compact
-        options.compact.each_with_index do |_, index|
+        options.each_with_index do |element, index|
+          next if element.nil?
           record = data[index]._record
           pagination = record.pagination(data[index])
           next if pagination.pages_left.zero?
           options_for_this_batch.push(options_for_next_batch(record, pagination, options[index], data[index]))
         end
-        if data_record.present?
-          data_record.request(options_for_this_batch.flatten).each do |batch_data|
-            merge_batch_data_with_parent!(batch_data, batch_data._request.options[:parent_data])
-          end
+        data._record.request(options_for_this_batch.flatten).each do |batch_data|
+          merge_batch_data_with_parent!(batch_data, batch_data._request.options[:parent_data])
         end
       end
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '15.2.3-favorites.1'
+  VERSION = '15.2.3'
 end

data/spec/concerns/record/request_spec.rb

@@ -73,40 +73,4 @@ describe LHS::Record::Request do
                            params: { limit: 100 })
     end
   end
-
-  describe 'load_and_merge_set_of_paginated_collections!' do
-    let(:options) do
-      [
-        {
-          url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=1',
-          all: true,
-          auth: { bearer: 'xxx' },
-          params: { limit: 100 }
-        },
-        nil,
-        {
-          url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=3',
-          all: true,
-          auth: { bearer: 'xxx' },
-          params: { limit: 100 }
-        },
-      ]
-    end
-
-    let(:data_array) do
-      [
-        LHS::Record.new,
-        nil,
-        LHS::Record.new,
-      ]
-    end
-
-    let(:data) do
-      LHS::Record.new(data_array)
-    end
-
-    it 'does not raise an error when data has nil objects' do
-      expect(subject.send(:load_and_merge_set_of_paginated_collections!, data, options)).to_not be_nil
-    end
-  end
 end

data/spec/record/includes_all_spec.rb

@@ -384,19 +384,8 @@ describe LHS::Record do
 
   context 'nested includes_all' do
     context 'with optional children' do
-      before do
-        class Favorite < LHS::Record
-          endpoint 'http://datastore/favorites'
-        end
-
-        class Place < LHS::Record
-          endpoint 'http://datastore/places/{id}'
-        end
-
-        class Contract < LHS::Record
-          endpoint 'http://datastore/places/{place_id}/contracts'
-        end
 
+      let(:favorites_request_stub) do
         stub_request(:get, %r{http://datastore/favorites})
           .to_return(
             body: {
@@ -410,13 +399,20 @@ describe LHS::Record do
                 place: {
                   href: "http://datastore/places/2"
                 }
+              }, {
+                href: "http://datastore/favorite/3",
+                place: {
+                  href: "http://datastore/places/3"
+                }
               }],
-              total: 2,
+              total: 3,
               offset: 0,
               limit: 100
             }.to_json
           )
+      end
 
+      let(:place1_request_stub) do
         stub_request(:get, %r{http://datastore/places/1})
           .to_return(
             body: {
@@ -427,7 +423,32 @@ describe LHS::Record do
               }
             }.to_json
           )
+      end
+
+      let(:place2_request_stub) do
+        stub_request(:get, %r{http://datastore/places/2})
+          .to_return(
+            body: {
+              href: "http://datastore/places/2",
+              name: 'Place 2'
+            }.to_json
+          )
+      end
 
+      let(:place3_request_stub) do
+        stub_request(:get, %r{http://datastore/places/3})
+          .to_return(
+            body: {
+              href: "http://datastore/places/3",
+              name: 'Place 3',
+              contracts: {
+                href: "http://datastore/places/3/contracts"
+              }
+            }.to_json
+          )
+      end
+
+      let(:contracts_request_for_place1_stub) do
         stub_request(:get, %r{http://datastore/places/1/contracts})
           .to_return(
             body: {
@@ -440,16 +461,44 @@ describe LHS::Record do
               limit: 10
             }.to_json
           )
+      end
 
-        stub_request(:get, %r{http://datastore/places/2})
+      let(:contracts_request_for_place3_stub) do
+        stub_request(:get, %r{http://datastore/places/3/contracts})
           .to_return(
             body: {
-              href: "http://datastore/places/2",
-              name: 'Place 2'
+              items: [{
+                href: "http://datastore/places/3/contracts/1",
+                name: 'Contract 3'
+              }],
+              total: 1,
+              offset: 0,
+              limit: 10
             }.to_json
           )
       end
 
+      before do
+        class Favorite < LHS::Record
+          endpoint 'http://datastore/favorites'
+        end
+
+        class Place < LHS::Record
+          endpoint 'http://datastore/places/{id}'
+        end
+
+        class Contract < LHS::Record
+          endpoint 'http://datastore/places/{place_id}/contracts'
+        end
+
+        favorites_request_stub
+        place1_request_stub
+        place2_request_stub
+        place3_request_stub
+        contracts_request_for_place1_stub
+        contracts_request_for_place3_stub
+      end
+
       it 'includes nested objects when they exist' do
         favorites = Favorite.includes(:place).includes_all(place: :contracts).all
 
@@ -460,8 +509,15 @@ describe LHS::Record do
       it 'does not include nested objects when they are not there' do
         favorites = Favorite.includes(:place).includes_all(place: :contracts).all
 
-        expect(favorites.last.place.name).to eq('Place 2')
-        expect(favorites.last.place.contracts).to be(nil)
+        expect(favorites[1].place.name).to eq('Place 2')
+        expect(favorites[1].place.contracts).to be(nil)
+      end
+
+      it 'does include and merges objects after nil objects in collections' do
+        favorites = Favorite.includes(:place).includes_all(place: :contracts).all
+
+        expect(favorites.last.place.name).to eq('Place 3')
+        expect(favorites.last.place.contracts.first.name).to eq('Contract 3')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 15.2.3.pre.favorites.1
+  version: 15.2.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -431,13 +431,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services