lhs 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9054af3b33bec8e693c84c84e44ba80845e4525c
-  data.tar.gz: 6ebd3acdaa73985d3f1845c92fe3cf57803c604f
+  metadata.gz: 97ecd71fe1e08636cbe1a790d4bd8c0787facbdd
+  data.tar.gz: 932f5f517996f854e619f12dbaaea58f21205c20
 SHA512:
-  metadata.gz: 51165a2c4256deb6cf82f445c8a597b7c1830a40edc1004239c32b34bf629bd5e81417590351e0f88159c5a60aebaf68f79199042ccffb8b80a078096879fe1e
-  data.tar.gz: ee0fe6d834cf6194276852903e7a33215fba61eb6b0b1715bea3da2b9a2c8478c465c32c8c13fb9371131c907d09d506bb7e20efcce5e32cb438498d7aba6d80
+  metadata.gz: b1768124ad016dd853334bd431d267cf45857b68d2964695b4ce0f0475f516bb01d40b3c137a4b2d93fb8d7868ccd29a830e6401953c5a4a979769feb47cd22d
+  data.tar.gz: b6351fc5cfee078fc8c3f64b911548e10ab72a197650f4838a666286715764a457bec28d5710229882553050bfcd84342aad3b4160fb42730adcd0d29cda4212

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

@@ -16,12 +16,16 @@ class LHS::Record
       def all(params = {})
         limit = params[limit_key] || DEFAULT_LIMIT
         data = request(params: params.merge(limit_key => limit))
-        request_all_the_rest(data, params) if data._raw.is_a?(Hash) && data._raw[total_key]
+        request_all_the_rest(data, params) if paginated?(data._raw)
         data._record.new(LHS::Data.new(data, nil, self))
       end
 
       private
 
+      def paginated?(raw)
+        raw.is_a?(Hash) && raw[total_key] && raw[pagination_key]
+      end
+
       def all_items_from(data)
         if data._raw.is_a?(Array)
           data._raw

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

@@ -15,25 +15,25 @@ class LHS::Record
       end
 
       def items_key
-        @configuration.try(:[], :items_key) || :items
+        (@configuration.try(:[], :items_key) || :items).to_sym
       end
 
       def limit_key
-        @configuration.try(:[], :limit_key) || :limit
+        (@configuration.try(:[], :limit_key) || :limit).to_sym
       end
 
       def total_key
-        @configuration.try(:[], :total_key) || :total
+        (@configuration.try(:[], :total_key) || :total).to_sym
       end
 
       # Key used for determine current page
       def pagination_key
-        @configuration.try(:[], :pagination_key) || :offset
+        (@configuration.try(:[], :pagination_key) || :offset).to_sym
       end
 
       # Strategy used for calculationg next pages and navigate pages
       def pagination_strategy
-        @configuration.try(:[], :pagination_strategy) || :offset
+        (@configuration.try(:[], :pagination_strategy) || :offset).to_sym
       end
     end
   end

data/lib/lhs/pagination.rb

@@ -22,7 +22,7 @@ class Pagination
   end
 
   def offset
-    data._raw[_record.pagination_key.to_sym]
+    data._raw[_record.pagination_key.to_sym].presence || 0
   end
   alias current_page offset
   alias start offset

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

data/spec/pagination/pages_left_spec.rb

@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  let(:offset) { 0 }
+  let(:data_hash) { { items: 98.times.map { { foo: 'bar' } }, total: 98, offset: offset, limit: 10 } }
+
+  let(:data) do
+    LHS::Data.new(data_hash, nil, Record)
+  end
+
+  let(:pagination) { OffsetPagination.new(data) }
+
+  before(:each) do
+    class Record < LHS::Record
+      endpoint ':datastore/v2/data'
+    end
+  end
+
+  it 'responds to pages_left' do
+    expect(pagination.pages_left).to eq(9)
+  end
+
+  context 'when there is no offset' do
+    let(:offset) { nil }
+
+    it 'responds to pages_left' do
+      # TODO i now set the nil offset to zero. Is this ok or wrong?
+      expect(pagination.pages_left).to eq(9)
+    end
+  end
+end

data/spec/record/all_spec.rb

@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  let(:datastore) do
+    'http://datastore/v2'
+  end
+
+  before(:each) do
+    LHC.config.placeholder('datastore', datastore)
+    class Record < LHS::Record
+      endpoint ':datastore/feedbacks'
+    end
+  end
+
+  context 'all' do
+    it 'is querying endpoint without pagination when using all' do
+      stub_request(:get, "#{datastore}/feedbacks?limit=100").to_return(status: 200, body: { items: 300.times.map { { foo: 'bar' } }, total: 300 }.to_json)
+      records = Record.all
+      expect(records).to be_kind_of Record
+      expect(records.size).to eq(300)
+    end
+  end
+end

data/spec/record/paginatable_collection_spec.rb

@@ -96,7 +96,7 @@ describe LHS::Record do
       expect(all.last).to eq 223
     end
 
-    it 'also fetches all when there is not meta information for limit' do
+    it 'also fetches all when there is no meta information for limit' do
       stub_request(:get, "#{datastore}/feedbacks?limit=100")
         .to_return(
           status: 200,
@@ -151,7 +151,7 @@ describe LHS::Record do
       expect(all.last).to eq 300
     end
 
-    it 'also fetches all when there is not meta information for limit' do
+    it 'also fetches all when there is no meta information for limit' do
       stub_request(:get, "#{datastore}/feedbacks?limit=100")
         .to_return(
           status: 200,
@@ -229,7 +229,7 @@ describe LHS::Record do
       expect(all.last).to eq 300
     end
 
-    it 'also fetches all when there is not meta information for limit' do
+    it 'also fetches all when there is no meta information for limit' do
       stub_request(:get, "#{datastore}/feedbacks?limit=100")
         .to_return(
           status: 200,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -273,8 +273,10 @@ files:
 - spec/item/setter_spec.rb
 - spec/item/update_spec.rb
 - spec/item/validation_spec.rb
+- spec/pagination/pages_left_spec.rb
 - spec/proxy/load_spec.rb
 - spec/rails_helper.rb
+- spec/record/all_spec.rb
 - spec/record/build_spec.rb
 - spec/record/create_spec.rb
 - spec/record/creation_failed_spec.rb
@@ -328,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 1.9.2
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services
@@ -398,8 +400,10 @@ test_files:
 - spec/item/setter_spec.rb
 - spec/item/update_spec.rb
 - spec/item/validation_spec.rb
+- spec/pagination/pages_left_spec.rb
 - spec/proxy/load_spec.rb
 - spec/rails_helper.rb
+- spec/record/all_spec.rb
 - spec/record/build_spec.rb
 - spec/record/create_spec.rb
 - spec/record/creation_failed_spec.rb