Change default :size to 7

docs/api/pagy.md

@@ -131,7 +131,7 @@ They are all integers:
 
 | Variable        | Description                                                                                                                                                                                                                                                                                                                                                   | Default            |
 |:----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------|
-| `:size`         | The size of the page links to show: can be an array of initial pages, before current page, after current page, final pages or the total page size. _(see also [How to control the page links](/docs/how-to.md#control-the-page-links))_                                                                                                                       | `[1,4,4,1]`        |
+| `:size`         | The size of the page links to show: can be an array of initial pages, before current page, after current page, final pages or the total page size. _(see also [How to control the page links](/docs/how-to.md#control-the-page-links))_                                                                                                                       | `7`                |
 | `:page_param`   | The name of the page param name used in the url. _(see [How to customize the page param](/docs/how-to.md#customize-the-page-param))_                                                                                                                                                                                                                          | `:page`            |
 | `:params`       | It can be a `Hash` of params to add to the URL, or a `Proc` that can edit/add/delete the request params _(see [How to customize the params](/docs/how-to.md#customize-the-params))_                                                                                                                                                                           | `{}`               |
 | `:fragment`     | The arbitrary fragment string (including the "#") to add to the url. _(see [How to customize the params](/docs/how-to.md#customize-the-params))_                                                                                                                                                                                                              | `""`               |

lib/config/pagy.rb

@@ -20,7 +20,7 @@
 
 # Other Variables
 # See https://ddnexus.github.io/pagy/docs/api/pagy#other-variables
-# Pagy::DEFAULT[:size]         = [1,4,4,1]                    # default
+# Pagy::DEFAULT[:size]         = [1,4,4,1]                    # default pagy < 7.0
 # Pagy::DEFAULT[:page_param]   = :page                        # default
 # The :params can be also set as a lambda e.g ->(params){ params.exclude('useless').merge!('custom' => 'useful') }
 # Pagy::DEFAULT[:params]       = {}                           # default

lib/pagy.rb

@@ -16,7 +16,7 @@ def self.root
   DEFAULT = { page:         1, # rubocop:disable Style/MutableConstant
               items:        20,
               outset:       0,
-              size:         [1, 4, 4, 1],
+              size:         7,
               page_param:   :page,
               params:       {},
               fragment:     '',

test/pagy/extras/bootstrap_test.rb

@@ -11,17 +11,17 @@
 
   describe '#pagy_bootstrap_nav' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_bootstrap_nav(pagy)).must_rematch
       _(app.pagy_bootstrap_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_bootstrap_nav(pagy)).must_rematch
       _(app.pagy_bootstrap_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_bootstrap_nav(pagy)).must_rematch
       _(app.pagy_bootstrap_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
@@ -32,7 +32,7 @@
 
   describe '#pagy_bootstrap_nav_js' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_bootstrap_nav_js(pagy)).must_rematch
       _(app.pagy_bootstrap_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                          steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
@@ -46,13 +46,13 @@
                                           steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_bootstrap_nav_js(pagy)).must_rematch
       _(app.pagy_bootstrap_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                          steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_bootstrap_nav_js(pagy)).must_rematch
       _(app.pagy_bootstrap_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                          steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch

test/pagy/extras/bulma_test.rb

@@ -11,17 +11,17 @@
 
   describe '#pagy_bulma_nav' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_bulma_nav(pagy, pagy_id: 'test-nav-id')).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_bulma_nav(pagy)).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_bulma_nav(pagy)).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
@@ -32,7 +32,7 @@
 
   describe '#pagy_bulma_nav_js' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_bulma_nav_js(pagy)).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                      steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
@@ -46,13 +46,13 @@
                                   steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_bulma_nav_js(pagy)).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                      steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_bulma_nav_js(pagy)).must_rematch
       _(app.pagy_bulma_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                      steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch

test/pagy/extras/calendar_extra_test.rb

@@ -132,7 +132,7 @@ def app(**opts)
     end
     it 'selects :month for the last page' do
       calendar, _pagy, entries = app(params: { month_page: 26 }).send(:pagy_calendar, @collection,
-                                                                      month: {},
+                                                                      month: {  },
                                                                       pagy: { items: 600 })
       _(calendar[:month].series).must_equal [1, :gap, 22, 23, 24, 25, '26']
       _(calendar[:month].prev).must_equal 25
@@ -141,7 +141,8 @@ def app(**opts)
     end
     it 'selects :week for the first page' do
       calendar, _pagy, entries = app(params: { week_page: 1 }).send(:pagy_calendar, @collection,
-                                                                    week: { first_weekday: :sunday },
+                                                                    week: { first_weekday: :sunday,
+                                                                            size: [1, 4, 4, 1]},
                                                                     pagy: { items: 600 })
       _(calendar[:week].series).must_equal ["1", 2, 3, 4, 5, :gap, 109]
       _(calendar[:week].pages).must_equal 109
@@ -151,7 +152,8 @@ def app(**opts)
     end
     it 'selects :week for an intermediate page' do
       calendar, _pagy, entries = app(params: { week_page: 25 }).send(:pagy_calendar, @collection,
-                                                                     week: { first_weekday: :sunday },
+                                                                     week: { first_weekday: :sunday,
+                                                                             size: [1, 4, 4, 1] },
                                                                      pagy: { items: 600 })
       _(calendar[:week].series).must_equal [1, :gap, 21, 22, 23, 24, "25", 26, 27, 28, 29, :gap, 109]
       _(calendar[:week].prev).must_equal 24
@@ -160,7 +162,8 @@ def app(**opts)
     end
     it 'selects :week for the last page' do
       calendar, _pagy, entries = app(params: { week_page: 109 }).send(:pagy_calendar, @collection,
-                                                                      week: { first_weekday: :sunday },
+                                                                      week: { first_weekday: :sunday,
+                                                                      size: [1, 4, 4, 1]},
                                                                       pagy: { items: 600 })
       _(calendar[:week].series).must_equal [1, :gap, 105, 106, 107, 108, "109"]
       _(calendar[:week].prev).must_equal 108

test/pagy/extras/countless_extra_test.rb

@@ -25,13 +25,13 @@
       _(pagy.next).must_equal 2
     end
     it 'shows start-pages, :gap, before-pages, current and next for intermediate page' do
-      pagy, = app.send(:pagy_countless, @collection, page: 25)
+      pagy, = app.send(:pagy_countless, @collection, size: [1, 4, 4, 1], page: 25)
       _(pagy.series).must_equal [1, :gap, 21, 22, 23, 24, '25', 26]
       _(pagy.prev).must_equal 24
       _(pagy.next).must_equal 26
     end
     it 'shows start-pages, :gap, before-pages, current and next for last page' do
-      pagy, = app.send(:pagy_countless, @collection, page: last_page)
+      pagy, = app.send(:pagy_countless, @collection, size: [1, 4, 4, 1], page: last_page)
       _(pagy.series).must_equal [1, :gap, 46, 47, 48, 49, '50']
       _(pagy.prev).must_equal 49
       _(pagy.next).must_be_nil

test/pagy/extras/foundation_test.rb

@@ -11,17 +11,17 @@
 
   describe '#pagy_foundation_nav' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_foundation_nav(pagy)).must_rematch
       _(app.pagy_foundation_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_foundation_nav(pagy)).must_rematch
       _(app.pagy_foundation_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_foundation_nav(pagy)).must_rematch
       _(app.pagy_foundation_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
@@ -32,7 +32,7 @@
 
   describe '#pagy_foundation_nav_js' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_foundation_nav_js(pagy)).must_rematch
       _(app.pagy_foundation_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                           steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
@@ -46,13 +46,13 @@
                                   steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_foundation_nav_js(pagy)).must_rematch
       _(app.pagy_foundation_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                           steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_foundation_nav_js(pagy)).must_rematch
       _(app.pagy_foundation_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                           steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch

test/pagy/extras/materialize_test.rb

@@ -11,17 +11,17 @@
 
   describe '#pagy_materialize_nav' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_materialize_nav(pagy)).must_rematch
       _(app.pagy_materialize_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_materialize_nav(pagy)).must_rematch
       _(app.pagy_materialize_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_materialize_nav(pagy)).must_rematch
       _(app.pagy_materialize_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_rematch
     end
@@ -32,7 +32,7 @@
 
   describe '#pagy_materialize_nav_js' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_materialize_nav_js(pagy)).must_rematch
       _(app.pagy_materialize_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                            steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
@@ -46,13 +46,13 @@
                                   steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_materialize_nav_js(pagy)).must_rematch
       _(app.pagy_materialize_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                            steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_materialize_nav_js(pagy)).must_rematch
       _(app.pagy_materialize_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                            steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch

test/pagy/extras/metadata_test.rb

@@ -19,7 +19,7 @@
       _(Pagy::DEFAULT[:metadata]).must_rematch
     end
     it 'returns the full pagy metadata' do
-      pagy, _records = app.send(:pagy, @collection, metadata: (Pagy::DEFAULT[:metadata]) + [:sequels])
+      pagy, _records = app.send(:pagy, @collection, size: [1, 4, 4, 1], metadata: (Pagy::DEFAULT[:metadata]) + [:sequels])
       _(app.send(:pagy_metadata, pagy)).must_rematch
     end
     it 'checks for unknown metadata' do

test/pagy/extras/navs_test.rb

@@ -10,7 +10,7 @@
 
   describe '#pagy_nav_js' do
     it 'renders first page' do
-      pagy = Pagy.new(count: 1000, page: 1)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 1)
       _(app.pagy_nav_js(pagy)).must_rematch
       _(app.pagy_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
@@ -24,13 +24,13 @@
                                     steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders intermediate page' do
-      pagy = Pagy.new(count: 1000, page: 20)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 20)
       _(app.pagy_nav_js(pagy)).must_rematch
       _(app.pagy_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch
     end
     it 'renders last page' do
-      pagy = Pagy.new(count: 1000, page: 50)
+      pagy = Pagy.new(size: [1, 4, 4, 1], count: 1000, page: 50)
       _(app.pagy_nav_js(pagy)).must_rematch
       _(app.pagy_nav_js(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra',
                                steps: { 0 => [1, 2, 2, 1], 600 => [1, 3, 3, 1] })).must_rematch