pagy 5.10.1 → 6.0.4

data/lib/pagy.rb

@@ -1,11 +1,11 @@
-# See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/pagy
 # frozen_string_literal: true
 
 require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.10.1'
+  VERSION = '6.0.4'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -22,9 +22,10 @@ class Pagy
               fragment:   '',
               link_extra: '',
               i18n_key:   'pagy.item_name',
-              cycle:      false }
+              cycle:      false,
+              request_path: '' }
 
-  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params
+  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
 
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
@@ -34,6 +35,7 @@ class Pagy
     setup_pages_var
     setup_offset_var
     setup_params_var
+    setup_request_path_var
     raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
 
     @from   = [@offset - @outset + 1, @count].min
@@ -92,7 +94,7 @@ class Pagy
   def setup_vars(name_min)
     name_min.each do |name, min|
       raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
+            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
   end
 
@@ -116,6 +118,16 @@ class Pagy
     raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
           unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)
   end
+
+  def setup_request_path_var
+    request_path = @vars[:request_path]
+    return if request_path.to_s.empty?
+
+    raise VariableError.new(self, :request_path, 'must be a bare path like "/foo"', request_path) \
+          if !request_path.start_with?('/') || request_path.include?('?')
+
+    @request_path = request_path
+  end
 end
 
 require 'pagy/backend'

data/lib/templates/bootstrap_nav.html.erb

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy, link_extra: 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav" role="navigation">
+<%#                            -%><nav class="pagy-bootstrap-nav" role="navigation">
 <%#                            -%>  <ul class="pagination">
 <% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
 <% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>

data/lib/templates/bootstrap_nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
 
-%nav.pagy-bootstrap-nav{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-bootstrap-nav{:role => "navigation"}
 
   %ul.pagination
 

data/lib/templates/bootstrap_nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
 
-nav.pagy-bootstrap-nav role="navigation" aria-label="pager"
+nav.pagy-bootstrap-nav role="navigation"
 
   ul.pagination
 

data/lib/templates/nav.html.erb

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy) -%>
-<%#                            -%><nav aria-label="pager" class="pagy_nav pagination" role="navigation">
+<%#                            -%><nav class="pagy_nav pagination" role="navigation">
 <% if pagy.prev                -%>  <span class="page prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></span>
 <% else                        -%>  <span class="page prev disabled"><%== pagy_t('pagy.nav.prev') %></span>
 <% end                         -%>

data/lib/templates/nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-%nav.pagy_nav.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy_nav.pagination{:role => "navigation"}
 
   - if pagy.prev
     %span.page.prev!= link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

data/lib/templates/nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-nav.pagy_nav.pagination role="navigation" aria-label="pager"
+nav.pagy_nav.pagination role="navigation"
 
   - if pagy.prev
     span.page.prev ==> link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.10.1
+  version: 6.0.4
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-05-04 00:00:00.000000000 Z
+dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
 - dd.nexus@gmail.com
@@ -55,6 +41,7 @@ files:
 - lib/locales/ko.yml
 - lib/locales/nb.yml
 - lib/locales/nl.yml
+- lib/locales/nn.yml
 - lib/locales/pl.yml
 - lib/locales/pt-BR.yml
 - lib/locales/pt.yml
@@ -73,6 +60,7 @@ files:
 - lib/pagy/backend.rb
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
+- lib/pagy/calendar/helper.rb
 - lib/pagy/calendar/month.rb
 - lib/pagy/calendar/quarter.rb
 - lib/pagy/calendar/week.rb
@@ -131,7 +119,7 @@ metadata:
   documentation_uri: https://ddnexus.github.io/pagy
   bug_tracker_uri: https://github.com/ddnexus/pagy/issues
   changelog_uri: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md
-  live_support: https://gitter.im/ruby-pagy/Lobby
+  support: https://github.com/ddnexus/pagy/discussions/categories/q-a
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -147,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: The kick-ass pagination ruby gem