lhs 15.2.2 → 15.2.3.pre.favorites.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846f2dcb99c6c1a4b153e1d1b998c51c32f2c82b
-  data.tar.gz: d2e4703f188e3e60611ca2c819275d9d6daa0a3c
+  metadata.gz: f38ffdbc961e4017dc1d0d69061fd095dfb14bcd
+  data.tar.gz: 260c6c9c52daea2d9d87465d6b64e6454b0fff38
 SHA512:
-  metadata.gz: aad4ca989ca9c836050891eb6b3223c4598fa1319a56d5f21ada0e76c8e59224a677ced8895c8aea5920e4fec3b70c53c1a271cbf928dc0653cfbe32b42a42d4
-  data.tar.gz: 2ced9df1e871c81eb07c45123c4af13e6afea3dc7cc4e14257949d25d5e5e7dcdc28dea5633b693aa8e7a9585aa1f14861168fcf924e50010fc6589b346a89db
+  metadata.gz: 4adb473a75f4bdb1fb98d79a64ce3f520d18f4ed8d1e491e11d364d4d2e144ac7b85928d35b17e7b40bcf293f388325bd24fc0046dcbd985ef48c9f45d00a6f4
+  data.tar.gz: 9b62a3f7cea553e4b0602f4148db60ab6feb4a704ea90cf4d64ffc732bced80f21d95d106207dfbd41f96332bea6339edcaba1206c3a4dabfa9152bb1784c401

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

@@ -267,14 +267,18 @@ 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|
           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
-        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])
+        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
         end
       end
 

data/lib/lhs/version.rb

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

data/spec/concerns/record/request_spec.rb

@@ -73,4 +73,40 @@ 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

metadata

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