lhs 20.1.2 → 20.1.3.pre.paginationfix.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6222738010dc108833f001419f0fe23f97c1fbe6bb3211347724455bd6d1fab6
-  data.tar.gz: ec1856d1a8ce39396dedf8251058f59604f3e84111a2dffea05a7b0d97b07cab
+  metadata.gz: 01b93ba0d7073ad916d4af31c05e3739d095729d17691d07473374547d589917
+  data.tar.gz: 6a1f7462a292f695c45b1b0d6659415b75cdcbc282b9cdd6740cbe2a24245ab8
 SHA512:
-  metadata.gz: 22dde92abf63322ceab6d51962462c5dac3a34c12c46438a761fdce584066e50c1202babbc31762326cd96d073edd7d83aa8b8a231948a3d404adb93ea8a8ea2
-  data.tar.gz: eaafb72d93e036a0e8af226877fea17d5489e722bbd0d403946bc4828e3429f2a37cf85dc46818116fe751fb937dc3c1851e4cc9ac55f0d7fbbb0482611abe38
+  metadata.gz: 1b1834964ca5704e3e3170933127fcb1dfcd92f19293f1b87a64374387965f1f8f0ed13e543f1959b8aa5292a940706f1f0fa524bfff465b47a9c5c5459a052d
+  data.tar.gz: c9f9f5c5dc3b7ba0f1759080442f4bc80735ac8e2f664ecf9608ed5b345fb0a565858e03ffc2aa1ad88d50af76efba66cb66361d58ccf39884dd45e86ac1ac06

data/lib/lhs/pagination/base.rb

@@ -23,7 +23,13 @@ module LHS::Pagination
     alias count total
 
     def limit
-      data._raw.dig(*_record.limit_key(:body)) || DEFAULT_LIMIT
+      limit_value = data._raw.dig(*_record.limit_key(:body))
+      requested_limit = data._request.params.dig(*_record.limit_key(:params))
+      if limit_value < requested_limit
+        requested_limit
+      else
+        limit_value || DEFAULT_LIMIT
+      end
     end
 
     def offset

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '20.1.2'
+  VERSION = '20.1.3.pre.paginationfix.1'
 end

data/spec/record/pagination_spec.rb

@@ -67,5 +67,27 @@ describe LHS::Record do
         expect(record.total_pages).to eq(28)
       end
     end
+
+    context 'total_pages calculation for last page' do
+      before do
+        class Search < LHS::Record
+          configuration pagination_strategy: :start, total_key: :totalResult, pagination_key: :start, limit_key: { body: :size, parameter: :limit }
+          endpoint 'https://search'
+        end
+      end
+
+      it 'provides the correct number of total pages for the last page' do
+        stub_request(:get, "https://search/?limit=10&start=11")
+          .to_return(body: {
+            size: 4,
+            totalResult: 14,
+            start: 11,
+            items: [11,12,13,14]
+          }.to_json)
+
+        results = Search.page(2).limit(10).fetch
+        expect(results.total_pages).to eq 2
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 20.1.2
+  version: 20.1.3.pre.paginationfix.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -525,12 +525,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.3.0
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like