pagy 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b456869f0028668579c9839d1083b7baf7693d593fcbed24f371bc52dfff4467
-  data.tar.gz: ec4f4b71da52860950262812d2bfbbe9190b1f0a1c3836cbc8f316e0c04ecd0b
+  metadata.gz: e3530b69891d7c069acdb707d6fa54e8b5d31763a80e57dae2e0fe3afafce8b2
+  data.tar.gz: defdc75e9f60ae351e8b071fffd3bf4767e28d51edd8ec6398a1b5958d688084
 SHA512:
-  metadata.gz: e16ea640c3cc34b506c02d585c48fa8365b1a5e67d3b487d69669aa9d700a1f930929844e92759929f3963e78f2d72c53b4ef2d4caefeb2adbbff262ff0dd54d
-  data.tar.gz: 3086cf995b60b71212b64b42d7998e2f2831883abf41d22f9952b0632143936871a4c50d16da6b1849e805ce90de190be555e96ba893b5ee28c01b8650af7e03
+  metadata.gz: 13dc93a7f0de2f1e4a688292e1901905df218d500fe1543e4d518dab1f1e7f7d2276cc63f197c251b1ed14e8fea4b46d8be4590ccbad89cfed11d70481a769a2
+  data.tar.gz: f6ddac95479d63445920df9bad22142f59b9b14e2a4c758303c76389eefd1a475ce49dd1e781e70519bed0a081c1b2296bb19be6ca6e50feefa0abb9660749a6

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.3.0)
+# Pagy initializer file (5.3.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
 

data/lib/javascripts/pagy.js

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

data/lib/pagy/calendar.rb

@@ -32,7 +32,7 @@ class Pagy # :nodoc:
     end
 
     # Generate a label for each page, with the specific `Time` period it refers to
-    # It can pass along the I18n gem opts when it's used with the i18n extra
+    # (it can pass along the I18n gem opts when it's used with the i18n extra)
     def label_for(page, **opts)
       snap = snap(page.to_i)
       time = case @unit
@@ -43,11 +43,11 @@ class Pagy # :nodoc:
              else raise InternalError, "expected @unit to be in [:year, :month, :week, :day]; got #{@unit.inspect}"
              end
       opts[:format] ||= @vars[:"#{@unit}_format"]
-      strftime(time, **opts)
+      localize(time, **opts)
     end
 
     # The label for the current page
-    # It can pass along the I18n gem opts when it's used with the i18n extra
+    # (it can pass along the I18n gem opts when it's used with the i18n extra)
     def label(**opts)
       label_for(@page, **opts)
     end
@@ -69,7 +69,7 @@ class Pagy # :nodoc:
 
       min, max = @vars[:local_minmax]
       raise VariableError.new(self, :local_minmax, 'to be a an Array of min and max local Time instances', @vars[:local_minmax]) \
-            unless min.is_a?(Time) && max.is_a?(Time) && !min.utc? && !min.utc? && min <= max \
+            unless min.is_a?(Time) && max.is_a?(Time) && !min.utc? && !max.utc? && min <= max \
                    && (@utc_offset = min.utc_offset) == max.utc_offset
 
       send :"setup_#{@unit}_vars", min, max
@@ -118,8 +118,9 @@ class Pagy # :nodoc:
       @utc_to   = @utc_from + DAY
     end
 
-    # The last method in the labelling chain: it is overridden by the I18n when localization is required.
-    def strftime(time, **opts)
+    # Apply the strftime format to the time
+    # (overridden by the i18n extra when localization is required)
+    def localize(time, **opts)
       time.strftime(opts[:format])
     end
 

data/lib/pagy/extras/calendar.rb

@@ -25,11 +25,11 @@ class Pagy # :nodoc:
       end
 
       # This method should be implemented in the application and should return the records
-      # for the unit by selecting the records with DateTime from pagy.from to pagy.to
+      # for the unit by selecting the records with Time from pagy.utc_from to pagy.utc_to
       def pagy_calendar_get_items(_collection, _pagy)
-        # collection.your_own_method_to_get_the_items_with(pagy.from, pagy.to)
+        # collection.your_own_method_to_get_the_items_with(pagy.utc_from, pagy.utc_to)
         raise NoMethodError, 'The pagy_calendar_get_items method must be implemented in the application and must return ' \
-                             'the items for the unit by selecting the records with Time from pagy.from to pagy.to'
+                             'the items for the unit by selecting the records with Time from pagy.utc_from to pagy.utc_to'
       end
     end
   end

data/lib/pagy/extras/i18n.rb

@@ -13,7 +13,7 @@ class Pagy # :nodoc:
 
     # Calendar overriding
     module Calendar
-      def strftime(time, **opts)
+      def localize(time, **opts)
         ::I18n.l(time, **opts)
       end
     end

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.3.0'
+  VERSION = '5.3.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.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email: