manageiq-api-common 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa3a3a98c142ee7b4e8e62af8acd12e08a86d189bf74ad2eb902b454c9b20bb
-  data.tar.gz: eddfcfd2730f8a252a76482a72d213c2cdc18d887b3c6465d378bc8b9119a3f4
+  metadata.gz: 0c8d656cee54b8c74a2657c8102480ee5682a2af50f14d02ce345668425983db
+  data.tar.gz: 7204efad0cbab35cdbbb70eb046059fd1a5de69d6630a77c6806ba39125a30c2
 SHA512:
-  metadata.gz: 6f7a9bbfaf5e56fc3f625d35e8a1e0f466e65581980a88a72d052e5d5d2bd472b0f1de63380b84cf678e85b12b03713fbaf84adb2b6d23544947cecb79200f3b
-  data.tar.gz: 1e563fc8760b903a88f7dffcb7e3569400e84dc2b4f86a0e440c74b7bc191d4ced1b7162120401554d6bd1b7770ee9918b2f173636f6433975ab111c2a643876
+  metadata.gz: bf2b4452a59e4eea346b73eff624639ac10f93a1e361e44e5a9fe6985c9955c146484d1c7320cce950617c066c37e75a70fe33f41634f8942073ff6bf2d7abdf
+  data.tar.gz: b42783172cf71e6487d48ece8ca85bbd25322fa5a547e8953a2da52eab00c966910508aff6c4eeb85a3aff0cb6d9e1e3f683a95fb53df9edd25e6b35e75b0fbb

data/lib/manageiq/api/common/paginated_response.rb

@@ -47,16 +47,17 @@ module ManageIQ
         end
 
         def link_to_prev
-          return if current_limit_multiplier == 0
+          return if offset == 0
+          prev_offset = offset - limit
 
-          link_with_new_offset((current_limit_multiplier - 1) * limit)
+          link_with_new_offset(prev_offset.clamp(0, Float::INFINITY))
         end
 
         def link_to_next
-          next_limit_multiplier = current_limit_multiplier + 1
-          return if next_limit_multiplier > max_limit_multiplier
+          next_offset = limit + offset
+          return if next_offset >= count
 
-          link_with_new_offset(next_limit_multiplier * limit)
+          link_with_new_offset(next_offset)
         end
 
         def link_with_new_offset(offset)
@@ -75,10 +76,6 @@ module ManageIQ
           @request_uri ||= URI.parse(@request.original_url)
         end
 
-        def current_limit_multiplier
-          @current_limit_multiplier ||= offset / limit
-        end
-
         def max_limit_multiplier
           @max_limit_multiplier ||= ((count - 1) / limit)
         end

data/lib/manageiq/api/common/version.rb

@@ -1,7 +1,7 @@
 module ManageIQ
   module API
     module Common
-      VERSION = "1.0.0".freeze
+      VERSION = "1.0.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-api-common
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant