pagy 4.1.0 → 4.5.1

data/lib/pagy/extras/navs.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,31 +7,57 @@ 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, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                                  : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ),
+    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> ),
-               'after'  => p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                                  : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>) }
-      %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
+               'after'  => pagy_nav_next_html(pagy, link) }
+
+      html = %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" role="navigation" 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, 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-combo-nav-js pagination" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                      : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
-      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;">)
-      html << %(<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)}</span> )
-      html << (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                      : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
-      html << %(</nav>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+    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#{p_id} class="pagy-combo-nav-js pagination" role="navigation" 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
+      }</span> #{
+          pagy_nav_next_html pagy, link
+      }</nav>#{
+          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
+      })
     end
 
+    private
+
+      def pagy_nav_prev_html(pagy, link)
+        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> )
+        end
+      end
+
+      def pagy_nav_next_html(pagy, link)
+        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>)
+        end
+      end
+
   end
 end

data/lib/pagy/extras/overflow.rb

@@ -1,10 +1,9 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
 
-  module Overflow
+  module UseOverflowExtra
     VARS[:overflow] = :empty_page
 
     def overflow? = @overflow
@@ -19,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
@@ -34,33 +33,33 @@ class Pagy
       def series(size=@vars[:size])
         @page = @last                             # series for last page
         super(size).tap do |s|                    # call original series
-        s[s.index(@page.to_s)] = @page            # string to integer (i.e. no current page)
-        @page = @vars[:page]                      # restore the actual page
+          s[s.index(@page.to_s)] = @page          # string to integer (i.e. no current page)
+          @page = @vars[:page]                    # restore the actual page
         end
       end
     end
 
   end
-  prepend Overflow
+  prepend UseOverflowExtra
 
 
   # support for Pagy::Countless
   if defined?(Pagy::Countless)
     class Countless
 
-      module Overflow
+      module UseOverflowExtra
 
         def finalize(items)
           @overflow = false
           super
         rescue OverflowError
-          @overflow = true                            # add the overflow flag
+          @overflow = true                        # add the overflow flag
           case @vars[:overflow]
           when :exception
-            raise                                     # same as without the extra
+            raise                                 # same as without the extra
           when :empty_page
-            @offset = @items = @from = @to = 0        # vars relative to the actual page
-            @vars[:size] = []                         # no page in the series
+            @offset = @items = @from = @to = 0    # vars relative to the actual page
+            @vars[:size] = []                     # no page in the series
             self
           else
             raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
@@ -68,7 +67,7 @@ class Pagy
         end
 
       end
-      prepend Overflow
+      prepend UseOverflowExtra
 
     end
   end

data/lib/pagy/extras/searchkick.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -10,7 +9,7 @@ class Pagy
     # returns an array used to delay the call of #search
     # after the pagination variables are merged to the options
     # it also pushes to the same array an eventually called method
-    def pagy_searchkick(term = "*", **options, &block)
+    def pagy_searchkick(term = '*', **options, &block)
       [self, term, options, block].tap do |args|
         args.define_singleton_method(:method_missing){|*a| args += a}
       end
@@ -27,7 +26,8 @@ class Pagy
   end
 
   # Add specialized backend methods to paginate Searchkick::Results
-  module Backend ; private
+  module Backend
+    private
 
     # Return Pagy object and results
     def pagy_searchkick(pagy_search_args, vars={})
@@ -37,17 +37,19 @@ class Pagy
       options[:page]     = vars[:page]
       results            = model.search(term, **options, &block)
       vars[:count]       = results.total_count
+
       pagy = Pagy.new(vars)
       # with :last_page overflow we need to re-run the method in order to get the hits
