pagy 4.0.0 → 4.5.0

data/lib/pagy.rb

@@ -1,52 +1,76 @@
 # See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pathname'
 
-class Pagy ; VERSION = '4.0.0'
+# main class
+class Pagy
+  VERSION = '4.5.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
-  def self.root = @root ||= Pathname.new(__FILE__).dirname.freeze
+  def self.root
+    @root ||= Pathname.new(__dir__).freeze
+  end
 
   # default vars
-  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params:{}, anchor:'', link_extra:'', i18n_key:'pagy.item_name', cycle:false }
+  VARS = { page: 1, items: 20, outset: 0, size: [1, 4, 4, 1], page_param: :page,              # rubocop:disable Style/MutableConstant
+           params: {}, fragment: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 
+  INSTANCE_VARS_MIN = { count: 0, items: 1, page: 1, outset: 0 }.freeze
+
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
-    @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })               # default vars + cleaned vars
-    { count:0, items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
-      (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+    @vars = VARS.merge( vars.delete_if{|k,v| VARS.key?(k) && (v.nil? || v == '') } )
+    @vars[:fragment] = deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
+
+    INSTANCE_VARS_MIN.each do |name,min|
+      raise VariableError.new(self), "expected :#{name} >= #{min}; got #{@vars[name].inspect}" \
+            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
-    @pages = @last = [(@count.to_f / @items).ceil, 1].max                      # cardinal and ordinal meanings
-    @page <= @last or raise(OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}")
-    @offset = @items * (@page - 1) + @outset                                   # pagination offset + outset (initial offset)
-    @items  = @count - ((@pages-1) * @items) if @page == @last && @count > 0   # adjust items for last non-empty page
-    @from   = @count == 0 ? 0 : @offset+1 - @outset                            # page begins from item
-    @to     = @count == 0 ? 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 = [(@count.to_f / @items).ceil, 1].max
+    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" \
+          if @page > @last
+
+    @offset = @items * (@page - 1) + @outset
+    @items  = @count - ((@pages - 1) * @items) if @page == @last && @count.positive?
+    @from   = @count.zero? ? 0 : @offset + 1 - @outset
+    @to     = @count.zero? ? 0 : @offset + @items - @outset
+    @prev   = (@page - 1 unless @page == 1)
+    @next   = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
   # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
   def series(size=@vars[:size])
-    (series = []) and size.empty? and return series
-    4.times{|i| (size[i]>=0 rescue nil) or raise(VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}")}
-    [*0..size[0], *@page-size[1]..@page+size[2], *@last-size[3]+1..@last+1].sort!.each_cons(2) do |a, b|
-      if    a<0 || a==b || a>@last; next                                  # skip out of range and duplicates
-      elsif a+1 == b; series.push(a)                                      # no gap     -> no additions
-      elsif a+2 == b; series.push(a, a+1)                                 # 1 page gap -> fill with missing page
-      else            series.push(a, :gap)                                # n page gap -> add gap
-      end                                                                 # skip the end boundary (last+1)
-    end                                                                   # shift the start boundary (0) and
-    series.shift; series[series.index(@page)] = @page.to_s; series        # convert the current page to String
+    return [] if size.empty?
+    raise VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}" \
+          unless size.size == 4 && size.all?{ |num| !num.negative? rescue false }  # rubocop:disable Style/RescueModifier
+    # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
+    left_gap_start  =     1 + size[0]
+    left_gap_end    = @page - size[1] - 1
+    right_gap_start = @page + size[2] + 1
+    right_gap_end   = @last - size[3]
+    left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
+    right_gap_start = left_gap_start if left_gap_start > right_gap_start
+    series = []
+    start  = 1
+    if (left_gap_end - left_gap_start).positive?
+      series.push(*start..(left_gap_start - 1), :gap)
+      start = left_gap_end + 1
+    end
+    if (right_gap_end - right_gap_start).positive?
+      series.push(*start..(right_gap_start - 1), :gap)
+      start = right_gap_end + 1
+    end
+    series.push(*start..@last)
+    series[series.index(@page)] = @page.to_s
+    series
   end
 
 end
 
+require 'pagy/deprecation'
 require 'pagy/backend'
 require 'pagy/frontend'
 require 'pagy/exceptions'

data/lib/pagy/backend.rb

@@ -1,5 +1,4 @@
 # See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/api/backend
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -8,16 +7,19 @@ class Pagy
 
   # 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
+
+  module Backend
+    private         # the whole module is private so no problem with including it in a controller
 
     # Return Pagy object and items
     def pagy(collection, vars={})
       pagy = Pagy.new(pagy_get_vars(collection, vars))
-      return 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
     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] ]
       vars

data/lib/pagy/countless.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy'
@@ -7,25 +6,29 @@ class Pagy
 
   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)
-      { items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
-        (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+      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)
     end
 
     # Finalize the instance variables based on the fetched items
     def finalize(fetched)
-      fetched == 0 && @page > 1 and raise(OverflowError.new(self), "page #{@page} got no items")
+      raise OverflowError.new(self), "page #{@page} got no items" \
+            if fetched.zero? && @page > 1
+
       @pages = @last = (fetched > @items ? @page + 1 : @page)         # set the @pages and @last
-      @items = fetched if fetched < @items && fetched > 0             # adjust items for last non-empty page
-      @from  = fetched == 0 ? 0 : @offset+1 - @outset                 # page begins from item
-      @to    = fetched == 0 ? 0 : @offset + @items - @outset          # page ends to item
+      @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
+      @next  = @page == @last ? (1 if @vars[:cycle]) : @page + 1      # nil if no next page, 1 if :cycle
       self
     end
 

data/lib/pagy/deprecation.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+class Pagy
+  class << self
+
+    # deprecated variables
+    def deprecated_var(var, val, new_var, new_val)
+      value = new_val || val
+      Warning.warn %([PAGY WARNING] deprecated use of `#{var}` var will not be supported in 5.0! Use `#{new_var}: #{value.inspect}` instead.)
+      value
+    end
+
+    # deprecated pagy_url_for argument order
+    def deprecated_order(pagy, page)
+      Warning.warn '[PAGY WARNING] inverted use of pagy/page in pagy_url_for will not be supported in 5.0! Use pagy_url_for(pagy, page) instead.'
+      [page, pagy]
+    end
+
+
+    # deprecated posiitioal arguments
+    def deprecated_arg(arg, val, new_key, new_val)
+      value = new_val || val  # we use the new_val if present
+      Warning.warn %([PAGY WARNING] deprecated use of positional `#{arg}` arg will not be supported in 5.0! Use only the keyword arg `#{new_key}: #{value.inspect}` instead.)
+      value
+    end
+
+  end
+end

data/lib/pagy/exceptions.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Pagy
 
+  # generic variable error
   class VariableError < ArgumentError
     attr_reader :pagy
 
@@ -9,15 +12,14 @@ class Pagy
     end
 
     def variable
-      message =~ /expected :([\w]+)/
-      $1.to_sym if $1
+      message =~ /expected :(\w+)/
+      Regexp.last_match(1)&.to_sym
     end
 
-    def value
-      pagy.vars[variable]
-    end
+    def value = pagy.vars[variable]
   end
 
+  # specific overflow error
   class OverflowError < VariableError; end
 
 end

data/lib/pagy/extras/arel.rb

@@ -1,16 +1,17 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/arel
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
-  module Backend ; private
+  module Backend
+    private
 
     def pagy_arel(collection, vars={})
       pagy = Pagy.new(pagy_arel_get_vars(collection, vars))
-      return 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)
       vars[:count] ||= pagy_arel_count(collection)
       vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars

data/lib/pagy/extras/array.rb

@@ -1,19 +1,20 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/array
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add specialized backend methods to paginate array collections
-  module Backend ; private
+  module Backend
+    private
 
     # Return Pagy object and items
     def pagy_array(array, vars={})
       pagy = Pagy.new(pagy_array_get_vars(array, vars))
-      return 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)
       vars[:count] ||= array.size
       vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars

data/lib/pagy/extras/bootstrap.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bootstrap
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,48 +7,81 @@ class Pagy
   module Frontend
 
     # Pagination for bootstrap: it returns the html with the series of links to the pages
-    def pagy_bootstrap_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
+    def pagy_bootstrap_nav(pagy, pagy_id: nil, link_extra: '')
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
 
-      html = (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                     : %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>))
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
+      html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li class="page-item">#{link.call item}</li>)                                                               # page link
-                elsif item.is_a?(String) ; %(<li class="page-item active">#{link.call item}</li>)                                                        # active page
-                elsif item == :gap       ; %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>) # page gap
+        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>)
                 end
       end
-      html << (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
-                      : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
-      %(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
+      html << pagy_bootstrap_next_html(pagy, link)
+      html << %(</ul></nav>)
     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, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
-      tags = { 'before' => p_prev ? %(<ul class="pagination"><li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                                  : %(<ul class="pagination"><li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>),
+    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
+      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}),
                'link'   => %(<li class="page-item">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="page-item active">#{mark}</li>),
-               'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>),
-               'after'  => p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li></ul>)
-                                  : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li></ul>) }
-      %(<nav id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               '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>) }
+
+      html = %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     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, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<nav id="#{id}" class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager">) + %(<div class="btn-group" role="group">)
-      html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"')
-                      : %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
-      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;">)
-      html << %(<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>)
-      html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"')
-                      : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
-      html << %(</div></nav>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+    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
+      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;">)
+
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="btn-group" role="group">#{
+          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>#{
+          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>)
+          end
+      }</div></nav>#{
+          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
+      })
     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
+      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
 end

data/lib/pagy/extras/bulma.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bulma
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,53 +7,77 @@ class Pagy
   module Frontend
 
     # Pagination for Bulma: it returns the html with the series of links to the pages
-    def pagy_bulma_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-
-      html = (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                     : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>)) \
-           + (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
-                     : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>))
-      html << '<ul class="pagination-list">'
+    def pagy_bulma_nav(pagy, pagy_id: nil, link_extra: '')
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
+
+      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
+      html << pagy_bulma_prev_next_html(pagy, link)
+      html << %(<ul class="pagination-list">)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}") }</li>)                           # page link
-                elsif item.is_a?(String) ; %(<li>#{link.call item, item, %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)  # active page
-                elsif item == :gap       ; %(<li><span class="pagination-ellipsis">#{pagy_t('pagy.nav.gap')}</span></li>)                                            # page gap
+        html << case item
+                when Integer then %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}") }</li>)                           # page link
+                when String  then %(<li>#{link.call item, item, %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)  # active page
+                when :gap    then %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)                                            # page gap
                 end
       end
-      html << '</ul>'
-      %(<nav class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
+      html << %(</ul></nav>)
     end
 
-    # Javascript pagination for bulma: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_bulma_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => ( (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                                     : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>)) \
-                           + (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
-                                     : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>)) \
-                           + '<ul class="pagination-list">' ),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}"))}</li>),
-               'active' => %(<li>#{link.call(PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link is-current" aria-current="page" aria-label="page #{PAGE_PLACEHOLDER}"))}</li>),
-               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t('pagy.nav.gap')}</span></li>),
+    def pagy_bulma_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
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
+      tags = { 'before' => %(#{pagy_bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
+               'link'   => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
+               'active' => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link is-current" aria-current="page" aria-label="page #{PAGE_PLACEHOLDER}")}</li>),
+               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap' }</span></li>),
                'after'  => '</ul>' }
-      %(<nav id="#{id}" class="pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+
+      html = %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_bulma_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<nav id="#{id}" class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination">) \
-           + %(<div class="field is-grouped is-grouped-centered" role="group">)
-      html << (p_prev ? %(<p class="control">#{link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"')}</p>)
-                      : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.prev')}</a></p>))
-      input = %(<input class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin:0 0.3rem;">)
-      html << %(<div class="pagy-combo-input control level is-mobile">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>)
-      html << (p_next ? %(<p class="control">#{link.call(p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"')}</p>)
-                      : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
-      html << %(</div></nav>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+    def pagy_bulma_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
+      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 class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin:0 0.3rem;">)
+
+      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
+          if (p_prev  = pagy.prev)
+            %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
+          else
+            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.prev'}</a></p>)
+          end
+      }<div class="pagy-combo-input control level is-mobile">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</div>#{
+          if (p_next  = pagy.next)
+            %(<p class="control">#{link.call p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"'}</p>)
+          else
+            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
+          end
+      }</div></nav>#{
+         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
+      })
     end
 
+    private
+
+      def pagy_bulma_prev_next_html(pagy, link)
+        html  = if (p_prev = pagy.prev)
+                  link.call p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"'
+                else
+                  %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)
+                end
+        html << if (p_next = pagy.next)
+                  link.call p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"'
+                else
+                  %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next' }</a>)
+                end
+      end
+
   end
 end