pagy 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a38bfeb3b81ab4359c9205b9eccd3af61b7413e6b2daa6aff42bd5ad0e13532
-  data.tar.gz: d9cd8d3eccf9880895ed9293895a2eff313a8ae996f21f01781e7a718788aca5
+  metadata.gz: 4eb355e2e788692b281d40f9ef2d101eef85485ca76793194d53cd5f5a5b2d18
+  data.tar.gz: 6b3090fa7074a6b3ad109c6cf2d1bf7e92ab168818dc68aeb2dd08a5dbaf8f2e
 SHA512:
-  metadata.gz: 8617020e93c6128ebb3ca5e9c4fd4a02540220c71addd1f257f39e48c486780e9f245a4b29c2b059c055ddc07207feb42be02ddf73ea1d33a11ac877909ef20b
-  data.tar.gz: 7c69e723095bbea0c267c82cc6efa5c1dc11763668a8929f754fe6cf3b8b3e1265d2058d433b20776b7b78aef1dd32b1e29c9ab348607f23c4dd5cec752779f8
+  metadata.gz: c114e92d07dac9f3a47efc6c754d8b3ca8f7dfde8e46f7c04bbb35dd76e99879e52cf565d889645b841d363380db3c7c2bd15a571aaabc65675af1bb0ab738a6
+  data.tar.gz: 8ab8eac80d11c27af0b69d7fa32be4d3e8968981b993b19c3cfd2048ca9ce2632c640c366f25a8f40d377311ab07cee1293b6fcf1d0436a1ff0e3aa764f35521

data/lib/pagy.rb

@@ -2,7 +2,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.7.0'
+class Pagy ; VERSION = '0.7.1'
 
   autoload :Backend,  'pagy/backend'
   autoload :Frontend, 'pagy/frontend'
@@ -22,15 +22,15 @@ class Pagy ; VERSION = '0.7.0'
 
   # merge and validate the options, do some simple aritmetic and set the instance variables
   def initialize(vars)
-    @vars = VARS.merge(vars.delete_if{|k,v| v.nil? or v == '' })          # default vars + cleaned instance vars
+    @vars = VARS.merge(vars.delete_if{|k,v| v.nil? || v == '' })          # default vars + cleaned instance vars
     { count:0, items:1, outset:0, page:1 }.each do |k,min|                # validate core variables
-      (@vars[k] && @vars[k].to_i >= min) or raise(ArgumentError, "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
-      instance_variable_set(:"@#{k}", @vars.delete(k).to_i)               # set instance 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
-    (1..@last).cover?(@page) || raise(OutOfRangeError, "expected :page in 1..#{@last}; got #{@page.inspect}")
+    @page >= 1 && @page <= @last or raise(OutOfRangeError, "expected :page in 1..#{@last}; got #{@page.inspect}")
     @offset = @items * (@page - 1) + @outset                              # pagination offset + outset (initial offset)
-    @items  = @count % @items if @page == @last                           # adjust items for last page
+    @items  = @count - ((@pages-1) * @items) if @page == @last            # adjust items for last page
     @from   = @count == 0 ? 0 : @offset+1 - @outset                       # page begins from item
     @to     = @offset + @items - @outset                                  # page ends to item
     @prev   = (@page-1 unless @page == 1)                                 # nil if no prev page
@@ -39,7 +39,7 @@ class Pagy ; VERSION = '0.7.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])
-    (0..3).each{|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(ArgumentError, "expected 4 items >= 0 in :size; got #{size.inspect}")}
     series = []
     [*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

data/lib/pagy/backend.rb

@@ -1,6 +1,12 @@
 # See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/api/backend
 
 class Pagy
+  # Defines a few generic methods to paginate a ORM collection out of the box,
+  # or any collection by overriding pagy_get_items in your controller
+
+  # See also the pagy-extras gem if you need specialized methods to paginate
+  # Arrays, ORM, and other TBD collections
+
   module Backend ; private         # the whole module is private so no problem with including it in a controller
 
     # return pagy object and items

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler