pagy 8.4.5 → 8.5.0

data/lib/pagy/extras/js_tools.rb

@@ -42,7 +42,7 @@ class Pagy # :nodoc:
         end
       end
     end
-    Calendar.prepend CalendarOverride if defined?(Calendar)
+    Calendar::Unit.prepend CalendarOverride if defined?(Calendar::Unit)
 
     # Additions for the Frontend
     module FrontendAddOn

data/lib/pagy/extras/metadata.rb

@@ -17,7 +17,11 @@ class Pagy # :nodoc:
     def pagy_metadata(pagy, absolute: nil)
       scaffold_url = pagy_url_for(pagy, PAGE_TOKEN, absolute:)
       {}.tap do |metadata|
-        keys = defined?(Calendar) && pagy.is_a?(Calendar) ? pagy.vars[:metadata] - %i[count items] : pagy.vars[:metadata]
+        keys = if defined?(Calendar::Unit) && pagy.is_a?(Calendar::Unit)
+                 pagy.vars[:metadata] - %i[count items]
+               else
+                 pagy.vars[:metadata]
+               end
         keys.each do |key|
           metadata[key] = case key
                           when :scaffold_url then scaffold_url

data/lib/pagy/extras/overflow.rb

@@ -28,7 +28,8 @@ class Pagy # :nodoc:
           @vars[:page] = requested_page                # restore the requested page
         when :empty_page
           @offset = @items = @in = @from = @to = 0     # vars relative to the actual page
-          if defined?(Calendar) && is_a?(Calendar)     # only for Calendar instances
+          if defined?(Calendar::Unit) \
+              && is_a?(Calendar::Unit)                 # only for Calendar::Units instances
             edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but any time would do)
             @from = @to = edge                         # set both to the edge utc time (a >=&&< query will get no records)
           end
@@ -51,7 +52,7 @@ class Pagy # :nodoc:
       end
     end
     Pagy.prepend PagyOverride
-    Pagy::Calendar.prepend PagyOverride if defined?(Calendar)
+    Pagy::Calendar::Unit.prepend PagyOverride if defined?(Calendar::Unit)
 
     # Support for Pagy::Countless class
     module CountlessOverride

data/lib/pagy/frontend.rb

@@ -20,7 +20,7 @@ class Pagy
       a  = pagy_anchor(pagy)
 
       html = %(<nav#{id} class="pagy nav" #{nav_aria_label(pagy, aria_label:)}>#{
-                prev_a(pagy, a)})
+                 prev_a(pagy, a)})
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '8.4.5'
+  VERSION = '8.5.0'
 
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 8.4.5
+  version: 8.5.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -23,6 +23,11 @@ files:
 - apps/demo.ru
 - apps/rails.ru
 - apps/repro.ru
+- apps/tmp/calendar.sqlite3
+- apps/tmp/calendar.sqlite3-shm
+- apps/tmp/calendar.sqlite3-wal
+- apps/tmp/local_secret.txt
+- apps/tmp/pagy-rails.sqlite3
 - bin/pagy
 - config/pagy.rb
 - javascripts/pagy-module.js
@@ -36,9 +41,9 @@ 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/unit.rb
 - lib/pagy/calendar/week.rb
 - lib/pagy/calendar/year.rb
 - lib/pagy/console.rb

data/lib/pagy/calendar/helper.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Initializes the calendar objects, reducing complexity in the extra
-    # The returned calendar is a simple hash of units/objects
-    class Helper < Hash
-      class << self
-        private
-
-        def init(conf, period, params)
-          new.send(:init, conf, period, params)
-        end
-      end
-
-      private
-
-      # Create the calendar
-      def init(conf, period, params)
-        @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
-        @units = Calendar::UNITS & @conf.keys # get the units in time length desc order
-        raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
-
-        @period     = period
-        @params     = params
-        @page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
-        @units.each do |unit|  # set all the :page_param vars for later deletion
-          unit_page_param         = :"#{unit}_#{@page_param}"
-          conf[unit][:page_param] = unit_page_param
-          conf[unit][:page]       = @params[unit_page_param]
-        end
-        calendar = {}
-        object   = nil
-        @units.each_with_index do |unit, index|
-          params_to_delete    = @units[(index + 1), @units.size].map { |sub| conf[sub][:page_param] } + [@page_param]
-          conf[unit][:params] = lambda { |up| up.except(*params_to_delete.map(&:to_s)) } # rubocop:disable Style/Lambda
-          conf[unit][:period] = object&.send(:active_period) || @period
-          calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
-        end
-        [replace(calendar), object.from, object.to]
-      end
-
-      # Return the calendar object at time
-      def calendar_at(time, **opts)
-        conf        = Marshal.load(Marshal.dump(@conf))
-        page_params = {}
-        @units.inject(nil) do |object, unit|
-          conf[unit][:period] = object&.send(:active_period) || @period
-          conf[unit][:page]   = page_params[:"#{unit}_#{@page_param}"] \
-                              = Calendar.send(:create, unit, conf[unit]).send(:page_at, time, **opts)
-          conf[unit][:params] ||= {}
-          conf[unit][:params].merge!(page_params)
-          Calendar.send(:create, unit, conf[unit])
-        end
-      end
-
-      public
-
-      # Return the current time of the smallest time unit shown
-      def showtime
-        self[@units.last].from
-      end
-    end
-  end
-end