lib/pagy.rb in pagy-0.8.5 vs lib/pagy.rb in pagy-0.8.6

- old
+ new

@@ -1,10 +1,10 @@ # See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy require 'pathname' -class Pagy ; VERSION = '0.8.5' +class Pagy ; VERSION = '0.8.6' class OutOfRangeError < StandardError; end # root pathname to get the path of pagy files like templates or dictionaries def self.root; Pathname.new(__FILE__).dirname end @@ -14,10 +14,10 @@ attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next # merge and validate the options, do some simple aritmetic and set the instance variables def initialize(vars) - @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' }) # default vars + cleaned instance vars + @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == ''.freeze }) # default vars + cleaned instance vars { count:0, items:1, outset:0, page:1 }.each do |k,min| # validate core variables (@vars[k] && instance_variable_set(:"@#{k}", @vars.delete(k).to_i) >= min) \ or raise(ArgumentError, "expected :#{k} >= #{min}; got #{instance_variable_get(:"@#{k}").inspect}") end @pages = @last = [(@count.to_f / @items).ceil, 1].max # cardinal and ordinal meanings