lhs 15.0.1 → 15.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5612b7fd76224814a3250ca7cef5cb41e708d6da
-  data.tar.gz: 3496afc8f424012ee023dfe213b5f70bcd6c2299
+  metadata.gz: 0e401b46b1033f255793a10a976ba7a0b14ec364
+  data.tar.gz: b3e461f0882936419e352349caa0dcca4c5ec48c
 SHA512:
-  metadata.gz: 7785e4ccbb104ed5f166f8d8179cccea503eb80ce91c01e13571378525f71504fb71a7a04a3add83d1af7c24a5c01650394b50895105e516f4c3aed8dbf4df89
-  data.tar.gz: 8a6e4469c4bd980e6873b03c858fa4a5ed157223d2c01a911979ee9ee5d6cabcf5e9794bc85516744888bbdb3a0cb544fe446a56c15d5da2823b005d94b70230
+  metadata.gz: bbd204a60d46660fdcfb7ec01b71ef9e1e11a7ddf94827a4312e3b3235ecfaa96fdd87046d732a61a43f49b64b6601787e6f857b6dd8e0e39bbc5d4c006ab653
+  data.tar.gz: 631a0a7a45c359da9e8c0f47f583a03f0950dc8263629d217c443feb77e92e37711fa526f52594f5189caa596c3031e0528411983b3afcbd1eedb960595caadc

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

@@ -24,8 +24,8 @@ class LHS::Record
         params = options[:params] || {}
         loop do # as suggested by Matz
           data = request(params: params.merge(limit_key(:parameter) => batch_size, pagination_key(:parameter) => start))
-          batch_size = data._raw[limit_key(:parameter)]
-          left = data._raw.dig(*total_key).to_i - data._raw[pagination_key(:parameter)].to_i - data._raw[limit_key(:paramter)].to_i
+          batch_size = data._raw.dig(*limit_key(:body))
+          left = data._raw.dig(*total_key).to_i - data._raw.dig(*pagination_key(:body)).to_i - data._raw.dig(*limit_key(:body)).to_i
           yield new(data)
           break if left <= 0
           start += batch_size

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '15.0.1'
+  VERSION = '15.0.2'
 end

data/spec/record/find_in_batches_spec.rb

@@ -90,4 +90,31 @@ describe LHS::Collection do
       expect(length).to eq total
     end
   end
+
+  context 'pagination with nested response' do
+    before do
+      class Record < LHS::Record
+        endpoint '{+datastore}/{campaign_id}/feedbacks'
+        endpoint '{+datastore}/feedbacks'
+        configuration items_key: [:response, :docs], limit_key: { body: [:response, :size], parameter: :size }, pagination_key: { body: [:response, :start], parameter: :start }, pagination_strategy: :start, total_key: [:response, :totalResults]
+      end
+    end
+
+    let(:options) { { items_key: 'docs', limit_key: 'size', pagination_key: 'start', total_key: 'totalResults' } }
+
+    it 'capable to do batch processing with configured pagination' do
+      stub_request(:get, "#{datastore}/feedbacks?size=230&start=1").to_return(status: 200, body: "{\"response\":#{api_response((1..100).to_a, 1, options)}}")
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=101").to_return(status: 200, body: "{\"response\":#{api_response((101..200).to_a, 101, options)}}")
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=201").to_return(status: 200, body: "{\"response\":#{api_response((201..300).to_a, 201, options)}}")
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=301").to_return(status: 200, body: "{\"response\":#{api_response((301..400).to_a, 301, options)}}")
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=401").to_return(status: 200, body: "{\"response\":#{api_response((401..total).to_a, 401, options)}}")
+      length = 0
+      Record.find_in_batches(batch_size: 230) do |records|
+        length += records.length
+        expect(records).to be_kind_of Record
+        expect(records._proxy).to be_kind_of LHS::Collection
+      end
+      expect(length).to eq total
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 15.0.1
+  version: 15.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc