pagy 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75bb34a884999d7ec40e067e8218a43c4d12193680014731a3c469c435370709
-  data.tar.gz: fcd39cc96ec420b6f2365b57ab3256559ec34cfbf72e0980cf555d60c5086122
+  metadata.gz: 7e5a33b40f2a12b18d7a3a4d86d367836a2e5bce8e675fea912292558f41d7bf
+  data.tar.gz: d79570153a77422382c17eed7bf00c446c5cc13aadb237c7df3207fb57db3766
 SHA512:
-  metadata.gz: 2aab474d8a2780320e4c13f2a79e9c6dbbe82657bbc9bc75135902c7c9ee27e1a742cf415b9588a712e4629914decc7abdfbc4e2dca0fdbf0eaf3436ca6b4376
-  data.tar.gz: ae28683579224c8cfe7442fafef13e7f767e926d34f4e56d420efd234622f93758ec270a036d7b7e900a2e0a3637a3cdcf2f6e1cee6dbf945f1b593fc4291e9e
+  metadata.gz: 6e7881aac396c5049ecbdf6430d87a748e95f184bbe71b38d2c0b0cbc705cc0309c7148788534ea337a0236fae8591226d2158c78e34f06c4e557e29577f357c
+  data.tar.gz: 166af959cf2fb5b05746a5d0a1431f29775c13059f86402003a1f1a0fd8cbd0b13af58ab7a110fd5604266507a860c24df1b538378a5a28ff4932b68b482dc2d

data/lib/config/pagy.rb

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

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

data/lib/pagy/calendar.rb

@@ -31,15 +31,20 @@ class Pagy # :nodoc:
     end
 
     # Generate a label for each page, with the specific `Time` period it refers to
-    def page_label(num = @page)
+    def page_label(num = @page, format = nil)
       snap = snap(num.to_i)
+      format ||= @vars[:"#{@unit}_format"]
       case @unit
       when :year  then new_time(@initial.year + snap)
       when :month then bump_month(@initial, snap)
       when :week  then @initial + (snap * WEEK)
       when :day   then @initial + (snap * DAY)
       else raise InternalError, "expected @unit to be in [:year, :month, :week, :day]; got #{@unit.inspect}"
-      end.strftime(@vars[:"#{@unit}_format"])
+      end.strftime(format)
+    end
+
+    def current_page_label(format = nil)
+      page_label(@page, format)
     end
 
     DAY  = 60 * 60 * 24

data/lib/pagy/extras/overflow.rb

@@ -4,7 +4,7 @@
 class Pagy # :nodoc:
   DEFAULT[:overflow] = :empty_page
 
-  # Handles OverflowError exceptions with different options
+  # Handles OverflowError exceptions for different classes with different options
   module OverflowExtra
     # Support for Pagy class
     module Pagy
@@ -15,22 +15,25 @@ class Pagy # :nodoc:
 
       # Add rescue clause for different behaviors
       def initialize(vars)
-        @overflow ||= false                         # don't override if :last_page re-run the method after an overflow
+        @overflow ||= false                            # still true if :last_page re-run the method after an overflow
         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 :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
-          @vars[:page] = initial_page               # restore the initial page
+          requested_page = @vars[:page]                # save the requested page (even after re-run)
+          initialize vars.merge!(page: @last)          # re-run with the last page
+          @vars[:page] = requested_page                # restore the requested page
         when :empty_page
-          @offset = @in = @from = @to = 0           # vars relative to the actual page
-          @utc_from = @utc_to = @final              # calendar variables out of local_minmax
-          @prev = @last                             # prev relative to the actual page
-          extend Series                             # special series for :empty_page
+          @offset = @in = @from = @to = 0              # vars relative to the actual page
+          if is_a?(Calendar)                           # only for Calendar instances
+            edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but it would work with any time)
+            @utc_from = @utc_to = edge.getutc          # set both to the edge utc time (a query with >= && < will get no record)
+          end
+          @prev = @last                                # prev relative to the actual page
+          extend Series                                # special series for :empty_page
         else
           raise VariableError.new(self, :overflow, 'to be in [:last_page, :empty_page, :exception]', @vars[:overflow])
         end
@@ -39,10 +42,10 @@ class Pagy # :nodoc:
       # Special series for empty page
       module Series
         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
+          @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
           end
         end
       end
@@ -55,13 +58,13 @@ class Pagy # :nodoc:
         @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 = @in = @from = @to = 0    # vars relative to the actual page
-          @vars[:size] = []                     # no page in the series
+          @offset = @in = @from = @to = 0              # vars relative to the actual page
+          @vars[:size] = []                            # no page in the series
           self
         else
           raise VariableError.new(self, :overflow, 'to be in [:empty_page, :exception]', @vars[:overflow])

data/lib/pagy.rb

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