-      if defined?(Pagy::Overflow) && pagy.overflow? && pagy.vars[:overflow] == :last_page
-        return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page))
-      end
-      return pagy, called.empty? ? results : results.send(*called)
+      return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page)) \
+             if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+      [ pagy, called.empty? ? results : results.send(*called) ]
     end
 
     # 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

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,48 +7,75 @@ 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, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
+    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 = (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                     : +%(<div class="item disabled"><i class="left small chevron icon"></i></div>))
+      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu" aria-label="pager">)
+      html << pagy_semantic_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); %(#{link.call item})                      # page link
-                elsif item.is_a?(String) ; %(<a class="item active">#{item}</a>)     # current page
-                elsif item == :gap       ; %(<div class="disabled item">...</div>)   # page gap
+        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">#{pagy_t 'pagy.nav.gap'}</div>)   # page gap
                 end
       end
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      %(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
+      html << pagy_semantic_next_html(pagy, link)
+      html << %(</div>)
     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, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
-      tags = { 'before' => (p_prev ? %(#{link.call(p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"')})
-                                   : %(<div class="item disabled"><i class="left small chevron icon"></i></div>)),
-               'link'   => %(#{link.call(PAGE_PLACEHOLDER)}),
+    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'  => (p_next ? %(#{link.call(p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"')})
-                                   : %(<div class="item disabled"><i class="right small chevron icon"></i></div>)) }
-      %(<div id="#{id}" class="pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => pagy_semantic_next_html(pagy, link) }
+
+      html = %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></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, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<div id="#{id}" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                      : %(<div class="item disabled"><i class="left small chevron icon"></i></div>))
-      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">)
-      html << %(<div class="pagy-combo-input item">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div> )
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      html << %(</div>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+    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#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">#{
+         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
+      }</div> #{
+         pagy_semantic_next_html pagy, link
+      }</div>#{
+         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
+      })
     end
 
+    private
+
+      def pagy_semantic_prev_html(pagy, link)
+        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>)
+        end
+      end
+
+      def pagy_semantic_next_html(pagy, link)
+        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>)
+        end
+      end
+
   end
 end

data/lib/pagy/extras/shared.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'digest'
@@ -17,10 +16,13 @@ class Pagy
   #       "350" => [1, 2, :gap, 17, 18, 19, "20", 21, 22, 23, :gap, 49, 50],
   #       "550" => [1, 2, 3, :gap, 16, 17, 18, 19, "20", 21, 22, 23, 24, :gap, 48, 49, 50] }
   # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
-  def sequels
-    steps = @vars[:steps] || {0 => @vars[:size]}
-    steps.key?(0) or raise(VariableError.new(self), "expected :steps to define the 0 width; got #{steps.inspect}")
-    sequels = {}; steps.each {|width, size| sequels[width.to_s] = series(size)}; sequels
+  def sequels(steps=nil)
+    steps ||= @vars[:steps] || {0 => @vars[:size]}
+    raise VariableError.new(self), "expected :steps to define the 0 width; got #{steps.inspect}" \
+          unless steps.key?(0)
+    {}.tap do |sequels|
+      steps.each {|width, size| sequels[width.to_s] = series(size)}
+    end
   end
 
   module Frontend
@@ -28,23 +30,22 @@ class Pagy
     if defined?(Oj)
       # it returns a script tag with the JSON-serialized args generated with the faster oj gem
       def pagy_json_tag(pagy, *args)
