lhs 5.6.5 → 5.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65a63aa10738241bdb3ba6c085025cee24281c2
-  data.tar.gz: 5e2dbd3c4d0c7860059728ea694a399b6d53eec4
+  metadata.gz: 69913ab2a3b45766bc83f1c9bbe146dc8222ad3b
+  data.tar.gz: 12aca78a7334087c9c93fc42b338eb58de74c57b
 SHA512:
-  metadata.gz: 37868d94b6f13f08fa2ef796b210e682e4f9162275b1a6770fa37b73984fd1718092dc7c799c81190d8cd74edb4885284ac043ebe33fdf2807cbaa4c91c59b7f
-  data.tar.gz: fb80f7203c93908654728ba73df28ba159509904d3c665546f6874f73079b6fc6be6d53c909d390b9ae062c87fe52ca9bb8c76401139cd58bfe5963365be2572
+  metadata.gz: 829eb8c9a105d0aef36ebcb63878c038db3bbe8aa2fb7444aacdd0b534ddb0496c5e3f2464ea86977be03b1b6ad8c312c62b51cf54826b49fd8795b372f1ec2d
+  data.tar.gz: 0bb344b8a4ad023a8aa2deb125cde83bf381f340b3bcbd1bff68855fba7d86b151061a9fcf2887d9725369fa2515111a1715a3c77c2db9af389a3282321278f9

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

@@ -23,9 +23,9 @@ class LHS::Record
         batch_size = options[:batch_size] || LHS::Pagination::DEFAULT_LIMIT
         params = options[:params] || {}
         loop do # as suggested by Matz
-          data = request(params: params.merge(limit: batch_size, offset: start))
-          batch_size = data._raw[:limit]
-          left = data._raw[:total].to_i - data._raw[:offset].to_i - data._raw[:limit].to_i
+          data = request(params: params.merge(limit_key => batch_size, pagination_key => start))
+          batch_size = data._raw[limit_key]
+          left = data._raw[total_key].to_i - data._raw[pagination_key].to_i - data._raw[limit_key].to_i
           yield new(data)
           break if left <= 0
           start += batch_size

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "5.6.5"
+  VERSION = "5.6.6"
 end

data/spec/record/find_in_batches_spec.rb

@@ -5,13 +5,13 @@ describe LHS::Collection do
 
   let(:limit) { 100 }
 
-  def api_response(ids, offset)
+  def api_response(ids, offset, options = {})
     records = ids.map { |i| { id: i } }
     {
-      items: records,
-      total: total,
-      limit: limit,
-      offset: offset
+      options.fetch(:items_key, :items) => records,
+      options.fetch(:total_key, :total) => total,
+      options.fetch(:limit_key, :limit) => limit,
+      options.fetch(:pagination_key, :offset) => offset
     }.to_json
   end
 
@@ -63,4 +63,31 @@ describe LHS::Collection do
       end
     end
   end
+
+  context 'configured pagination' do
+    before(:each) do
+      class Record < LHS::Record
+        endpoint ':datastore/:campaign_id/feedbacks'
+        endpoint ':datastore/feedbacks'
+        configuration items_key: 'docs', limit_key: 'size', pagination_key: 'start', pagination_strategy: 'start', total_key: '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: api_response((1..100).to_a, 1, options))
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=101").to_return(status: 200, body: api_response((101..200).to_a, 101, options))
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=201").to_return(status: 200, body: api_response((201..300).to_a, 201, options))
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=301").to_return(status: 200, body: api_response((301..400).to_a, 301, options))
+      stub_request(:get, "#{datastore}/feedbacks?size=100&start=401").to_return(status: 200, body: 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: 5.6.5
+  version: 5.6.6
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc