pagy 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce35faa857fbc47879ebacc7f92ca168b402944ce4403c2c18e2b2eecd0a9c57
-  data.tar.gz: 24f36562a617e7870dc5cd4217979a06faf424f6cf6731d43a2fd6dd7f5e0084
+  metadata.gz: ab89e95c75050f7175f135b284ebd2eed4b0f781ec20fa789a2eceb90e6d42ab
+  data.tar.gz: 197af0bd45ea2c70ebf5bf9f9718f6fcceacacd8d1849bf6b1e74aa6b506d278
 SHA512:
-  metadata.gz: 2fb53ff09042a732205b3b5f262a6157a014b1ac04a69b7e8a6e5d92402468b7e5a8168a2f46f427d6ec696a283c81ad38e0a463c0124ebb4f62fe17237ce95e
-  data.tar.gz: 2490a4827a62166fbf0a710162bfd8be39aa51b62035053fb08701dd4b01dc0b55200122728588e91bc56e6eaa897290a31fa0b196040720bf0e293476ee959a
+  metadata.gz: aee8ad4bfc15d270c6a81a9362d331464a5fe00c18e99fd8a3f0647fa67762e6bb8abaf269c90b1cfea8130ca1097c3747ced0341a99983ab7b70a06650ed1ca
+  data.tar.gz: ccd69594044e5e024a9f8151cbe440071c5aaf9021ef6e168a1d1e3d00537d3b53ab2b2bf9168285e273965141860cb8262dd4b4248231f2387de33e6df1b0b4

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.13.0'
+class Pagy ; VERSION = '0.13.1'
 
   class OutOfRangeError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/extras/out_of_range.rb

@@ -4,26 +4,42 @@ class Pagy
 
   def out_of_range?; @out_of_range end
 
-  alias :create :initialize
-
-  def initialize(vars)
-    create(vars)
-  rescue OutOfRangeError => e
-    raise e if @vars[:out_of_range_mode] == :exception
-    @out_of_range = true
-    if @vars[:out_of_range_mode] == :last_page
-      @page = @last                                 # set as last page
-    elsif @vars[:out_of_range_mode] == :empty_page
-      @offset = @items = @from = @to = 0            # vars relative to the actual page
-      @prev = @last                                 # the prev is the last page
-      define_singleton_method(:series) do |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
-        end
+  module OutOfRange
+
+    def initialize(vars)
+      super
+    rescue OutOfRangeError
+      @out_of_range = true                        # add the out_of_range flag
+      case @vars[:out_of_range_mode]
+      when :exception
+        raise                                     # same as without the extra
+      when :last_page
+        initial_page = @vars[:page]               # save the very initial page (even after re-run)
+        super(vars.merge!(page: @last))           # re-run with the last page
+        @vars[:page] = initial_page               # restore the inital page
+      when :empty_page
+        @offset = @items = @from = @to = 0        # vars relative to the actual page
+        @prev = @last                             # prev relative to the actual page
+        extend(Series)                            # special series for :empty_page
+      else
+        raise ArgumentError, "expected :out_of_range_mode variable in [:last_page, :empty_page, :exception]; got #{@vars[:out_of_range_mode].inspect}"
       end
     end
+
   end
 
+  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
+      end
+    end
+
+  end
+
+  prepend OutOfRange
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,