lhs 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf3d097348d9c26b700bfe35df2d41b43052109
-  data.tar.gz: 6b2130406f136714241764b4e9c8c6a418896d3b
+  metadata.gz: 43644dd5ced6e07d1930e1b8377070475780b45d
+  data.tar.gz: 0a1ae22b03cec9fa31f2d311419972ecf8f919c3
 SHA512:
-  metadata.gz: 41c472f8a71fb9f3c7a9f79ed32363754b87cbeb0f7903d3f9e3bd54ed5011056f07b208b233bf8927308e0c5d79422f59eb9c785bb8b3b8af1f91db673d5664
-  data.tar.gz: b875a7965529984e842668f6a92cf6b96b54929db5c8de38f6ceb5a6aa04eba94491046f0add8acb5750d06c97022fe440d5b9e07d8c24bfbfed1c0376fdf960
+  metadata.gz: b2196aa94fc0e7653a055b81faa2ce04a1152713e77ed61b8f899cd36c172b133e2a1ccc0b595aca498bac5d107f970171a053b60a48ede60f946f1360e48ec0
+  data.tar.gz: 96abeddb6c2b0c2b6bbd25890ca5b4f16b7cdcf907d12e470a1bb1e4b2122fe15b4e1de7f0bbf477d11b17b4d4a05bf2f8a75bdeab75c4be443186bc68c407d1

data/lib/lhs/concerns/service/all.rb

@@ -12,10 +12,11 @@ class LHS::Service
         data = instance.request(params: params.merge(limit: 100))
         all.concat(data._raw['items'])
         total_left = data._raw['total'] - data.count
-        requests = total_left / data._raw['limit']
+        limit = data._raw['limit'] || data.count
+        requests = total_left / limit
         requests.times do |i|
-          offset = data._raw['limit'] * (i+1) + 1
-          all.concat instance.request(params: params.merge(limit: data._raw['limit'], offset: offset))._raw['items']
+          offset = limit * (i+1) + 1
+          all.concat instance.request(params: params.merge(limit: limit, offset: offset))._raw['items']
         end
         LHS::Data.new(all, nil, self)
       end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/service/all_spec.rb

@@ -27,5 +27,19 @@ describe LHS::Collection do
       expect(all.count).to eq 300
       expect(all[299]).to eq 300
     end
+
+    it 'also fetches all when there is not meta information for limit' do
+      stub_request(:get, "#{datastore}/feedbacks?limit=100")
+      .to_return(status: 200, body: {items: (1..100).to_a, total: 300, offset: 0}.to_json)
+      stub_request(:get, "#{datastore}/feedbacks?limit=100&offset=101")
+      .to_return(status: 200, body: {items: (101..200).to_a, total: 300, offset: 101}.to_json)
+      stub_request(:get, "#{datastore}/feedbacks?limit=100&offset=201")
+      .to_return(status: 200, body: {items: (201..300).to_a, total: 300, offset: 201}.to_json)
+      all = SomeService.all
+      expect(all).to be_kind_of LHS::Data
+      expect(all._proxy).to be_kind_of LHS::Collection
+      expect(all.count).to eq 300
+      expect(all[299]).to eq 300
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc