pagy 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc6e1e54d77709fa8f36306dca0b316e10e458e81f770b1655a0b9a56cca78e
-  data.tar.gz: '092a8554d16d61c661a995acb1104d271e203282316072ddac7649a11616497e'
+  metadata.gz: 5e120aa3e069608ec73236cf7814a9b1e1292afd8b20e00208cfd2412e9422f1
+  data.tar.gz: fe66d484cc2a926ee36d9b50892f92c3c0437c9fecb74dc3020dc902e2cd1618
 SHA512:
-  metadata.gz: b0e2dd58ebc6d1463567f4dff76897e823731605a517da343fa35a80b3f88c3173ab071d6f7b1bbceb870d1fc90b0ea507ac23f708d7a010e45d084d335cc3fd
-  data.tar.gz: 127a5d06d0fd5058457d43a3473d0d582f96425066f49c3d468307c50cbe847d779d53751097ff72758cacb17e59bf6cb94fee7107ee8ec70448d0166ff41473
+  metadata.gz: a519633530e20b2213c8bb8f3b90fd4ed77d64f67057eafdd22620239500de1e2417d9e6a146204b27eab199f0a7c53d58e1e177a72beb5758704b9a12c0076e
+  data.tar.gz: 5c99aed2660d0fcd7a43128d524f53655b6a35be55baaf765ba2bffbaed8f7b840e4a0a16f350ebb7a49ab80434d64362fc90b563078bcb048b39ea8095090e4

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.3.0)
+# Pagy initializer file (3.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/locales/utils/loader.rb

@@ -23,7 +23,7 @@ lambda do |i18n, *args|
     arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
     arg[:pluralize] ||= plurals[arg[:locale]]
     hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad
-    hash.key?(arg[:locale]) or raise ArgumentError, %(Pagy::I18n.load: :locale "#{arg[:locale]}" not found in :filepath "#{arg[:filepath].inspect}")
+    hash.key?(arg[:locale]) or raise VariableError, %(expected :locale "#{arg[:locale]}" not found in :filepath "#{arg[:filepath].inspect}")
     i18n[arg[:locale]] = [flatten.call(hash[arg[:locale]]), arg[:pluralize]]
   end
 end

data/lib/pagy.rb

@@ -4,9 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.3.0'
-
-  class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
+class Pagy ; VERSION = '3.3.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end
@@ -21,7 +19,7 @@ class Pagy ; VERSION = '3.3.0'
     @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })               # default vars + cleaned vars
     { count:0, items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
       (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(ArgumentError, "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
     end
     @pages = @last = [(@count.to_f / @items).ceil, 1].max                      # cardinal and ordinal meanings
     @page <= @last or raise(OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}")
@@ -36,7 +34,7 @@ class Pagy ; VERSION = '3.3.0'
   # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
   def series(size=@vars[:size])
     (series = []) and size.empty? and return series
-    4.times{|i| (size[i]>=0 rescue nil) or raise(ArgumentError, "expected 4 items >= 0 in :size; got #{size.inspect}")}
+    4.times{|i| (size[i]>=0 rescue nil) or raise(VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}")}
     [*0..size[0], *@page-size[1]..@page+size[2], *@last-size[3]+1..@last+1].sort!.each_cons(2) do |a, b|
       if    a<0 || a==b || a>@last                                        # skip out of range and duplicates
       elsif a+1 == b; series.push(a)                                      # no gap     -> no additions
@@ -51,3 +49,4 @@ end
 
 require 'pagy/backend'
 require 'pagy/frontend'
+require 'pagy/exceptions'

data/lib/pagy/countless.rb

@@ -12,7 +12,7 @@ class Pagy
       @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
       { items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
         (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(ArgumentError, "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
       end
       @offset = @items * (@page - 1) + @outset                          # pagination offset + outset (initial offset)
     end

data/lib/pagy/exceptions.rb

@@ -0,0 +1,22 @@
+class Pagy
+
+  class VariableError < ArgumentError
+    attr_reader :pagy
+
+    def initialize(pagy)
+      @pagy = pagy
+    end
+
+    def variable
+      message =~ /expected :([\w]+)/
+      $1.to_sym if $1
+    end
+
+    def value
+      pagy.vars[variable]
+    end
+  end
+
+  class OverflowError < VariableError; end
+
+end

data/lib/pagy/extras/overflow.rb

@@ -28,7 +28,7 @@ class Pagy
       @prev = @last                             # prev relative to the actual page
       extend(Series)                            # special series for :empty_page
     else
-      raise ArgumentError, "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
+      raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
     end
   end
   alias_method :initialize, :initialize_with_overflow
@@ -62,7 +62,7 @@ class Pagy
           @vars[:size] = []                         # no page in the series
           self
         else
-          raise ArgumentError, "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
+          raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
         end
       end
       alias_method :finalize, :finalize_with_overflow

data/lib/pagy/extras/shared.rb

@@ -19,7 +19,7 @@ class Pagy
   # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
   def sequels
     steps = @vars[:steps] || {0 => @vars[:size]}
-    steps.key?(0) or raise(ArgumentError, "expected :steps to define the 0 width; got #{steps.inspect}")
+    steps.key?(0) or raise(VariableError.new(self), "expected :steps to define the 0 width; got #{steps.inspect}")
     sequels = {}; steps.each {|width, size| sequels[width.to_s] = series(size)}; sequels
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-07-02 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,
@@ -46,6 +46,7 @@ files:
 - lib/pagy.rb
 - lib/pagy/backend.rb
 - lib/pagy/countless.rb
+- lib/pagy/exceptions.rb
 - lib/pagy/extras/array.rb
 - lib/pagy/extras/bootstrap.rb
 - lib/pagy/extras/bulma.rb