pagy 43.3.0 → 43.3.2

data/lib/pagy/toolbox/helpers/bootstrap/series_nav_js.rb

@@ -4,20 +4,22 @@ require_relative 'previous_next_html'
 require_relative '../support/wrap_series_nav_js'
 
 class Pagy
-  private
+  module NumericHelpers
+    private
 
-  # Javascript pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
-  def bootstrap_series_nav_js(classes: 'pagination', **)
-    a_lambda = a_lambda(**)
+    # Javascript pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def bootstrap_series_nav_js(classes: 'pagination', **)
+      a_lambda = a_lambda(**)
 
-    tokens   = { before:  %(<ul class="#{classes}">#{bootstrap_html_for(:previous, a_lambda)}),
-                 anchor:  %(<li class="page-item">#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'page-link')}</li>),
-                 current: %(<li class="page-item active"><a role="link" class="page-link" ) +
-                          %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
-                 gap:     %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
-                            I18n.translate('pagy.gap')}</a></li>),
-                 after:   %(#{bootstrap_html_for(:next, a_lambda)}</ul>) }
+      tokens   = { before:  %(<ul class="#{classes}">#{bootstrap_html_for(:previous, a_lambda)}),
+                   anchor:  %(<li class="page-item">#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'page-link')}</li>),
+                   current: %(<li class="page-item active"><a role="link" class="page-link" ) +
+                            %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+                   gap:     %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
+                              I18n.translate('pagy.gap')}</a></li>),
+                   after:   %(#{bootstrap_html_for(:next, a_lambda)}</ul>) }
 
-    wrap_series_nav_js(tokens, 'pagy-bootstrap series-nav-js', **)
+      wrap_series_nav_js(tokens, 'pagy-bootstrap series-nav-js', **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/bulma/input_nav_js.rb

@@ -4,21 +4,23 @@ require_relative 'previous_next_html'
 require_relative '../support/wrap_input_nav_js'
 
 class Pagy
-  private
+  module NumericHelpers
+    private
 
-  # Javascript combo pagination for bulma: it returns a nav with a data-pagy attribute used by the pagy.js file
-  def bulma_input_nav_js(classes: 'pagination', **)
-    a_lambda = a_lambda(**)
+    # Javascript combo pagination for bulma: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def bulma_input_nav_js(classes: 'pagination', **)
+      a_lambda = a_lambda(**)
 
-    input    = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page") +
-               %(style="text-align: center; width: #{@page.to_s.length + 1}rem; line-height: 1.2rem; ) +
-               %(border: none; border-radius: .25rem; padding: .0625rem; color: white; ) +
-               %(background-color: #485fc7;">#{A_TAG})
+      input    = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page") +
+                 %(style="text-align: center; width: #{@page.to_s.length + 1}rem; line-height: 1.2rem; ) +
+                 %(border: none; border-radius: .25rem; padding: .0625rem; color: white; ) +
+                 %(background-color: #485fc7;">#{A_TAG})
 
-    html     = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}<li class="pagination-link"><label>#{
-                 I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)
-                 }</label></li>#{bulma_html_for(:next, a_lambda)}</ul>)
+      html     = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}<li class="pagination-link"><label>#{
+                   I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)
+                   }</label></li>#{bulma_html_for(:next, a_lambda)}</ul>)
 
-    wrap_input_nav_js(html, "pagy-bulma input-nav-js #{classes}", **)
+      wrap_input_nav_js(html, "pagy-bulma input-nav-js #{classes}", **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/bulma/previous_next_html.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 class Pagy
-  private
+  module NumericHelpers
+    private
 
-  # Return the enabled/disabled previous/next page anchor tag
-  def bulma_html_for(which, a_lambda)
-    %(<li>#{
-      if send(which)
-        a_lambda.(send(which), I18n.translate("pagy.#{which}"),
-                  classes:    "pagination-#{which}",
-                  aria_label: I18n.translate("pagy.aria_label.#{which}"))
-      else
-        %(<a role="link" class="pagination-#{which}" disabled aria-disabled="true" aria-label="#{
-        I18n.translate("pagy.aria_label.#{which}")}">#{I18n.translate("pagy.#{which}")}</a>)
-      end
-      }</li>)
+    # Return the enabled/disabled previous/next page anchor tag
+    def bulma_html_for(which, a_lambda)
+      %(<li>#{
+        if send(which)
+          a_lambda.(send(which), I18n.translate("pagy.#{which}"),
+                    classes:    "pagination-#{which}",
+                    aria_label: I18n.translate("pagy.aria_label.#{which}"))
+        else
+          %(<a role="link" class="pagination-#{which}" disabled aria-disabled="true" aria-label="#{
+          I18n.translate("pagy.aria_label.#{which}")}">#{I18n.translate("pagy.#{which}")}</a>)
+        end
+        }</li>)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/bulma/series_nav.rb

@@ -4,27 +4,29 @@ require_relative 'previous_next_html'
 require_relative '../support/wrap_series_nav'
 
 class Pagy
-  private
+  module NumericHelpers
+    private
 
-  # Pagination for bulma: it returns the html with the series of links to the pages
-  def bulma_series_nav(classes: 'pagination', **)
-    a_lambda = a_lambda(**)
+    # Pagination for bulma: it returns the html with the series of links to the pages
+    def bulma_series_nav(classes: 'pagination', **)
+      a_lambda = a_lambda(**)
 
-    html = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)})
-    series(**).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-      html << case item
-              when Integer
-                %(<li>#{a_lambda.(item, page_label(item), classes: 'pagination-link')}</li>)
-              when String
-                %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
-                  page_label(item)}</a></li>)
-              when :gap
-                %(<li><span class="pagination-ellipsis">#{I18n.translate('pagy.gap')}</span></li>)
-              else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
-              end
-    end
-    html << %(#{bulma_html_for(:next, a_lambda)}</ul>)
+      html = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)})
+      series(**).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer
+                  %(<li>#{a_lambda.(item, page_label(item), classes: 'pagination-link')}</li>)
+                when String
+                  %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
+                    page_label(item)}</a></li>)
+                when :gap
+                  %(<li><span class="pagination-ellipsis">#{I18n.translate('pagy.gap')}</span></li>)
+                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                end
+      end
+      html << %(#{bulma_html_for(:next, a_lambda)}</ul>)
 
-    wrap_series_nav(html, "pagy-bulma series-nav #{classes}", **)
+      wrap_series_nav(html, "pagy-bulma series-nav #{classes}", **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/bulma/series_nav_js.rb

@@ -4,19 +4,21 @@ require_relative 'previous_next_html'
 require_relative '../support/wrap_series_nav_js'
 
 class Pagy
-  private
+  module NumericHelpers
+    private
 
-  # Javascript pagination for bulma: it returns a nav with a data-pagy attribute used by the Pagy.nav javascript
-  def bulma_series_nav_js(classes: 'pagination', **)
-    a_lambda = a_lambda(**)
+    # Javascript pagination for bulma: it returns a nav with a data-pagy attribute used by the Pagy.nav javascript
+    def bulma_series_nav_js(classes: 'pagination', **)
+      a_lambda = a_lambda(**)
 
-    tokens   = { before:  %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}),
-                 anchor:  %(<li>#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'pagination-link')}</li>),
-                 current: %(<li><a role="link" class="pagination-link is-current" ) +
-                          %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
-                 gap:     %(<li><span class="pagination-ellipsis">#{I18n.translate('pagy.gap')}</span></li>),
-                 after:   %(#{bulma_html_for(:next, a_lambda)}</ul>) }
+      tokens   = { before:  %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}),
+                   anchor:  %(<li>#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'pagination-link')}</li>),
+                   current: %(<li><a role="link" class="pagination-link is-current" ) +
+                            %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+                   gap:     %(<li><span class="pagination-ellipsis">#{I18n.translate('pagy.gap')}</span></li>),
+                   after:   %(#{bulma_html_for(:next, a_lambda)}</ul>) }
 
-    wrap_series_nav_js(tokens, "pagy-bulma series-nav-js #{classes}", **)
+      wrap_series_nav_js(tokens, "pagy-bulma series-nav-js #{classes}", **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/info_tag.rb

@@ -1,28 +1,30 @@
 # frozen_string_literal: true
 
 class Pagy
-  # Instances with count return "Displaying items 41-60 of 324 in total" or "Displaying Products 41-60 of 324 in total"
-  # Instances with no count return only page info: "Page 3 of 100"
-  def info_tag(id: nil, item_name: nil)
-    i18n_key  = if @count.nil?
-                  'pagy.info_tag.no_count'
-                elsif @count.zero?
-                  'pagy.info_tag.no_items'
-                elsif @in == @count
-                  'pagy.info_tag.single_page'
-                else
-                  'pagy.info_tag.multiple_pages'
-                end
+  module NumericHelpers
+    # Instances with count return "Displaying items 41-60 of 324 in total" or "Displaying Products 41-60 of 324 in total"
+    # Instances with no count return only page info: "Page 3 of 100"
+    def info_tag(id: nil, item_name: nil)
+      i18n_key  = if @count.nil?
+                    'pagy.info_tag.no_count'
+                  elsif @count.zero?
+                    'pagy.info_tag.no_items'
+                  elsif @in == @count
+                    'pagy.info_tag.single_page'
+                  else
+                    'pagy.info_tag.multiple_pages'
+                  end
 
-    info_data = if @count.nil?
-                  { page: @page, pages: @last }
-                else
-                  { item_name: item_name || I18n.translate('pagy.item_name', count: @count),
-                    count:     @count,
-                    from:      @from,
-                    to:        @to }
-                end
+      info_data = if @count.nil?
+                    { page: @page, pages: @last }
+                  else
+                    { item_name: item_name || I18n.translate('pagy.item_name', count: @count),
+                      count:     @count,
+                      from:      @from,
+                      to:        @to }
+                  end
 
-    %(<span#{%( id="#{id}") if id} class="pagy info">#{I18n.translate(i18n_key, **info_data)}</span>)
+      %(<span#{%( id="#{id}") if id} class="pagy info">#{I18n.translate(i18n_key, **info_data)}</span>)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/input_nav_js.rb

@@ -3,19 +3,21 @@
 require_relative 'support/wrap_input_nav_js'
 
 class Pagy
-  # JavaScript input pagination: it returns a nav with a data-pagy attribute used by the pagy.js file
-  def input_nav_js(style = nil, **)
-    return send(:"#{style}_input_nav_js", **) if style && style.to_s != 'pagy'
+  module NumericHelpers
+    # JavaScript input pagination: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def input_nav_js(style = nil, **)
+      return send(:"#{style}_input_nav_js", **) if style && style.to_s != 'pagy'
 
-    a_lambda = a_lambda(**)
+      a_lambda = a_lambda(**)
 
-    input = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page" ) +
-            %(style="text-align: center; width: #{@page.to_s.length + 1}rem; padding: 0;">#{A_TAG})
+      input = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page" ) +
+              %(style="text-align: center; width: #{@page.to_s.length + 1}rem; padding: 0;">#{A_TAG})
 
-    html  = %(#{previous_tag(a_lambda)}<label>#{
-              I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)}</label>#{
-              next_tag(a_lambda)})
+      html  = %(#{previous_tag(a_lambda)}<label>#{
+                I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)}</label>#{
+                next_tag(a_lambda)})
 
-    wrap_input_nav_js(html, 'pagy input-nav-js', **)
+      wrap_input_nav_js(html, 'pagy input-nav-js', **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/limit_tag_js.rb

@@ -3,22 +3,24 @@
 require_relative 'support/data_pagy_attribute'
 
 class Pagy
-  # Return the limit selector HTML. For example "Show [20] items per page"
-  def limit_tag_js(id: nil, item_name: nil, client_max_limit: @options[:client_max_limit], **)
-    raise OptionError.new(self, :client_max_limit, 'to be truthy', client_max_limit) unless client_max_limit
+  module NumericHelpers
+    # Return the limit selector HTML. For example "Show [20] items per page"
+    def limit_tag_js(id: nil, item_name: nil, client_max_limit: @options[:client_max_limit], **)
+      raise OptionError.new(self, :client_max_limit, 'to be truthy', client_max_limit) unless client_max_limit
 
-    limit_input = %(<input name="limit" type="number" min="1" max="#{client_max_limit}" value="#{
-                    @limit}" style="padding: 0; text-align: center; width: #{@limit.to_s.length + 1}rem;">#{A_TAG})
+      limit_input = %(<input name="limit" type="number" min="1" max="#{client_max_limit}" value="#{
+                      @limit}" style="padding: 0; text-align: center; width: #{@limit.to_s.length + 1}rem;">#{A_TAG})
 
-    url_token = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
+      url_token = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
 
-    %(<span#{%( id="#{id}") if id} class="pagy limit-tag-js" #{
-      data_pagy_attribute(:ltj, @from, url_token, PAGE_TOKEN, LIMIT_TOKEN)
-      }><label>#{
-      I18n.translate('pagy.limit_tag_js',
-                     item_name: item_name || I18n.translate('pagy.item_name', count: @limit),
-                     limit_input:,
-                     count: @limit)
-      }</label></span>)
+      %(<span#{%( id="#{id}") if id} class="pagy limit-tag-js" #{
+        data_pagy_attribute(:ltj, @from, url_token, PAGE_TOKEN, LIMIT_TOKEN)
+        }><label>#{
+        I18n.translate('pagy.limit_tag_js',
+                       item_name: item_name || I18n.translate('pagy.item_name', count: @limit),
+                       limit_input:,
+                       count: @limit)
+        }</label></span>)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/loaders.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Pagy
+  # The aliaser defines loader methods and aliases them.
+  # When a method is called for the first time, its loader will load the full implementation
+  # which will overwrite the alias and will be executed.
+  # Subsequent calls will run the full implementation directly.
+  aliaser = lambda do |receiver, paths|
+              receiver.instance_eval do
+                paths.each do |visibility, methods|
+                  methods.each do |method, path|
+                    loader_name = :"_pagy_loader_for_#{method}"
+                    define_method(loader_name) do |*args, **kwargs|
+                      # Tests shadow the usage of these lines
+                      # :nocov:
+                      require_relative path
+                      send(method, *args, **kwargs)
+                      # :nocov:
+                    end
+                    alias_method method, loader_name
+                    send(visibility, method)
+                  end
+                end
+              end
+            end
+
+  module HelperLoader
+  end
+
+  paths = { public: { page_url:     'page_url',
+                      data_hash:    'data_hash',
+                      headers_hash: 'headers_hash',
+                      urls_hash:    'urls_hash',
+                      next_tag:     'anchor_tags' } }.freeze
+
+  aliaser.(HelperLoader, paths)
+
+  module NumericHelperLoader
+  end
+
+  paths = { public:    { previous_tag:            'anchor_tags',
+                         input_nav_js:            'input_nav_js',
+                         info_tag:                'info_tag',
+                         limit_tag_js:            'limit_tag_js',
+                         series_nav:              'series_nav',
+                         series_nav_js:           'series_nav_js' },
+            protected: { bootstrap_series_nav:    'bootstrap/series_nav',
+                         bootstrap_series_nav_js: 'bootstrap/series_nav_js',
+                         bootstrap_input_nav_js:  'bootstrap/input_nav_js',
+                         bulma_series_nav:        'bulma/series_nav',
+                         bulma_series_nav_js:     'bulma/series_nav_js',
+                         bulma_input_nav_js:      'bulma/input_nav_js' } }.freeze
+
+  aliaser.(NumericHelperLoader, paths)
+end

data/lib/pagy/toolbox/helpers/series_nav.rb

@@ -3,27 +3,29 @@
 require_relative 'support/wrap_series_nav'
 
 class Pagy
-  # Return the HTML with the series of links to the pages
-  def series_nav(style = nil, **)
-    return send(:"#{style}_series_nav", **) if style && style.to_s != 'pagy'
+  module NumericHelpers
+    # Return the HTML with the series of links to the pages
+    def series_nav(style = nil, **)
+      return send(:"#{style}_series_nav", **) if style && style.to_s != 'pagy'
 
-    a_lambda = a_lambda(**)
+      a_lambda = a_lambda(**)
 
-    html = previous_tag(a_lambda)
-    series(**).each do |item|   # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-      html << case item
-              when Integer
-                a_lambda.(item)
-              when String
-                %(<a role="link" aria-disabled="true" aria-current="page">#{page_label(item)}</a>)
-              when :gap
-                %(<a role="separator" aria-disabled="true">#{I18n.translate('pagy.gap')}</a>)
-              else
-                raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
-              end
-    end
-    html << next_tag(a_lambda)
+      html = previous_tag(a_lambda)
+      series(**).each do |item|   # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer
+                  a_lambda.(item)
+                when String
+                  %(<a role="link" aria-disabled="true" aria-current="page">#{page_label(item)}</a>)
+                when :gap
+                  %(<a role="separator" aria-disabled="true">#{I18n.translate('pagy.gap')}</a>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                end
+      end
+      html << next_tag(a_lambda)
 
-    wrap_series_nav(html, 'pagy series-nav', **)
+      wrap_series_nav(html, 'pagy series-nav', **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/series_nav_js.rb

@@ -3,17 +3,19 @@
 require_relative 'support/wrap_series_nav_js'
 
 class Pagy
-  # Return a nav with a data-pagy attribute used by the pagy.js file
-  def series_nav_js(style = nil, **)
-    return send(:"#{style}_series_nav_js", **) if style && style.to_s != 'pagy'
+  module NumericHelpers
+    # Return a nav with a data-pagy attribute used by the pagy.js file
+    def series_nav_js(style = nil, **)
+      return send(:"#{style}_series_nav_js", **) if style && style.to_s != 'pagy'
 
-    a_lambda = a_lambda(**)
-    tokens   = { before:  previous_tag(a_lambda),
-                 anchor:  a_lambda.(PAGE_TOKEN, LABEL_TOKEN),
-                 current: %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
-                 gap:     %(<a role="separator" aria-disabled="true">#{I18n.translate('pagy.gap')}</a>),
-                 after:   next_tag(a_lambda) }
+      a_lambda = a_lambda(**)
+      tokens   = { before:  previous_tag(a_lambda),
+                   anchor:  a_lambda.(PAGE_TOKEN, LABEL_TOKEN),
+                   current: %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
+                   gap:     %(<a role="separator" aria-disabled="true">#{I18n.translate('pagy.gap')}</a>),
+                   after:   next_tag(a_lambda) }
 
-    wrap_series_nav_js(tokens, 'pagy series-nav-js', **)
+      wrap_series_nav_js(tokens, 'pagy series-nav-js', **)
+    end
   end
 end

data/lib/pagy/toolbox/helpers/support/a_lambda.rb

@@ -18,7 +18,7 @@ class Pagy
                     %( #{anchor_string}) if anchor_string}).split(PAGE_TOKEN, 2)
 
     lambda do |page, text = page_label(page), classes: nil, aria_label: nil|
-      title = if (counts = @options[:counts]) # only for calendar with counts
+      title = if calendar? && (counts = @options[:counts])
                 count    = counts[page - 1]
                 classes  = classes ? "#{classes} empty-page" : 'empty-page' if count.zero?
                 info_key = count.zero? ? 'pagy.info_tag.no_items' : 'pagy.info_tag.single_page'

data/lib/pagy.rb

@@ -5,12 +5,12 @@ require 'pathname'
 require_relative 'pagy/classes/exceptions'
 require_relative 'pagy/modules/abilities/linkable'
 require_relative 'pagy/modules/abilities/configurable'
-require_relative 'pagy/toolbox/helpers/loader'
+require_relative 'pagy/toolbox/helpers/loaders'
 
 # Top superclass: it defines only what's common to all the subclasses
 # noinspection RubyMismatchedArgumentType
 class Pagy
-  VERSION     = '43.3.0'
+  VERSION     = '43.3.2'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')
@@ -36,7 +36,7 @@ class Pagy
 
   extend Configurable
   include Linkable
-  include Loader
+  include HelperLoader
 
   attr_reader :page, :next, :in, :limit, :options
 
@@ -78,4 +78,9 @@ class Pagy
     clean_options = options.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') }
     @options      = default.merge!(clean_options).freeze
   end
+
+  # Hook module for numeric UI helpers
+  module NumericHelpers
+    include NumericHelperLoader
+  end
 end