-        args << ( defined?(Trim) && pagy.vars[:page_param] )
+        args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
         %(<script type="application/json" class="pagy-json">#{Oj.dump(args, mode: :strict)}</script>)
       end
     else
       require 'json'
       # it returns a script tag with the JSON-serialized args generated with the slower to_json
       def pagy_json_tag(pagy, *args)
-        args << ( defined?(Trim) && pagy.vars[:page_param] )
+        args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
         %(<script type="application/json" class="pagy-json">#{args.to_json}</script>)
       end
     end
 
-    # it returns the SHA1 (fastest on modern ruby) string used as default `id` attribute by all the `*_js` tags
-    def pagy_id = "pagy-#{Digest::SHA1.hexdigest(caller(2..2)[0].split(':in')[0])}"
-
     # it returns the marked link to used by pagy.js
-    def pagy_marked_link(link) = link.call(PAGE_PLACEHOLDER, '', 'style="display: none;"')
+    def pagy_marked_link(link)
+      link.call PAGE_PLACEHOLDER, '', 'style="display: none;"'
+    end
 
   end
 

data/lib/pagy/extras/standalone.rb

@@ -0,0 +1,58 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/standalone
+# frozen_string_literal: true
+
+require 'uri'
+class Pagy
+
+  # extracted from Rack::Utils and reformatted for rubocop
+  module QueryUtils
+    module_function
+    def escape(str)
+      URI.encode_www_form_component(str)
+    end
+    def build_nested_query(value, prefix = nil)
+      case value
+      when Array
+        value.map { |v| build_nested_query(v, "#{prefix}[]") }.join('&')
+      when Hash
+        value.map { |k, v| build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k)) }.delete_if(&:empty?).join('&')
+      when nil
+        prefix
+      else
+        raise ArgumentError, 'value must be a Hash' if prefix.nil?
+        "#{prefix}=#{escape(value)}"
+      end
+    end
+  end
+
+  module UseStandaloneExtra
+    # without any :url var it works exactly as the regular #pagy_url_for;
+    # with a defined :url variable it does not use rack/request
+    def pagy_url_for(pagy, page, deprecated_url=nil, absolute: nil)
+      absolute = Pagy.deprecated_arg(:url, deprecated_url, :absolute, absolute) if deprecated_url
+      pagy, page = Pagy.deprecated_order(pagy, page) if page.is_a?(Pagy)
+      p_vars = pagy.vars
+      if p_vars[:url]
+        url_string = p_vars[:url]
+        params     = {}
+      else
+        url_string = "#{request.base_url if absolute}#{request.path}"
+        params     = request.GET
+      end
+      params = params.merge(p_vars[:params])
+      params[p_vars[:page_param].to_s]  = page
+      params[p_vars[:items_param].to_s] = p_vars[:items] if defined?(UseItemsExtra)
+      query_string = "?#{QueryUtils.build_nested_query(pagy_get_params(params))}" unless params.empty?
+      "#{url_string}#{query_string}#{p_vars[:fragment]}"
+    end
+  end
+  Helpers.prepend UseStandaloneExtra
+
+  # defines a dummy #params method if not already defined in the including module
+  module Backend
+    def self.included(controller)
+      controller.define_method(:params){{}} unless controller.method_defined?(:params)
+    end
+  end
+
+end

data/lib/pagy/extras/support.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -7,29 +6,39 @@ class Pagy
   module Frontend
 
     def pagy_prev_url(pagy)
-      pagy_url_for(pagy.prev, pagy) if pagy.prev
+      pagy_url_for(pagy, pagy.prev) if pagy.prev
     end
 
     def pagy_next_url(pagy)
-      pagy_url_for(pagy.next, pagy) if pagy.next
+      pagy_url_for(pagy, pagy.next) if pagy.next
     end
 
-    def pagy_prev_link(pagy, text = pagy_t('pagy.nav.prev'), link_extra = '')
-      pagy.prev ? %(<span class="page prev"><a href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page prev disabled">#{text}</span>)
+    def pagy_prev_link(pagy, deprecated_text=nil, deprecated_link_extra=nil, text: pagy_t('pagy.nav.prev'), link_extra: '')
+      text       = Pagy.deprecated_arg(:text, deprecated_text, :text, text) if deprecated_text
+      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
+      if pagy.prev
+        %(<span class="page prev"><a href="#{pagy_url_for(pagy, pagy.prev)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page prev disabled">#{text}</span>)
+      end
     end
 
-    def pagy_next_link(pagy, text = pagy_t('pagy.nav.next'), link_extra = '')
-      pagy.next ? %(<span class="page next"><a href="#{pagy_url_for(pagy.next, pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page next disabled">#{text}</span>)
+    def pagy_next_link(pagy, deprecated_text=nil, deprecated_link_extra=nil, text: pagy_t('pagy.nav.next'), link_extra: '')
+      text       = Pagy.deprecated_arg(:text, deprecated_text, :text, text) if deprecated_text
+      link_extra = Pagy.deprecated_arg(:link_extra, deprecated_link_extra, :link_extra, link_extra) if deprecated_link_extra
+      if pagy.next
+        %(<span class="page next"><a href="#{pagy_url_for(pagy, pagy.next)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page next disabled">#{text}</span>)
+      end
     end
 
     def pagy_prev_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev"/>) if pagy.prev
+      %(<link href="#{pagy_url_for(pagy, pagy.prev)}" rel="prev"/>) if pagy.prev
     end
 
     def pagy_next_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy.next, pagy)}" rel="next"/>) if pagy.next
+      %(<link href="#{pagy_url_for(pagy, pagy.next)}" rel="next"/>) if pagy.next
     end
 
   end