pagy 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8d6cfce02eec245f179798d265ceecf15461806e45d254ad12fbce2472ed92
-  data.tar.gz: 11515e85f3c0281155cbaddb1b30e2849da61b7ee469eaab7e82b5809c1bc99c
+  metadata.gz: ce35faa857fbc47879ebacc7f92ca168b402944ce4403c2c18e2b2eecd0a9c57
+  data.tar.gz: 24f36562a617e7870dc5cd4217979a06faf424f6cf6731d43a2fd6dd7f5e0084
 SHA512:
-  metadata.gz: 2cc64afce98144eaa7d6e289a12b6be726c593d1f0f60f2d32b12123d64c44a51e43b2a5e48a6e33a5630a173a98dd27e27a53cda46c27da48f490ed98c51e09
-  data.tar.gz: e213157c371571deb954235a07950144c61f406b7f47c7b99f137b7951bb73f7f978c4606d6d584d7b7f41df8c0bfed95d68720e06aea97b8fb14254ccc3d908
+  metadata.gz: 2fb53ff09042a732205b3b5f262a6157a014b1ac04a69b7e8a6e5d92402468b7e5a8168a2f46f427d6ec696a283c81ad38e0a463c0124ebb4f62fe17237ce95e
+  data.tar.gz: 2490a4827a62166fbf0a710162bfd8be39aa51b62035053fb08701dd4b01dc0b55200122728588e91bc56e6eaa897290a31fa0b196040720bf0e293476ee959a

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.12.0'
+class Pagy ; VERSION = '0.13.0'
 
   class OutOfRangeError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 
@@ -22,8 +22,8 @@ class Pagy ; VERSION = '0.12.0'
       (@vars[k] && instance_variable_set(:"@#{k}", @vars[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
-    @page >= 1 && @page <= @last or raise(OutOfRangeError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}")
+    @pages = @last = [(@count.to_f / @items).ceil, 1].max                 # cardinal and ordinal meanings
+    @page <= @last or raise(OutOfRangeError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}")
     @offset = @items * (@page - 1) + @outset                              # pagination offset + outset (initial offset)
     @items  = @count - ((@pages-1) * @items) if @page == @last            # adjust items for last page
     @from   = @count == 0 ? 0 : @offset+1 - @outset                       # page begins from item

data/lib/pagy/extras/initializer_example.rb

@@ -13,6 +13,10 @@
 # See https://ddnexus.github.io/pagy/extras/bootstrap
 # require 'pagy/extras/bootstrap'
 
+# Bulma: Nav helper and templates for Bulma pagination
+# See https://ddnexus.github.io/pagy/extras/bulma
+# require 'pagy/extras/bulma'
+
 # Compact: An alternative UI that combines the pagination with the nav info in one compact element
 # See https://ddnexus.github.io/pagy/extras/compact
 # require 'pagy/extras/compact'
@@ -23,6 +27,10 @@
 # Pagy::VARS[:items_param] = :items    # default
 # Pagy::VARS[:max_items]   = 100       # default
 
+# Out Of Range: Allow for easy handling of out of range pages
+# See https://ddnexus.github.io/pagy/extras/out_of_range
+# Pagy::VARS[:out_of_range_mode] = :last_page    # default  (other options :empty_page and :exception )
+
 # Responsive: On resize, the number of page links will adapt in real-time to the available window or container width
 # See https://ddnexus.github.io/pagy/extras/responsive
 # require 'pagy/extras/responsive'

data/lib/pagy/extras/out_of_range.rb

@@ -0,0 +1,29 @@
+class Pagy
+
+  VARS[:out_of_range_mode] = :last_page
+
+  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
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-13 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,
@@ -33,6 +33,7 @@ files:
 - lib/pagy/extras/initializer_example.rb
 - lib/pagy/extras/items.rb
 - lib/pagy/extras/javascripts/pagy.js
+- lib/pagy/extras/out_of_range.rb
 - lib/pagy/extras/responsive.rb
 - lib/pagy/extras/templates/nav.html.erb
 - lib/pagy/extras/templates/nav.html.haml