promoted-ruby-client 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d336aef96b116acbe2e611279e9ccefe5efce88063d5c530fb669b32383d10
-  data.tar.gz: 6df512d099b5a5b9414b2672847585db2118825b87c178b923da26ba2cb610e8
+  metadata.gz: d2581fc859bd3a30b8460858e6ab95ef4be27724f60ac02cff4e15c4579ea833
+  data.tar.gz: e87f89c047284f62cdd8d1975aae5c464e096f32c752352f5d83820b8e922ea4
 SHA512:
-  metadata.gz: 7375f08d88303d6de8eefaf3a4b7e2b80333f15e8b709781c4884aee54d84c9d64b6bdc834c4a5c53f1f426a04a5aed9752cc7ceba78d6015f100d7ee6096e0c
-  data.tar.gz: 2cdff05db0a989331ca56e0f18716f53e635ea7d000d685275693b21445a313763e2001827b201ec2863173eb52f54744b50177f824ae7a0d44a85f975105e5e
+  metadata.gz: 98361d750d5bf3605b4acda0c974be206ae115fa973f8d4e57d723874d2fed40eb86b4f635ce22a502c5faf36e1e6ee12456f95b9d4fc8a5e763a0747393a20e
+  data.tar.gz: ebf6134571b25c908d9dba394286a31564517d0218d3d97975e5965a85d3607c91ff37f191cbb8d1dd2942bd9c47209cbb56315bd7ea3a4e92c92d5313220b36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    promoted-ruby-client (4.0.0)
+    promoted-ruby-client (4.0.1)
       concurrent-ruby (~> 1)
       faraday (>= 0.9.0)
       faraday_middleware (>= 0.9.0)

data/dev.md

@@ -11,4 +11,4 @@ bundle exec rspec
 3. Modify `promoted-ruby-client.gemspec`'s push block.
 4. Run `gem build promoted-ruby-client.gemspec` to generate `gem`.
 5. Run `bundle exec rspec`.  This updates `Gemfile.lock`.
-6. Run (using new output) `gem push promoted-ruby-client-4.0.0.gem`
+6. Run (using new output) `gem push promoted-ruby-client-4.0.1.gem`

data/lib/promoted/ruby/client/pager.rb

@@ -13,24 +13,28 @@ module Promoted
         class Pager
             def validate_paging(insertions, retrieval_insertion_offset, paging)
               if paging && paging[:offset]
-                offset = [0, paging[:offset]].max
-                if offset >= insertions.length
-                  raise InvalidPagingError.new("Invalid page offset (insertion size #{insertions.length}, offset #{offset})", [])
-                end
-                if offset < retrieval_insertion_offset
-                  raise InvalidPagingError.new("Invalid page offset (retrieval_insertion_offset #{retrieval_insertion_offset}, offset #{offset})", [])
-                end
+                offset, retrieval_insertion_offset, index = _sanitize_offsets(retrieval_insertion_offset, paging)
+                _validate_paging(insertions, retrieval_insertion_offset, offset, index)
               end
             end
 
-            def apply_paging(insertions, retrieval_insertion_offset, paging = nil)
-              begin
-                validate_paging(insertions, retrieval_insertion_offset, paging)
-              rescue InvalidPagingError => err
-                # This is invalid input, stop it before it goes to the server.
-                return err.default_insertions_page
+            def _sanitize_offsets(retrieval_insertion_offset, paging)
+              offset = [0, paging[:offset]].max
+              retrieval_insertion_offset = [0, retrieval_insertion_offset].max
+              index = [0, offset - retrieval_insertion_offset].max
+              return [offset, retrieval_insertion_offset, index]
+            end
+
+            def _validate_paging(insertions, retrieval_insertion_offset, offset, index)
+              if offset < retrieval_insertion_offset
+                raise InvalidPagingError.new("Invalid page offset (retrieval_insertion_offset #{retrieval_insertion_offset}, offset #{offset})", [])
+              end
+              if index >= insertions.length
+                raise InvalidPagingError.new("Invalid page offset (insertion size #{insertions.length}, index #{index})", [])
               end
+            end
 
+            def apply_paging(insertions, retrieval_insertion_offset, paging = nil)
               if !paging
                 paging = {
                   :offset => 0,
@@ -38,9 +42,14 @@ module Promoted
                 }
               end
 
-              offset = [0, paging[:offset]].max
-              retrieval_insertion_offset = [0, retrieval_insertion_offset].max
-              index = [0, offset - retrieval_insertion_offset].max
+              offset, retrieval_insertion_offset, index = _sanitize_offsets(retrieval_insertion_offset, paging)
+
+              begin
+                _validate_paging(insertions, retrieval_insertion_offset, offset, index)
+              rescue InvalidPagingError => err
+                # This is invalid input, stop it before it goes to the server.
+                return err.default_insertions_page
+              end
 
               size = paging[:size]
               if size <= 0

data/lib/promoted/ruby/client/version.rb

@@ -1,7 +1,7 @@
 module Promoted
   module Ruby
     module Client
-      VERSION = "4.0.0"
+      VERSION = "4.0.1"
       SERVER_VERSION = "rb." + VERSION
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promoted-ruby-client
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - scottmcmaster
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-17 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday