lhs 20.1.3.pre.paginationfix.2 → 20.1.3.pre.paginationfix.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77f78ba0588ecc1b8e7d65c397a247459ab9caa2dfb43239635bf10680277e1e
-  data.tar.gz: a4e0e1e31dbe6346e648ec4b0406055688abc1487becc743e419cc72c3b6a07d
+  metadata.gz: b9284aed364b9d0b32bd9341399c4c8309aa3438c4d6e073b89a7d4f3fcaab21
+  data.tar.gz: d3c50128acf732d233b61d2930f22a38d48102dca92fb13ab2f2f88a03108767
 SHA512:
-  metadata.gz: '012237879f1dbd65316592604126fa3a2593c5c6500801a01a3b6f09f3ffbbb9cd9060e974604549139b699a800b0c9185c32b4b0e926b5f93915f9edae5be72'
-  data.tar.gz: c291587ba6fd626dd17ac7c470fb1f8ccd55a8926bb395773a63902b72c432a881c4934e53d249fcf7cf3b4142fd63213d6bbab3cce021bef4246ccbe0925342
+  metadata.gz: f75419036051feb2e65f155a59dfedf1364f2fb23f2f97bab4615fce6152ae8158f249a20f97308a4e8284c70180de920d5dc97ab13fbfd8f8876d2888aee7aa
+  data.tar.gz: 248054e48c2a757db5575c982f17356038d9d63d475f24fbd320c2bb1732481d7ff9ccc3c70b4baa50bef5c21701bec1ac2d0916ed917fdab30f58737d7472cf

data/lib/lhs/pagination/base.rb

@@ -23,12 +23,12 @@ module LHS::Pagination
     alias count total
 
     def limit
-      limit_value = data._raw.dig(*_record.limit_key(:body))
-      requested_limit = data._request.params.dig(*_record.limit_key(:params))
-      if requested_limit && limit_value && limit_value < requested_limit
+      response_limit = data._raw.dig(*_record.limit_key(:body))
+      requested_limit = data._request.params.dig(*_record.limit_key(:params)).to_i if data&._request&.params.present?
+      if  requested_limit && response_limit && last_page?(response_limit, requested_limit) && response_limit < requested_limit
         requested_limit
       else
-        limit_value || DEFAULT_LIMIT
+        response_limit || DEFAULT_LIMIT
       end
     end
 
@@ -53,6 +53,10 @@ module LHS::Pagination
       # should be implemented in subclass (optional)
     end
 
+    def last_page?
+      raise 'to be implemented in subclass'
+    end
+
     def first_page
       1
     end

data/lib/lhs/pagination/offset.rb

@@ -12,6 +12,10 @@ class LHS::Pagination::Offset < LHS::Pagination::Base
     self.class.next_offset(offset, limit, step)
   end
 
+  def last_page?(response_limit, requested_limit)
+    offset + response_limit >= total
+  end
+
   def self.page_to_offset(page, limit = DEFAULT_LIMIT)
     (page.to_i - 1) * limit.to_i
   end

data/lib/lhs/pagination/page.rb

@@ -8,6 +8,10 @@ class LHS::Pagination::Page < LHS::Pagination::Base
     offset
   end
 
+  def last_page?(response_limit, requested_limit)
+    (offset-1 * requested_limit) + response_limit >= total
+  end
+
   def next_offset(step = 1)
     self.class.next_offset(current_page, limit, step)
   end

data/lib/lhs/pagination/start.rb

@@ -12,6 +12,10 @@ class LHS::Pagination::Start < LHS::Pagination::Base
     self.class.next_offset(offset, limit, step)
   end
 
+  def last_page?(response_limit, requested_limit)
+    offset + response_limit > total
+  end
+  
   def self.page_to_offset(page, limit = DEFAULT_LIMIT)
     (page.to_i - 1) * limit.to_i + 1
   end

data/lib/lhs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 20.1.3.pre.paginationfix.2
+  version: 20.1.3.pre.paginationfix.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors