pagy 4.11.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed7987ef93f9d2d45f8b37c7d8c62546bb08b658699d4fdacf7e06b2e5abdefe
-  data.tar.gz: d2330d05cbf068d938425ed64ec3a0b0a16cf86d36cd2a2b2d8fc2568942a2d3
+  metadata.gz: 5300f9784ba9ab19522910b10e2f100a9823b5b52c91738966e946c91a08702a
+  data.tar.gz: 2dc3599be82ee24dba9e8074c1b84e5443d69550ddec6fd32967f66a316ecedd
 SHA512:
-  metadata.gz: c938d41fae6e33cfd0d569655b134f2d239fe44f6fc5cdcfc76234e20d5c6a9e2650e6bd6f3230044783353ba65dde5afb24867af8df4c59189eee67dda25fea
-  data.tar.gz: 585446ab8b45078fcb666dc9a406516eeac7f715cca90118d5927f5d89acf0cc51056aa75aebed9885c3e5b25f61f9e4baad75869f2d244ab01a359919493b98
+  metadata.gz: 36b6893409fad1745593238f9a169623841dc4b55172fd2263f0bba09b3436e8c7f4e6f5ff6fc65bd56233b510daef44df60238189249547205f17087ddd69ab
+  data.tar.gz: bddaf3afe21358ed1b9ed73de5585931f4dac9018cc37b30c268aae29cdd7f836ac4f77e4ea419f9268dc4f9f247907996ab2461cd6fc6a44d9e80467b513567

data/lib/config/pagy.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.11.0)
+# Pagy initializer file (5.1.1)
 # Customize only what you really need and notice that 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
 
 
 # Pagy Variables
 # See https://ddnexus.github.io/pagy/api/pagy#variables
-# All the Pagy::VARS are set for all the Pagy instances but can be overridden
+# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden
 # per instance by just passing them to Pagy.new or the #pagy controller method
 
 
 # Instance variables
 # See https://ddnexus.github.io/pagy/api/pagy#instance-variables
-# Pagy::VARS[:page]   = 1                                  # default
-# Pagy::VARS[:items]  = 20                                 # default
-# Pagy::VARS[:outset] = 0                                  # default
+# Pagy::DEFAULT[:page]   = 1                                  # default
+# Pagy::DEFAULT[:items]  = 20                                 # default
+# Pagy::DEFAULT[:outset] = 0                                  # default
 
 
 # Other Variables
 # See https://ddnexus.github.io/pagy/api/pagy#other-variables
-# Pagy::VARS[:size]       = [1,4,4,1]                       # default
-# Pagy::VARS[:page_param] = :page                           # default
-# Pagy::VARS[:params]     = {}                              # default
-# Pagy::VARS[:fragment]   = '#fragment'                     # example
-# Pagy::VARS[:link_extra] = 'data-remote="true"'            # example
-# Pagy::VARS[:i18n_key]   = 'pagy.item_name'                # default
-# Pagy::VARS[:cycle]      = true                            # example
+# Pagy::DEFAULT[:size]       = [1,4,4,1]                       # default
+# Pagy::DEFAULT[:page_param] = :page                           # default
+# Pagy::DEFAULT[:params]     = {}                              # default
+# Pagy::DEFAULT[:fragment]   = '#fragment'                     # example
+# Pagy::DEFAULT[:link_extra] = 'data-remote="true"'            # example
+# Pagy::DEFAULT[:i18n_key]   = 'pagy.item_name'                # default
+# Pagy::DEFAULT[:cycle]      = true                            # example
 
 
 # Extras
@@ -42,20 +42,43 @@
 # Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/extras/countless
 # require 'pagy/extras/countless'
-# Pagy::VARS[:countless_minimal] = false   # default (eager loading)
+# Pagy::DEFAULT[:countless_minimal] = false   # default (eager loading)
 
 # Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
 # See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
-# default :pagy_search method: change only if you use
-# also the searchkick extra that defines the same
-# VARS[:elasticsearch_rails_search_method] = :pagy_search
+# default :pagy_search method: change only if you use also
+# the searchkick or meilisearch extra that defines the same
+# Pagy::DEFAULT[:elasticsearch_rails_search_method] = :pagy_search
 # require 'pagy/extras/elasticsearch_rails'
 
+# Headers extra: http response headers (and other helpers) useful for API pagination
+# See http://ddnexus.github.io/pagy/extras/headers
+# require 'pagy/extras/headers'
+# Pagy::DEFAULT[:headers] = { page: 'Current-Page',
+#                            items: 'Page-Items',
+#                            count: 'Total-Count',
+#                            pages: 'Total-Pages' }     # default
+
+# Meilisearch extra: Paginate `Meilisearch` result objects
+# See https://ddnexus.github.io/pagy/extras/meilisearch
+# default :pagy_search method: change only if you use also
+# the elasticsearch_rails or searchkick extra that define the same method
+# Pagy::DEFAULT[:meilisearch_search_method] = :pagy_search
+# require 'pagy/extras/meilisearch'
+
+# Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
+# See https://ddnexus.github.io/pagy/extras/metadata
+# you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/shared'
+# require 'pagy/extras/metadata'
+# For performance reason, you should explicitly set ONLY the metadata you use in the frontend
+# Pagy::DEFAULT[:metadata] = [:scaffold_url, :count, :page, :prev, :next, :last]    # example
+
 # Searchkick extra: Paginate `Searchkick::Results` objects
 # See https://ddnexus.github.io/pagy/extras/searchkick
-# default :pagy_search method: change only if you use
-# also the elasticsearch_rails extra that defines the same
-# VARS[:searchkick_search_method] = :pagy_search
+# default :pagy_search method: change only if you use also
+# the elasticsearch_rails or meilisearch extra that defines the same
+# DEFAULT[:searchkick_search_method] = :pagy_search
 # require 'pagy/extras/searchkick'
 # uncomment if you are going to use Searchkick.pagy_search
 # Searchkick.extend Pagy::Searchkick
@@ -95,47 +118,45 @@
 
 # Multi size var used by the *_nav_js helpers
 # See https://ddnexus.github.io/pagy/extras/navs#steps
-# Pagy::VARS[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example
+# Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example
 
 
 # Feature Extras
 
-# Headers extra: http response headers (and other helpers) useful for API pagination
-# See http://ddnexus.github.io/pagy/extras/headers
-# require 'pagy/extras/headers'
-# Pagy::VARS[:headers] = { page: 'Current-Page', items: 'Page-Items', count: 'Total-Count', pages: 'Total-Pages' }     # default
-
-# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
-# See https://ddnexus.github.io/pagy/extras/support
-# require 'pagy/extras/support'
+# Gearbox extra: Automatically change the number of items per page depending on the page number
+# See https://ddnexus.github.io/pagy/extras/gearbox
+# require 'pagy/extras/gearbox'
+# set to false only if you want to make :gearbox_extra an opt-in variable
+# Pagy::DEFAULT[:gearbox_extra] = false               # default true
+# Pagy::DEFAULT[:gearbox_items] = [15, 30, 60, 100]   # default
 
 # Items extra: Allow the client to request a custom number of items per page with an optional selector UI
 # See https://ddnexus.github.io/pagy/extras/items
 # require 'pagy/extras/items'
-# Pagy::VARS[:items_param] = :items    # default
-# Pagy::VARS[:max_items]   = 100       # default
-# set to false if you want to make :enable_items_extra an opt-in variable
-# Pagy::VARS[:enable_items_extra] = false    # default true
+# set to false only if you want to make :items_extra an opt-in variable
+# Pagy::DEFAULT[:items_extra] = false    # default true
+# Pagy::DEFAULT[:items_param] = :items   # default
+# Pagy::DEFAULT[:max_items]   = 100      # default
 
 # Overflow extra: Allow for easy handling of overflowing pages
 # See https://ddnexus.github.io/pagy/extras/overflow
 # require 'pagy/extras/overflow'
-# Pagy::VARS[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
+# Pagy::DEFAULT[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
 
-# Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
-# See https://ddnexus.github.io/pagy/extras/metadata
-# you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
-# require 'pagy/extras/shared'
-# require 'pagy/extras/metadata'
-# For performance reason, you should explicitly set ONLY the metadata you use in the frontend
-# Pagy::VARS[:metadata] = [:scaffold_url, :count, :page, :prev, :next, :last]    # example
+# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
+# See https://ddnexus.github.io/pagy/extras/support
+# require 'pagy/extras/support'
 
 # Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
-# after requiring it will trim by default
-# set to false if you want to make :enable_trim_extra an opt-in variable
-# Pagy::VARS[:enable_trim_extra] = false # default true
+# set to false only if you want to make :trim_extra an opt-in variable
+# Pagy::DEFAULT[:trim_extra] = false # default true
+
+# Standalone extra: Use pagy in non Rack environment/gem
+# See https://ddnexus.github.io/pagy/extras/standalone
+# require 'pagy/extras/standalone'
+# Pagy::DEFAULT[:url] = 'http://www.example.com/subdir'  # optional default
 
 
 # Rails
@@ -173,7 +194,7 @@
 #                 {locale: 'es', filepath: 'path/to/pagy-es.yml'},
 #                 {locale: 'xyz',  # not built-in
 #                  filepath: 'path/to/pagy-xyz.yml',
-#                  pluralize: lambda{|count| ... } )
+#                  pluralize: lambda{ |count| ... } )
 
 
 # I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory
@@ -182,4 +203,9 @@
 # require 'pagy/extras/i18n'
 
 # Default i18n key
-# Pagy::VARS[:i18n_key] = 'pagy.item_name'   # default
+# Pagy::DEFAULT[:i18n_key] = 'pagy.item_name'   # default
+
+
+# When you are done setting your own defaults freeze it,
+# so it will not changed accidentally
+Pagy::DEFAULT.freeze

data/lib/javascripts/pagy.js

@@ -1,11 +1,14 @@
 // See the Pagy documentation: https://ddnexus.github.io/pagy/extras#javascript
 
+// Container of the whole pagy stuff
 function Pagy(){}
 
-Pagy.version = '4.11.0'
+Pagy.version = '5.1.1'
 
+// Used by the waitForMe function
 Pagy.delay = 100
 
+// Scan the target for data-pagy-json elements and apply their functions
 Pagy.init =
   function(arg) {
     var target   = arg instanceof Event || arg === undefined ? document : arg,
@@ -18,6 +21,7 @@ Pagy.init =
     }
   }
 
+// Power the pagy*_nav_js helpers
 Pagy.nav =
   function(pagyEl, tags, sequels, trimParam) {
     var lastWidth,
@@ -45,14 +49,14 @@ Pagy.nav =
             else if (typeof(item) === 'string') { html += tags.active.replace(pageREg, item) }
           }
           html += tags.after
-          this.innerHTML = ''
           this.insertAdjacentHTML('afterbegin', html)
           lastWidth = width
         }
       }.bind(pagyEl)
     pagyEl.render()
- }
+  }
 
+// Power the pagy*_combo_nav_js helpers
 Pagy.combo_nav =
   function(pagyEl, page, link, trimParam) {
     var input  = pagyEl.getElementsByTagName('input')[0],
@@ -68,6 +72,7 @@ Pagy.combo_nav =
     Pagy.addInputEventListeners(input, toPage)
   }
 
+// Power the pagy_items_selector_js helper
 Pagy.items_selector =
   function(pagyEl, from, link, param) {
     var input   = pagyEl.getElementsByTagName('input')[0],
@@ -75,6 +80,7 @@ Pagy.items_selector =
         toPage  =
           function() {
             var items = input.value
+            if (items === 0 || items === '') { return }
             if (current !== items) {
               var page = Math.max(Math.ceil(from / items), 1),
                   html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, items)
@@ -86,6 +92,7 @@ Pagy.items_selector =
     Pagy.addInputEventListeners(input, toPage)
   }
 
+// Utility for input fields
 Pagy.addInputEventListeners =
   function(input, toPage) {
     // select the content on click: easier for typing a number
@@ -96,26 +103,28 @@ Pagy.addInputEventListeners =
     input.addEventListener('keyup', function(e) { if (e.which === 13) {toPage()} }.bind(this))
   }
 
+// Power the trim extra for js helpers
 Pagy.trim =
   function(html, param) {
     var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&')
     return html.replace(re, '')
   }
 
+// Render all *nav_js helpers
 Pagy.renderNavs =
   function() {
     var navs = document.getElementsByClassName('pagy-njs')  // 'pagy-njs' is common to all *nav_js helpers
     for (var i = 0, len = navs.length; i < len; i++) { navs[i].render() }
   }
 
+// Throttle to avoid to fire multiple time the renderNavs on resize
 Pagy.waitForMe =
   function() {
     if (typeof(Pagy.tid) === 'number') { clearTimeout(Pagy.tid) }
     Pagy.tid = setTimeout(Pagy.renderNavs, Pagy.delay)
   }
 
-
-if (typeof window !== "undefined") {
+// If there is a window object then add the event listener on resize
+if (typeof window !== 'undefined') {
   window.addEventListener('resize', Pagy.waitForMe, true)
 }
-

data/lib/pagy/backend.rb

@@ -2,34 +2,31 @@
 # frozen_string_literal: true
 
 class Pagy
-  # Defines a few generic methods to paginate an ORM collection out of the box,
+  # Define a few generic methods to paginate an ORM collection out of the box,
   # or any collection by overriding pagy_get_items and/or pagy_get_vars in your controller
-
   # See also the extras if you need specialized methods to paginate Arrays or other collections
-
-
   module Backend
-    private         # the whole module is private so no problem with including it in a controller
+    private
 
     # Return Pagy object and items
-    def pagy(collection, vars={})
+    def pagy(collection, vars = {})
       pagy = Pagy.new(pagy_get_vars(collection, vars))
-      [ pagy, pagy_get_items(collection, pagy) ]
+      [pagy, pagy_get_items(collection, pagy)]
     end
 
     # Sub-method called only by #pagy: here for easy customization of variables by overriding
+    # You may need to override the count call for non AR collections
     def pagy_get_vars(collection, vars)
-      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
-      vars[:count] ||= (c = collection.count(:all)).is_a?(Hash) ? c.size : c
-      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      pagy_set_items_from_params(vars) if defined?(ItemsExtra)
+      vars[:count] ||= (count = collection.count(:all)).is_a?(Hash) ? count.size : count
+      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
       vars
     end
 
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding
+    # You may need to override this method for collections without offset|limit
     def pagy_get_items(collection, pagy)
-      # This should work with ActiveRecord, Sequel, Mongoid...
       collection.offset(pagy.offset).limit(pagy.items)
     end
-
   end
 end

data/lib/pagy/console.rb

@@ -1,21 +1,23 @@
+# See Pagy::Console API documentation: https://ddnexus.github.io/pagy/api/console
 # frozen_string_literal: true
 
 require 'pagy'  # so you can require just the extra in the console
 require 'pagy/extras/standalone'
 
 class Pagy
-  # include Pagy::Console in irb/rails console for a ready to use pagy environment
+  # Provide a ready to use pagy environment when included in irb/rails console
   module Console
+    # Include Backend, Frontend and set the default URL
     def self.included(main)
       main.include(Backend)
       main.include(Frontend)
-      VARS[:url] = 'http://www.example.com/subdir'
+      DEFAULT[:url] = 'http://www.example.com/subdir'
     end
 
+    # Require the extras passed as arguments
     def pagy_extras(*extras)
-      extras.each {|extra| require "pagy/extras/#{extra}"}
+      extras.each { |extra| require "pagy/extras/#{extra}" }
       puts "Required extras: #{extras.map(&:inspect).join(', ')}"
     end
   end
-
 end

data/lib/pagy/countless.rb

@@ -1,38 +1,36 @@
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/countless
 # frozen_string_literal: true
 
 require 'pagy'
 
 class Pagy
-
+  # No need to know the count to paginate
   class Countless < Pagy
-
-    INSTANCE_VARS_MIN = { items: 1, page: 1, outset: 0 }.freeze
-
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
-    def initialize(vars={})  # rubocop:disable Lint/MissingSuper
-      @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
-      @vars[:fragment] = Pagy.deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
-
-      INSTANCE_VARS_MIN.each do |k,min|                                 # validate instance variables
-        raise VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}" \
-              unless @vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min
-      end
-      @offset = @items * (@page - 1) + @outset                          # pagination offset + outset (initial offset)
+    def initialize(vars = {}) # rubocop:disable Lint/MissingSuper
+      normalize_vars(vars)
+      setup_vars(page: 1, outset: 0)
+      setup_items_var
+      @offset = (@items * (@page - 1)) + @outset
     end
 
-    # Finalize the instance variables based on the fetched items
-    def finalize(fetched)
-      raise OverflowError.new(self), "page #{@page} got no items" \
-            if fetched.zero? && @page > 1
+    # Finalize the instance variables based on the fetched size
+    def finalize(fetched_size)
+      raise OverflowError.new(self, :page, "to be < #{@page}") if fetched_size.zero? && @page > 1
 
-      @pages = @last = (fetched > @items ? @page + 1 : @page)         # set the @pages and @last
-      @items = fetched if fetched < @items && fetched.positive?       # adjust items for last non-empty page
-      @from  = fetched.zero? ? 0 : @offset + 1 - @outset              # page begins from item
-      @to    = fetched.zero? ? 0 : @offset + @items - @outset         # page ends to item
-      @prev  = (@page-1 unless @page == 1)                            # nil if no prev page
-      @next  = @page == @last ? (1 if @vars[:cycle]) : @page + 1      # nil if no next page, 1 if :cycle
+      @pages = @last = (fetched_size > @items ? @page + 1 : @page)
+      @in    = [fetched_size, @items].min
+      @from  = @in.zero? ? 0 : @offset - @outset + 1
+      @to    = @offset - @outset + @in
+      @prev  = (@page - 1 unless @page == 1)
+      @next  = @page == @last ? (1 if @vars[:cycle]) : @page + 1
       self
     end
 
+    # Override the original series.
+    # Return nil if :countless_minimal is enabled
+    def series(_size = @vars[:size])
+      super unless @vars[:countless_minimal]
+    end
   end
 end

data/lib/pagy/exceptions.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
 class Pagy
-
-  # generic variable error
+  # Generic variable error
   class VariableError < ArgumentError
-    attr_reader :pagy
-
-    def initialize(pagy)
-      super
-      @pagy = pagy
-    end
+    attr_reader :pagy, :variable, :value
 
-    def variable
-      message =~ /expected :(\w+)/
-      Regexp.last_match(1)&.to_sym
-    end
-
-    def value
-      pagy.vars[variable]
+    # Set the variables and prepare the message
+    def initialize(pagy, variable, description, value = nil)
+      @pagy     = pagy
+      @variable = variable
+      @value    = value
+      message   = +"expected :#{@variable} #{description}"
+      message  << "; got #{@value.inspect}" if value
+      super message
     end
   end
 
-  # specific overflow error
+  # Specific overflow error
   class OverflowError < VariableError; end
 
+  # I18n configuration error
+  class I18nError < StandardError; end
+
+  # Generic internal error
+  class InternalError < StandardError; end
 end

data/lib/pagy/extras/arel.rb

@@ -2,18 +2,18 @@
 # frozen_string_literal: true
 
 class Pagy
-  module Backend
+  module ArelExtra
     private
 
-    def pagy_arel(collection, vars={})
+    def pagy_arel(collection, vars = {})
       pagy = Pagy.new(pagy_arel_get_vars(collection, vars))
-      [ pagy, pagy_get_items(collection, pagy) ]
+      [pagy, pagy_get_items(collection, pagy)]
     end
 
     def pagy_arel_get_vars(collection, vars)
-      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
+      pagy_set_items_from_params(vars) if defined?(ItemsExtra)
       vars[:count] ||= pagy_arel_count(collection)
-      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
       vars
     end
 
@@ -27,6 +27,6 @@ class Pagy
         collection.unscope(:order).limit(1).pluck(sql).first.to_i
       end
     end
-
   end
+  Backend.prepend ArelExtra
 end

data/lib/pagy/extras/array.rb

@@ -3,22 +3,22 @@
 
 class Pagy
   # Add specialized backend methods to paginate array collections
-  module Backend
+  module ArrayExtra
     private
 
     # Return Pagy object and items
-    def pagy_array(array, vars={})
+    def pagy_array(array, vars = {})
       pagy = Pagy.new(pagy_array_get_vars(array, vars))
-      [ pagy, array[pagy.offset, pagy.items] ]
+      [pagy, array[pagy.offset, pagy.items]]
     end
 
     # Sub-method called only by #pagy_array: here for easy customization of variables by overriding
     def pagy_array_get_vars(array, vars)
-      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
+      pagy_set_items_from_params(vars) if defined?(ItemsExtra)
       vars[:count] ||= array.size
-      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars[:page]  ||= params[vars[:page_param] || DEFAULT[:page_param]]
       vars
     end
-
   end
+  Backend.prepend ArrayExtra
 end

data/lib/pagy/extras/bootstrap.rb

@@ -4,8 +4,9 @@
 require 'pagy/extras/shared'
 
 class Pagy
-  module Frontend
-
+  # Frontend modules are specially optimized for performance.
+  # The resulting code may not look very elegant, but produces the best benchmarks
+  module BootstrapExtra
     # Pagination for bootstrap: it returns the html with the series of links to the pages
     def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '')
       p_id = %( id="#{pagy_id}") if pagy_id
@@ -15,9 +16,13 @@ class Pagy
       html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
-                when Integer then %(<li class="page-item">#{link.call item}</li>)
-                when String  then %(<li class="page-item active">#{link.call item}</li>)
-                when :gap    then %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>)
+                when Integer
+                  %(<li class="page-item">#{link.call item}</li>)
+                when String
+                  %(<li class="page-item active">#{link.call item}</li>)
+                when :gap
+                  %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>)
+                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
       html << pagy_bootstrap_next_html(pagy, link)
@@ -25,8 +30,7 @@ class Pagy
     end
 
     # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_bootstrap_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_bootstrap_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
       tags = { 'before' => %(<ul class="pagination">#{pagy_bootstrap_prev_html pagy, link}),
@@ -35,52 +39,54 @@ class Pagy
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
-      %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
+      %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" #{
+          pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_bootstrap_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_bootstrap_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
       p_id    = %( id="#{pagy_id}") if pagy_id
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
+                    p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{
+                    p_pages.to_s.length + 1}rem;">)
 
       %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
-          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)}>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else
             %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
           end
-      }<div class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
+        }<div class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;">#{
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
           if (p_next  = pagy.next)
             link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"'
           else
-            %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
+            %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
           end
-      }</div></nav>)
+        }</div></nav>)
     end
 
     private
 
-      def pagy_bootstrap_prev_html(pagy, link)
-        if (p_prev = pagy.prev)
-          %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-        else
-          %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.prev'}</a></li>)
-        end
+    def pagy_bootstrap_prev_html(pagy, link)
+      if (p_prev = pagy.prev)
+        %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+      else
+        %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.prev'}</a></li>)
       end
+    end
 
-      def pagy_bootstrap_next_html(pagy, link)
-        if (p_next = pagy.next)
-          %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
-        else
-          %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.next'}</a></li>)
-        end
+    def pagy_bootstrap_next_html(pagy, link)
+      if (p_next = pagy.next)
+        %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+      else
+        %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.next'}</a></li>)
       end
-
+    end
   end
+  Frontend.prepend BootstrapExtra
 end