pagy 4.2.0 → 4.6.0

data/lib/pagy/extras/countless.rb

@@ -16,7 +16,8 @@ class Pagy
 
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
     def pagy_countless_get_vars(_collection, vars)
-      vars[:page] ||= params[ vars[:page_param] || VARS[:page_param] ]
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
+      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars
     end
 

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -51,6 +51,7 @@ class Pagy
     # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
     # the _collection argument is not available when the method is called
     def pagy_elasticsearch_rails_get_vars(_collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
       vars[:items] ||= VARS[:items]
       vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
       vars

data/lib/pagy/extras/foundation.rb

@@ -7,10 +7,11 @@ class Pagy
   module Frontend
 
     # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_foundation_nav(pagy)
-      link = pagy_link_proc(pagy)
+    def pagy_foundation_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-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination">)
       html << pagy_foundation_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -24,38 +25,44 @@ class Pagy
     end
 
     # Javascript pagination for foundation: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_foundation_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy)
-      tags = { 'before' => %(<ul class="pagination">#{pagy_foundation_prev_html(pagy, link)}),
+    def pagy_foundation_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' => %(<ul class="pagination">#{pagy_foundation_prev_html pagy, link}),
                'link'   => %(<li>#{link.call PAGE_PLACEHOLDER}</li>),
                'active' => %(<li class="current">#{pagy.page}</li>),
                'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
-               'after'  => %(#{pagy_foundation_next_html(pagy, link)}</ul>) }
+               'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
-      html = %(<nav id="#{id}" class="pagy-foundation-nav-js" role="navigation" aria-label="Pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_foundation_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy)
+    def pagy_foundation_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-group-field cell shrink" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="width: #{p_pages.to_s.length+1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
 
-      %(<nav id="#{id}" class="pagy-foundation-combo-nav-js" role="navigation" aria-label="Pagination"><div class="input-group">#{
+      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group">#{
           if (p_prev  = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0px;" aria-label="previous" class="prev button primary"'
+            link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'
           else
-            %(<a style="margin-bottom: 0px;" class="prev button primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
+            %(<a style="margin-bottom: 0" class="prev button primary disabled" href="#">#{pagy_t 'pagy.nav.prev'}</a>)
           end
       }<span class="input-group-label">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</span>#{
           if (p_next  = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"'
+            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0" aria-label="next" class="next button primary"'
           else
-            %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
+            %(<a style="margin-bottom: 0" class="next button 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))})
+      }</div></nav>#{
+          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
+      })
     end
 
     private

data/lib/pagy/extras/headers.rb

@@ -24,11 +24,11 @@ class Pagy
       countless = defined?(Pagy::Countless) && pagy.is_a?(Pagy::Countless)
       rels = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
       rels['last'] = pagy.last unless countless
-      url_str = pagy_url_for(PAGE_PLACEHOLDER, pagy, :url)
-      hash    = { 'Link' => rels.map do |rel, num|
+      url_str = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: true)
+      hash    = { 'Link' => rels.filter_map do |rel, num|
                               next unless num
                               [ rel, url_str.sub(PAGE_PLACEHOLDER, num.to_s) ]
-                            end.compact.to_h }
+                            end.to_h }
       headers = pagy.vars[:headers]
       hash[headers[:page]]  = pagy.page.to_s         if headers[:page]
       hash[headers[:items]] = pagy.vars[:items].to_s if headers[:items]

data/lib/pagy/extras/items.rb

@@ -9,57 +9,43 @@ class Pagy
   VARS[:items_param] = :items
   VARS[:max_items]   = 100
 
+  VARS[:enable_items_extra] = true
+
   ITEMS_PLACEHOLDER = '__pagy_items__'
 
-  module UseItemsExtra
-    private
+  module UseItemsExtra; end
 
-    %i[ pagy_get_vars
-        pagy_countless_get_vars
-        pagy_elasticsearch_rails_get_vars
-        pagy_searchkick_get_vars
-    ].each do |meth|
-      next unless Backend.private_method_defined?(meth, true)
+  module Backend
+    private
 
-      define_method(meth) do |collection, vars|
-        vars[:items] ||= if (items = params[vars[:items_param] || VARS[:items_param]])                             # :items from :items_param
-                           [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
-                         end
-        super collection, vars
+      def pagy_set_items_from_params(vars)
+        return if vars[:items]
+        return unless vars.key?(:enable_item_extra) ? vars[:enable_item_extra] : VARS[:enable_items_extra]
+        return unless (items = params[vars[:items_param] || VARS[:items_param]])                               # :items from :items_param
+        vars[:items] = [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
       end
-    end
 
   end
-  Backend.prepend UseItemsExtra
-
 
   module Frontend
 
-    module UseItemsExtra
-      def pagy_url_for(page, pagy, url=nil)
-        p_vars = pagy.vars
-        params = request.GET.merge(p_vars[:params])
-        params[p_vars[:page_param].to_s]  = page
-        params[p_vars[:items_param].to_s] = p_vars[:items]
-        "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
-      end
-    end
-    prepend UseItemsExtra
-
     # Return the items selector HTML. For example "Show [20] items per page"
-    def pagy_items_selector_js(pagy, id=pagy_id)
+    def pagy_items_selector_js(pagy, deprecated_id=nil, pagy_id: nil, item_name: nil, i18n_key: nil, link_extra: '')
+      return '' unless pagy.vars[:enable_items_extra]
+      pagy_id        = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+      p_id           = %( id="#{pagy_id}") if pagy_id
       p_vars         = pagy.vars
       p_items        = p_vars[:items]
       p_vars[:items] = ITEMS_PLACEHOLDER
-      link           = pagy_marked_link(pagy_link_proc(pagy))
+      link           = pagy_marked_link(pagy_link_proc(pagy, link_extra: link_extra))
       p_vars[:items] = p_items # restore the items
 
-      html  = %(<span id="#{id}">)
+      html  = %(<span#{p_id} class="pagy-items-selector-js">)
       input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length+1}rem;">)
-      html << pagy_t('pagy.items_selector_js', item_name:   pagy_t(p_vars[:i18n_key], count: p_items),
+      html << pagy_t('pagy.items_selector_js', item_name:   item_name || pagy_t(i18n_key || p_vars[:i18n_key], count: p_items),
                                                items_input: input,
                                                count:       p_items)
-      html << %(</span>#{pagy_json_tag(pagy, :items_selector, id, pagy.from, link)})
+      html << %(</span>#{pagy_json_tag pagy, :items_selector, pagy.from, link})
     end
 
   end

data/lib/pagy/extras/materialize.rb

@@ -7,16 +7,17 @@ class Pagy
   module Frontend
 
     # Pagination for materialize: it returns the html with the series of links to the pages
-    def pagy_materialize_nav(pagy)
-      link = pagy_link_proc(pagy)
+    def pagy_materialize_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 = +%(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
       html << pagy_materialize_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="waves-effect">#{link.call item}</li>)                           # page link
                 when String  then %(<li class="active">#{link.call item}</li>)                                 # active page
-                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>)   # page gap
+                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>)    # page gap
                 end
       end
       html << pagy_materialize_next_html(pagy, link)
@@ -24,34 +25,39 @@ class Pagy
     end
 
     # Javascript pagination for materialize: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_materialize_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy)
-      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html(pagy, link)}),
+    def pagy_materialize_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' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
                'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="active">#{mark}</li>),
-               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>),
-               'after'  => %(#{pagy_materialize_next_html(pagy, link)}</ul>) }
+               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
+               'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
-      html = %(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_materialize_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy)
+    def pagy_materialize_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
       style   = ' style="vertical-align: middle;"'
       input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div id="#{id}" class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0px;">#{
-          pagy_materialize_prev_html(pagy, link, style)
+      %(<div#{p_id} class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0">#{
+          pagy_materialize_prev_html pagy, link, style
       }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
-          pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div>#{
-          pagy_materialize_next_html(pagy, link, style)
+          pagy_materialize_next_html pagy, link, style
       }</ul></div>#{
-          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
 
@@ -61,7 +67,7 @@ class Pagy
         if (p_prev = pagy.prev)
           %(<li class="waves-effect prev"#{style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
         else
-          +%(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
+          %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
         end
       end
 

data/lib/pagy/extras/metadata.rb

@@ -16,13 +16,14 @@ class Pagy
 
     include Helpers
 
-    def pagy_metadata(pagy, url=nil)
+    def pagy_metadata(pagy, deprecated_url=nil, absolute: nil)
+      absolute = Pagy.deprecated_arg(:url, deprecated_url, :absolute, absolute) if deprecated_url
       names   = pagy.vars[:metadata]
       unknown = names - METADATA
       raise VariableError.new(pagy), "unknown metadata #{unknown.inspect}" \
             unless unknown.empty?
 
-      scaffold_url = pagy_url_for(PAGE_PLACEHOLDER, pagy, url)
+      scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: absolute)
       {}.tap do |metadata|
         names.each do |key|
           metadata[key] = case key

data/lib/pagy/extras/navs.rb

@@ -7,33 +7,37 @@ class Pagy
   module Frontend
 
     # Javascript pagination: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy)
+    def pagy_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_nav_prev_html(pagy, link),
                'link'   => %(<span class="page">#{link.call(PAGE_PLACEHOLDER)}</span> ),
                'active' => %(<span class="page active">#{pagy.page}</span> ),
-               'gap'    => %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> ),
+               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
 
-      html = %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy)
+    def pagy_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}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<nav id="#{id}" class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">#{
-          pagy_nav_prev_html(pagy, link)
+      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager">#{
+          pagy_nav_prev_html pagy, link
       }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
-          pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</span> #{
-          pagy_nav_next_html(pagy, link)
+          pagy_nav_next_html pagy, link
       }</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
 
@@ -43,7 +47,7 @@ class Pagy
         if (p_prev = pagy.prev)
           %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
         else
-          %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
+          %(<span class="page prev disabled">#{pagy_t 'pagy.nav.prev'}</span> )
         end
       end
 
@@ -51,7 +55,7 @@ class Pagy
         if (p_next = pagy.next)
           %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
         else
-          %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>)
+          %(<span class="page next disabled">#{pagy_t 'pagy.nav.next'}</span>)
         end
       end
 

data/lib/pagy/extras/overflow.rb

@@ -18,12 +18,12 @@ class Pagy
         raise                                     # same as without the extra
       when :last_page
         initial_page = @vars[:page]               # save the very initial page (even after re-run)
-        initialize(vars.merge!(page: @last))      # re-run with the last page
+        initialize vars.merge!(page: @last)       # re-run with the last page
         @vars[:page] = initial_page               # restore the inital page
       when :empty_page
         @offset = @items = @from = @to = 0        # vars relative to the actual page
         @prev = @last                             # prev relative to the actual page
-        extend(Series)                            # special series for :empty_page
+        extend Series                             # special series for :empty_page
       else
         raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
       end

data/lib/pagy/extras/searchkick.rb

@@ -49,6 +49,7 @@ class Pagy
     # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
     # the _collection argument is not available when the method is called
     def pagy_searchkick_get_vars(_collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
       vars[:items] ||= VARS[:items]
       vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
       vars

data/lib/pagy/extras/semantic.rb

@@ -7,16 +7,17 @@ class Pagy
   module Frontend
 
     # Pagination for semantic: it returns the html with the series of links to the pages
-    def pagy_semantic_nav(pagy)
-      link = pagy_link_proc(pagy, 'class="item"')
+    def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '')
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}))
 
-      html = +%(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">)
+      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu">)
       html << pagy_semantic_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 link.call item                            # page link
-                when String  then %(<a class="item active">#{item}</a>)     # current page
-                when :gap    then %(<div class="disabled item">...</div>)   # page gap
+                when Integer then link.call item                                                 # page link
+                when String  then %(<a class="item active">#{item}</a>)                          # current page
+                when :gap    then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>)   # page gap
                 end
       end
       html << pagy_semantic_next_html(pagy, link)
@@ -24,33 +25,37 @@ class Pagy
     end
 
     # Javascript pagination for semantic: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_semantic_nav_js(pagy, id=pagy_id)
-      link = pagy_link_proc(pagy, 'class="item"')
+    def pagy_semantic_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="item" #{link_extra}))
       tags = { 'before' => pagy_semantic_prev_html(pagy, link),
                'link'   => link.call(PAGE_PLACEHOLDER),
                'active' => %(<a class="item active">#{pagy.page}</a>),
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
                'after'  => pagy_semantic_next_html(pagy, link) }
 
-      html = %(<div id="#{id}" class="pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>)
-      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
+      html = %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation"></div>)
+      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
     end
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_semantic_combo_nav_js(pagy, id=pagy_id)
-      link    = pagy_link_proc(pagy, 'class="item"')
+    def pagy_semantic_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: %(class="item" #{link_extra}))
       p_page  = pagy.page
       p_pages = pagy.pages
       input   = %(<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">)
 
-      %(<div id="#{id}" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">#{
-         pagy_semantic_prev_html(pagy, link)
+      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation">#{
+         pagy_semantic_prev_html pagy, link
       }<div class="pagy-combo-input item">#{
-         pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
+         pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div> #{
-         pagy_semantic_next_html(pagy, link)
+         pagy_semantic_next_html pagy, link
       }</div>#{
-         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
 
@@ -60,7 +65,7 @@ class Pagy
         if (p_prev = pagy.prev)
           link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
         else
-          %(<div class="item disabled"><i class="left small chevron icon"></i></div>)
+          +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
         end
       end
 
@@ -68,7 +73,7 @@ class Pagy
         if (p_next = pagy.next)
           link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
         else
-          %(<div class="item disabled"><i class="right small chevron icon"></i></div>)
+          +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
         end
       end