pagy 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a62cb4c6decfdc1013da6d14b38220aa361246637301a8d92b2d781440397bc
-  data.tar.gz: 2555195198def80d6ec002928da8cef07419a76da9a196d8971d50e7fb5095e2
+  metadata.gz: a5d3090b61a9b11c0763a7c2d103ee36f4a36f0618e7e99b32357bab408a29bc
+  data.tar.gz: d5c3c376deda1c84558bbcff43809c9235cb2fc9ced7492ecdfe8df6397c873e
 SHA512:
-  metadata.gz: f665f63cb281c25d6fcf430c12888def46ea46911e45a566fd52cb4943763efe775b094015d3b658b8322ade23a9a43a5888c60f10471bd567f000d5a67352c7
-  data.tar.gz: 8c22ab2ad5efc0bd91b648d89217d1b71d77fbf669e1153b015954b79c2506c8f5ffe29d80e7d5988bea76b4bed35e7a76bb9c3657f60de0db3cde84b38e62e2
+  metadata.gz: 6591de1571e9b6bdf1a26668cf730dcbba4c83ef9f2d3727b3a1bec5f98c49a69ae2d55aab363444d85a3310e3de65fe119fb3606ca63cfdf56202c14c591568
+  data.tar.gz: 02fea4991aab7911107460e58e73a66f507f9fff990261f1536fddf016b9523003165ed0dfd024013282ef43fec221cb7fcfa27b7f6b23c60a742f175adc0eae

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.6.0)
+# Pagy initializer file (5.6.1)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
@@ -40,22 +40,25 @@
 # See https://ddnexus.github.io/pagy/extras/array
 # require 'pagy/extras/array'
 
-# Calendar extra: Add pagination filtering by calendar time unit (Year, Month, Week Day)
+# Calendar extra: Add pagination filtering by calendar time unit (year, quartr, month, week, day)
 # See https://ddnexus.github.io/pagy/extras/calendar
 # require 'pagy/extras/calendar'
 # Default for each unit
-# Pagy::Calendar::Year::DEFAULT[:order]   = :asc        # Time direction of pagination
-# Pagy::Calendar::Year::DEFAULT[:format]  = '%Y'        # strftime format
+# Pagy::Calendar::Year::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Year::DEFAULT[:format]    = '%Y'        # strftime format
 #
-# Pagy::Calendar::Month::DEFAULT[:order]  = :asc        # Time direction of pagination
-# Pagy::Calendar::Month::DEFAULT[:format] = '%Y-%m'     # strftime format
+# Pagy::Calendar::Quarter::DEFAULT[:order]  = :asc        # Time direction of pagination
+# Pagy::Calendar::Quarter::DEFAULT[:format] = '%Y-Q%q'    # strftime format
 #
-# Pagy::Calendar::Week::DEFAULT[:order]   = :asc        # Time direction of pagination
-# Pagy::Calendar::Week::DEFAULT[:format]  = '%Y-%W'     # strftime format
-# Pagy::Calendar::Week::DEFAULT[:offset]  = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
+# Pagy::Calendar::Month::DEFAULT[:order]    = :asc        # Time direction of pagination
+# Pagy::Calendar::Month::DEFAULT[:format]   = '%Y-%m'     # strftime format
 #
-# Pagy::Calendar::Day::DEFAULT[:order]    = :asc        # Time direction of pagination
-# Pagy::Calendar::Day::DEFAULT[:format]   = '%Y-%m-%d'  # strftime format
+# Pagy::Calendar::Week::DEFAULT[:order]     = :asc        # Time direction of pagination
+# Pagy::Calendar::Week::DEFAULT[:format]    = '%Y-%W'     # strftime format
+# Pagy::Calendar::Week::DEFAULT[:offset]    = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
+#
+# Pagy::Calendar::Day::DEFAULT[:order]      = :asc        # Time direction of pagination
+# Pagy::Calendar::Day::DEFAULT[:format]     = '%Y-%m-%d'  # strftime format
 #
 # Uncomment the following block, if you need calendar localization without using the I18n extra
 # module LocalizePagyCalendar

data/lib/javascripts/pagy.js

@@ -5,7 +5,7 @@
 // Container of the whole pagy stuff
 function Pagy(){}
 
-Pagy.version = '5.6.0'
+Pagy.version = '5.6.1'
 
 // Used by the waitForMe function
 Pagy.delay = 100

data/lib/pagy/calendar/quarter.rb

@@ -8,9 +8,16 @@ class Pagy # :nodoc:
     # Calendar quarter subclass
     class Quarter < Calendar
       DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
-                  format: '%Y-Q%q' }
+                  format: '%Y-Q%q' } # '%q' token
       MONTHS  = 3  # number of months of the unit
       include MonthMixin
+
+      # The label for any page, with the substitution of the '%q' token
+      def label_for(page, opts = {})
+        start_time    = start_for(page.to_i)
+        opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (start_time.month / 4) + 1 }
+        localize(start_time, opts)
+      end
     end
   end
 end

data/lib/pagy/calendar.rb

@@ -29,16 +29,14 @@ class Pagy # :nodoc:
     end
 
     # The label for the current page (it can pass along the I18n gem opts when it's used with the i18n extra)
-    def label(**opts)
-      label_for(@page, **opts)
+    def label(opts = {})
+      label_for(@page, opts)
     end
 
     # The label for any page (it can pass along the I18n gem opts when it's used with the i18n extra)
-    def label_for(page, **opts)
+    def label_for(page, opts = {})
       opts[:format] ||= @vars[:format]
-      start = start_for(page.to_i)
-      opts[:format] = opts[:format].gsub('%q') { (start.month / 4) + 1 }
-      localize(start, **opts)
+      localize(start_for(page.to_i), opts)
     end
 
     # Period of the active page (used for nested units)

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.6.0'
+  VERSION = '5.6.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email: