pagy 4.2.0 → 4.6.0

data/lib/locales/ko.yml

@@ -15,6 +15,6 @@ ko:
       single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
       multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
+    combo_nav_js: "<label>총 %{pages} 중 %{page_input}</label> 페이지"
 
-    items_selector_js: "페이지 당 %{items_input}개 표시%"
+    items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"

data/lib/locales/nb.yml

@@ -17,6 +17,6 @@ nb:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
 
-    combo_nav_js: "Side %{page_input} av %{pages}"
+    combo_nav_js: "<label>Side %{page_input}</label> av %{pages}"
 
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"

data/lib/locales/nl.yml

@@ -17,6 +17,6 @@ nl:
       single_page: "Toont <b>%{count}</b> %{item_name}"
       multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
 
-    combo_nav_js: "Pagina %{page_input} van %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input}</label> van %{pages}"
 
-    items_selector_js: "Toont %{items_input} %{item_name} per pagina"
+    items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"

data/lib/locales/pl.yml

@@ -19,6 +19,6 @@ pl:
       single_page: "Wyświetlono <b>%{count}</b> %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} <b>%{from}-%{to}</b> z wszystkich <b>%{count}</b>"
 
-    combo_nav_js: "Strona %{page_input} z %{pages}"
+    combo_nav_js: "<label>Strona %{page_input}</label> z %{pages}"
 
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"

data/lib/locales/pt-BR.yml

@@ -17,6 +17,6 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
 
-    combo_nav_js: "Página %{page_input} de %{pages}"
+    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
 
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/pt.yml

@@ -17,6 +17,6 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
 
-    combo_nav_js: "Página %{page_input} de %{pages}"
+    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
 
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/ru.yml

@@ -19,6 +19,6 @@ ru:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "Страница %{page_input} из %{pages}"
+    combo_nav_js: "<label>Страница %{page_input}</label> из %{pages}"
 
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"

data/lib/locales/sr.yml

@@ -18,6 +18,6 @@ sr:
       single_page: "Приказује се <b>%{count}</b> %{item_name}"
       multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
 
-    combo_nav_js: "Страниca %{page_input} од %{pages}"
+    combo_nav_js: "<label>Страниca %{page_input}</label> од %{pages}"
 
-    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"
+    items_selector_js: "<label>Прикажи %{items_input} %{item_name} по страниcи</label>"

data/lib/locales/sv-SE.yml

@@ -18,6 +18,6 @@ sv-SE:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sv.yml

@@ -18,6 +18,6 @@ sv:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sw.yml

@@ -17,6 +17,6 @@ sw:
       single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
       multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
 
-    combo_nav_js: "Kurasa %{page_input} ya %{pages}"
+    combo_nav_js: "<label>Kurasa %{page_input}</label> ya %{pages}"
 
-    items_selector_js: "Onyesha %{items_input} %{item_name} kwa kila ukurasa"
+    items_selector_js: "<label>Onyesha %{items_input} %{item_name} kwa kila ukurasa</label>"

data/lib/locales/tr.yml

@@ -15,6 +15,6 @@ tr:
       single_page: "Toplam <b>%{count}</b> %{item_name} gösteriliyor"
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor"
 
-    combo_nav_js: "Sayfa %{page_input} / %{pages}"
+    combo_nav_js: "<label>Sayfa %{page_input}</label> / %{pages}"
 
-    items_selector_js: "Sayfada %{items_input} %{item_name} göster"
+    items_selector_js: "<label>Sayfada %{items_input} %{item_name} göster</label>"

data/lib/locales/zh-CN.yml

@@ -15,6 +15,6 @@ zh-CN:
       single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 页"
+    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 页"
 
-    items_selector_js: "每页显示 %{items_input} 条%"
+    items_selector_js: "<label>每页显示 %{items_input} 条%</label>"

data/lib/locales/zh-HK.yml

@@ -15,6 +15,6 @@ zh-HK:
       single_page: "顯示 <b>%{count}</b> %{item_name}"
       multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
 
-    items_selector_js: "每頁顯示 %{items_input} 記錄"
+    items_selector_js: "<label>每頁顯示 %{items_input} 記錄</label>"

data/lib/locales/zh-TW.yml

@@ -10,11 +10,11 @@ zh-TW:
       next: "下一頁 ›"
       gap: "…"
 
-    combo_nav_js: "第 %{page_input} / %{pages} 頁"
-
     info:
       no_items: "沒找到項"
       single_page: "顯示 <b>%{count}</b> 項%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 項%{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    items_selector_js: "每頁顯示 %{items_input} 項%{item_name}"
+    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
+
+    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}"

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.2.0'
+  VERSION = '4.6.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -14,7 +14,7 @@ class Pagy
 
   # default vars
   VARS = { page: 1, items: 20, outset: 0, size: [1, 4, 4, 1], page_param: :page,              # rubocop:disable Style/MutableConstant
-           params: {}, anchor: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
+           params: {}, fragment: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 
@@ -22,20 +22,22 @@ class Pagy
 
   # 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 == '' } )
+    @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
-    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" if @page > @last
+    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?
+    @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)
+    @prev   = (@page - 1 unless @page == 1)
     @next   = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
@@ -43,28 +45,32 @@ class Pagy
   def series(size=@vars[:size])
     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 >= 0 rescue false }  # rubocop:disable Style/RescueModifier
-
+          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 = []
-    [ *0..size[0],                                   # initial pages from 0
-      *@page-size[1]..@page+size[2],                 # around current page
-      *@last-size[3]+1..@last+1                      # final pages till @last+1
-    ].sort!.each_cons(2) do |left, right|            # sort and loop by 2
-      next if left.negative? || left == right        # skip out of range and duplicates
-      break if left > @last                          # break if out of @last boundary
-      case right
-      when left+1 then series.push(left)             # no gap     -> no additions
-      when left+2 then series.push(left, left+1)     # 1 page gap -> fill with missing page
-      else             series.push(left, :gap)       # n page gap -> add gap
-      end
+    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.shift                                     # shift the start boundary (0)
-    series[series.index(@page)] = @page.to_s         # convert the current page to String
+    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

@@ -19,6 +19,7 @@ class Pagy
 
     # 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/console.rb

@@ -0,0 +1,21 @@
+# 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
+  module Console
+    def self.included(main)
+      main.include(Backend)
+      main.include(Frontend)
+      VARS[:url] = 'http://www.example.com/subdir'
+    end
+
+    def pagy_extras(*extras)
+      extras.each {|extra| require "pagy/extras/#{extra}"}
+      puts "Required extras: #{extras.map(&:inspect).join(', ')}"
+    end
+  end
+
+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/extras/arel.rb

@@ -11,6 +11,7 @@ class 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

@@ -14,6 +14,7 @@ class Pagy
 
     # 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

@@ -7,10 +7,11 @@ 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 = pagy_link_proc(pagy, 'class="page-link"')
+    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 = +%(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" 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 << case item
@@ -24,26 +25,30 @@ 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, id=pagy_id)
-      link = pagy_link_proc(pagy, 'class="page-link"')
+    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'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
-      html = %(<nav id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" 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    = pagy_link_proc(pagy)
+    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 id="#{id}" class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="btn-group" role="group">#{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" 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
@@ -56,7 +61,7 @@ class Pagy
             %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
           end
       }</div></nav>#{
-          pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
       })
     end
 

data/lib/pagy/extras/bulma.rb

@@ -7,55 +7,60 @@ 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 = pagy_link_proc(pagy)
+    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 class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bulma-nav pagination is-centered" 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 << 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
+                when :gap    then %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)                                            # page gap
                 end
       end
       html << %(</ul></nav>)
     end
 
-    def pagy_bulma_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy)
+    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>' }
 
-      html = %(<nav id="#{id}" class="pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" 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    = pagy_link_proc(pagy)
+    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 id="#{id}" class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
+      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" 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>#{
+      }<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, id, p_page, pagy_marked_link(link))
+         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
       })
     end