lhs 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a89f7d4e832c73f0baf1779b95c3fc733839244
-  data.tar.gz: f53e47a8a72be0508303d36d9da8d5badd212869
+  metadata.gz: e6e194ca0104d33690c704260ef36ef265ab9979
+  data.tar.gz: 63de1464cea6731ab54c58e01c5ef46d74d6b46c
 SHA512:
-  metadata.gz: 29a9c134ed6e62cdd36b63248264b9e488700287010d6b9d66a235995c116fe450be036b97fea9a693ef72a099b6199e5af5a40eef7f7ac393b5027a42e2a71e
-  data.tar.gz: d2dd785394f5e12ee26b3935af41aae701b1ad8b6fcd7de30c47bdd8ad1b961399364d1fd216a402f7380e86cc195b588d8634d8d051934bfce2068f8a8886ed
+  metadata.gz: 71f0954b3bea0a23ba9f8c6169e86df4a92b4d81b8702f3634eeb770b9e989a0b4795703f2de97b533ffd521711fac0a54a5e540426978a55413c83c393f0cce
+  data.tar.gz: 84ac812bc020fe427adc6d34ae0d87a1c528701b8cb644da0bfe50b613e7a12dd7eb0bcf00c5c8b046afb024fb6d112cd36cbe729dbb2f89c39479fa8bb0e66b

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

@@ -15,7 +15,22 @@ class LHS::Record
         all = []
         default_max_limit = 100
         data = request(params: params.merge(limit: default_max_limit))
-        all.concat(data._raw[:items])
+        all.concat(all_items_from(data))
+        request_all_the_rest(data, all, params) if data._raw.is_a?(Hash) && data._raw[:total]
+        data._record_class.new(LHS::Data.new(all, nil, self))
+      end
+
+      private
+
+      def all_items_from(data)
+        if data._raw.is_a?(Array)
+          data._raw
+        else
+          data._raw[:items]
+        end
+      end
+
+      def request_all_the_rest(data, all, params)
         total_left = data._raw[:total] - data.count
         limit = data._raw[:limit] || data.count
         if limit > 0
@@ -25,7 +40,6 @@ class LHS::Record
             all.concat request(params: params.merge(limit: limit, offset: offset))._raw[:items]
           end
         end
-        data._record_class.new(LHS::Data.new(all, nil, self))
       end
     end
   end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "3.3.5"
+  VERSION = "3.3.6"
 end

data/spec/record/all_spec.rb

@@ -48,5 +48,21 @@ describe LHS::Collection do
       expect(all._proxy).to be_kind_of LHS::Collection
       expect(all.count).to eq 0
     end
+
+    it 'alsow works when there is no total in the stubbing' do
+      stub_request(:get, %r{/feedbacks}).to_return(body: { items: (1..100).to_a }.to_json)
+      all = Record.all
+      expect(all).to be_kind_of Record
+      expect(all._proxy).to be_kind_of LHS::Collection
+      expect(all.count).to eq 100
+    end
+
+    it 'alsow works when there is no key "items" in the stubbing' do
+      stub_request(:get, %r{/feedbacks}).to_return(body: (1..100).to_a.to_json)
+      all = Record.all
+      expect(all).to be_kind_of Record
+      expect(all._proxy).to be_kind_of LHS::Collection
+      expect(all.count).to eq 100
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc