geared_pagination 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e2956267a150a716db8afc9a1e0a9b03ac14906162faa283d5de88624b2f21
-  data.tar.gz: 85222f625262561aafae1025403375f21adc4fb3b78d750d68929183dcd2269b
+  metadata.gz: 750005ac1e001628bcb41a5fc7ff8c3816882df33785ff6038833d17ea9ea895
+  data.tar.gz: 983b5d46b9cb9174b1ced7931a0015b2d202f7f3bd578d6fd0172878ba57947a
 SHA512:
-  metadata.gz: ebaba73472a04348a60e2e73b679dc4040f39e9b2193816bdda3c111c3a6dc9d16bcf944d4a4adf3c41b9636f6f4d194d21137dcf652f727e3223ae0576b21b1
-  data.tar.gz: 657c6f6d8d0ee877910fb0f394e5229928325af59c471aa48c8bcddb34c75a824a5c92a128bb60757d2178205c914e3aaf3c2c96adcff036fba0098a30c7e3fe
+  metadata.gz: e66422eaa4008173bef8c798283f9b56a73853e88453b7d12fee2a6f5e0d0c88af0ab145fd83972bd41af017cafe35c4e306750aa75cb556ffd2bb51c465f208
+  data.tar.gz: 5e76d1a248cf859854b3c53eaaadcba3d14f11e4dd14dafbbca2cef30eeb1f6d791b35db386a9131eb2b9f0e4671921dcbd6171005da0f4d9dca90e0bbe9b453

data/.gitignore

@@ -1,3 +1,4 @@
+*.gem
 .byebug_history
 
 test/dummy/db/*.sqlite3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geared_pagination (1.0.1)
+    geared_pagination (1.1.1)
       activesupport (>= 5.0)
       addressable (>= 2.5.0)
 
@@ -82,14 +82,16 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)

data/geared_pagination.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'geared_pagination'
-  s.version  = '1.0.1'
+  s.version  = '1.1.1'
   s.authors  = 'David Heinemeier Hansson'
   s.email    = 'david@basecamp.com'
   s.summary  = 'Paginate Active Record sets at variable speeds'

data/lib/geared_pagination/cursor.rb

@@ -6,6 +6,8 @@ module GearedPagination
     class << self
       def from_param(key)
         key.present? ? decode(key) : new
+      rescue ArgumentError, JSON::ParserError
+        new
       end
 
       def decode(key)

data/lib/geared_pagination/page.rb

@@ -35,7 +35,11 @@ module GearedPagination
     end
 
     def last?
-      number >= recordset.page_count
+      number == recordset.page_count
+    end
+
+    def before_last?
+      number < recordset.page_count
     end
 
 

data/lib/geared_pagination/portions/portion_at_cursor.rb

@@ -34,7 +34,7 @@ module GearedPagination
       end
 
       def orderings
-        orders.to_h { |order| [ order.attribute, order.direction ] }
+        orders.map { |order| [ order.attribute, order.direction ] }.to_h
       end
 
       def limit

data/lib/geared_pagination/portions/portion_at_offset.rb

@@ -17,7 +17,10 @@ module GearedPagination
     end
 
     def offset
-      (page_number - 1).times.sum { |index| ratios[index + 1] }
+      variable = [(page_number - 1), ratios.size - 1].min.times.sum { |index| ratios[index + 1] }
+      fixed = [page_number - ratios.size, 0].max * ratios.fixed
+
+      variable + fixed
     end
 
     def next_param(*)

data/lib/geared_pagination/ratios.rb

@@ -3,15 +3,23 @@ module GearedPagination
     DEFAULTS = [ 15, 30, 50, 100 ]
 
     def initialize(ratios = nil)
-      @ratios = Array(ratios || DEFAULTS)
+      @ratios = Array(ratios || DEFAULTS).map(&:to_i)
     end
 
     def [](page_number)
-      @ratios[page_number - 1] || @ratios.last
+      @ratios[page_number - 1] || fixed
     end
 
     def cache_key
       @ratios.join('-')
     end
+
+    def size
+      @ratios.size
+    end
+
+    def fixed
+      @ratios.last
+    end
   end
 end

data/test/controller_test.rb

@@ -14,6 +14,9 @@ class GearedPagination::ControllerTest < ActionController::TestCase
     assert_equal etag_for("placeholder", "page/1:1-2"), response.etag
     etag_before_gearing_change = response.etag
 
+    get :index, params: { page: 2, per_page: [ 1, 2 ] }
+    assert_equal etag_for("placeholder", "page/2:1-2"), response.etag
+
     get :index, params: { page: 1, per_page: [ 1, 2 ] }
     assert_equal etag_before_gearing_change, response.etag
 

data/test/cursor_test.rb

@@ -7,6 +7,11 @@ class GearedPagination::CursorTest < ActiveSupport::TestCase
     assert_equal 1, GearedPagination::Cursor.from_param(" ").page_number
   end
 
+  test "from an invalid param" do
+    assert_equal 1, GearedPagination::Cursor.from_param("aGVsbG8K").page_number
+    assert_equal 1, GearedPagination::Cursor.from_param("\o/ not base64").page_number
+  end
+
   test "decode" do
     assert_equal 1, GearedPagination::Cursor.decode("eyJwYWdlX251bWJlciI6MX0=").page_number
   end

data/test/page_test.rb

@@ -20,8 +20,13 @@ class GearedPagination::PageTest < ActiveSupport::TestCase
   end
 
   test "last with page number greater than page count" do
-    page_for_empty_set = GearedPagination::Recordset.new(Recording.none, per_page: 1000).page(2)
-    assert page_for_empty_set.last?
+    assert_not GearedPagination::Recordset.new(Recording.none, per_page: 1000).page(2).last?
+  end
+
+  test "before_last" do
+    assert     GearedPagination::Recordset.new(Recording.all, per_page:    1).page(1).before_last?
+    assert_not GearedPagination::Recordset.new(Recording.all, per_page: 1000).page(1).before_last?
+    assert_not GearedPagination::Recordset.new(Recording.none, per_page: 1000).page(2).before_last?
   end
 
   test "next offset param" do

data/test/portion_at_offset_test.rb

@@ -7,6 +7,9 @@ class GearedPagination::PortionAtOffsetTest < ActiveSupport::TestCase
     assert_equal 0, GearedPagination::PortionAtOffset.new(page_number: 1).offset
     assert_equal GearedPagination::Ratios::DEFAULTS.first, GearedPagination::PortionAtOffset.new(page_number: 2).offset
     assert_equal GearedPagination::Ratios::DEFAULTS.first + GearedPagination::Ratios::DEFAULTS.second, GearedPagination::PortionAtOffset.new(page_number: 3).offset
+    assert_equal 4.times.sum { |index| GearedPagination::Ratios::DEFAULTS[index] || GearedPagination::Ratios::DEFAULTS.last }, GearedPagination::PortionAtOffset.new(page_number: 5).offset
+    assert_equal 5.times.sum { |index| GearedPagination::Ratios::DEFAULTS[index] || GearedPagination::Ratios::DEFAULTS.last }, GearedPagination::PortionAtOffset.new(page_number: 6).offset
+    assert_equal 9.times.sum { |index| GearedPagination::Ratios::DEFAULTS[index] || GearedPagination::Ratios::DEFAULTS.last }, GearedPagination::PortionAtOffset.new(page_number: 10).offset
   end
 
   test "limit" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geared_pagination
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Paginate Active Record sets at variable speeds