Merge branch 'dev'

.github/ISSUE_TEMPLATE/Code.yml

@@ -19,7 +19,7 @@ body:
     attributes:
       label: 👀 Before submitting...
       options:
-        - label: I upgraded to pagy version 8.6.1
+        - label: I upgraded to pagy version 8.6.2
           required: true
         - label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
           required: true

.github/latest_release_body.md

@@ -7,11 +7,12 @@
 - Deprecate the legacy nav bar, add features to the default faster nav bar series
 - See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
 
-### Changes in 8.6.1
+### Changes in 8.6.2
 
 <!-- changes start -->
-- Update playground apps and e2e tests
-- Update pagy.rb initializer
+- Fix the legacy size in code and test
+- Improve code readability and size check in series
+- Fix the old terminology in the demo.ru app
 <!-- changes end -->
 
 [CHANGELOG](https://ddnexus.github.io/pagy/changelog)

CHANGELOG.md

@@ -28,9 +28,16 @@ If you upgrade from version `< 8.0.0` see the following:
   - `pagy-dev.js`: use the `pagy.min.js`with the `pagy.min.js.map`
   - `pagy-module.d.ts`: use `pagy.d.ts`
 - The Array type for the `:size` (e.g. `size: [1, 4, 4, 1]`) that generates the classic bar. Use the `:size` set to an integer 
-  with the `gaps: true` variable (which are the default since 8.4.6). If a legacy bar it will remain REALLY a requirement, add `require 'pagy/extras/size` to your `pagy.rb` initalizer for smooth upgrades. (see [size extra](https://ddnexus.github.io/pagy/docs/extras/size))
+  with the `ends: true` variable (which are the default since 8.4.6). If a legacy bar it will remain REALLY a requirement, add 
+  `require 'pagy/extras/size` to your `pagy.rb` initalizer for smooth upgrades. (see [size extra](https://ddnexus.github.io/pagy/docs/extras/size))
 <hr>
 
+## Version 8.6.2
+
+- Fix the legacy size in code and test
+- Improve code readability and size check in series
+- Fix the old terminology in the demo.ru app
+
 ## Version 8.6.1
 
 - Update playground apps and e2e tests

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    pagy (8.6.1)
+    pagy (8.6.2)
 
 GEM
   remote: https://rubygems.org/

gem/apps/calendar.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#5-calendar-app
 
-VERSION = '8.6.1'
+VERSION = '8.6.2'
 
 # Gemfile
 require 'bundler/inline'

gem/apps/demo.ru

@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '8.6.1'
+VERSION = '8.6.2'
 
 require 'bundler/inline'
 require 'bundler'
@@ -380,15 +380,15 @@ for details</p>
 <%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'simple-nav', aria_label: 'Pages simple-nav', size: 5) %>
 <%= highlight(html) %>
 
-<h2>pagy<%= prefix %>_nav <span class="notes">Classic nav <code>size: 7</code></span></h2>
+<h2>pagy<%= prefix %>_nav <span class="notes">Fast nav <code>size: 7</code></span></h2>
 <%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'nav', aria_label: 'Pages nav') %>
 <%= highlight(html) %>
 
-<h2>pagy<%= prefix %>_nav_js <span class="notes">Classic nav <code>size: 7</code></span></h2>
+<h2>pagy<%= prefix %>_nav_js <span class="notes">Fast nav <code>size: 7</code></span></h2>
 <%= html = send(:"pagy#{prefix}_nav_js", @pagy, id: 'nav-js', aria_label: 'Pages nav_js') %>
 <%= highlight(html) %>
 
-<h2>pagy<%= prefix %>_nav_js <span class="notes">Responsive <code>steps: {...}</code> (Resize the window to see)</span></h2>
+<h2>pagy<%= prefix %>_nav_js <span class="notes">Responsive nav <code>steps: {...}</code> (Resize the window to see)</span></h2>
 <%= html = send(:"pagy#{prefix}_nav_js", @pagy, id: 'nav-js-responsive',
      aria_label: 'Pages nav_js_responsive',
      steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>

gem/apps/rails.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '8.6.1'
+VERSION = '8.6.2'
 
 # Gemfile
 require 'bundler/inline'

gem/apps/repro.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '8.6.1'
+VERSION = '8.6.2'
 
 require 'bundler/inline'
 require 'bundler'
@@ -164,7 +164,7 @@ __END__
 
   <h4>pagy_nav_js</h4>
   <%= pagy_nav_js(@pagy, id: 'nav-js-responsive', aria_label: 'Pages nav_js_responsove',
-     steps: { 0 => [1,1,1,1], 500 => [1,3,3,1], 750 => [1,5,5,1], 1000 => [2,6,6,2] }) %>
+     steps: { 0 => 5, 500 => 7, 750 => 9, 1000 => 11 }) %>
 
   <h4>pagy_combo_nav_js</h4>
   <%= pagy_combo_nav_js(@pagy, id: 'combo-nav-js', aria_label: 'Pages combo_nav_js') %>

gem/bin/pagy

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '8.6.1'
+VERSION = '8.6.2'
 APPS    = %w[repro rails demo calendar].freeze
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 HOST    = '0.0.0.0'

gem/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (8.6.1)
+# Pagy initializer file (8.6.2)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

gem/javascripts/pagy-module.js

@@ -73,7 +73,7 @@ const Pagy = (() => {
   };
   const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
   return {
-    version: "8.6.1",
+    version: "8.6.2",
     init(arg) {
       const target = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");