actionpager 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392d0eef85f05593b217553a4089a99620128beee88340ffb6ce253d98d506e6
-  data.tar.gz: 55f1bf7d18e55c3527e8942c2c3394b7412c8814b993ba9d6685e74c5b50222e
+  metadata.gz: ae90863fad5a3f30f9572dee02a8fb5011b684e6b320efb7229158c70644af08
+  data.tar.gz: b7341df2d718988c8e06a8f76ba78421fabb3f305cdcc43e82a87e17b1adc2e7
 SHA512:
-  metadata.gz: 9361640ca67575e97f4b47f3c109d70030f3b9065091bf28585a59b497701ac85ce0c2b1849e462ecf28fec09f394551ac1aeef8496fe0980eaa1ba8c6de980b
-  data.tar.gz: c75cd0322148d6a4db38d30a9bd44304d34548ab5b4f7c5388f2353b8764ff93cfd9c69e2403ce8bff2f699ab8b1f7c379a7018e10725830de7b658ffa7caa91
+  metadata.gz: a298e3b66538f5872af6e7c4fe97c1f0cf8f24ca2422ce27753567368d73ad7e906535d7ef7cacd68b81923e4d18f7f06dbd932692e2db38102e6689924898a6
+  data.tar.gz: '03509d9f2a60cdd25ccfe50f9080bb56323212f0432ed805f4f4efcc4afde65ec93a54b8fdadb8485951c7ec124ef80e30cc21cda65dbba1070a62efec226ea8'

data/Gemfile.lock

@@ -0,0 +1,22 @@
+PATH
+  remote: .
+  specs:
+    actionpager (0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    minitest (5.11.3)
+    rake (10.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpager!
+  bundler (~> 1.16)
+  minitest (~> 5.0)
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.6

data/lib/action_pager/pager.rb

@@ -2,19 +2,25 @@
 
 module ActionPager
   class Pager
-    DEFAULTS = { page: 1, per: 20 }.freeze
+    DEFAULTS = { page: 1, per: 20, near: 2 }.freeze
 
-    attr_reader :current_page, :per_page, :collection, :options
+    attr_reader :current_page, :per_page, :near, :collection, :options
 
     def initialize(collection, options={})
       @options = options
       opts = DEFAULTS.merge(options)
       @current_page = opts[:page]
       @per_page = opts[:per]
+      @near = opts[:near]
       @collection = collection
     end
 
     def scoped
+      warn "[DEPRECATION] `scoped` is deprecated.  Please use `current_collection` instead."
+      current_collection
+    end
+
+    def current_collection
       if collection.is_a?(Array)
         collection.drop(offset).first(per_page)
       else # for ActiveRecord::Relation and other OR mapper collections
@@ -41,6 +47,7 @@ module ActionPager
     def last_page
       @last_page ||= collection_count / per_page + 1
     end
+    alias_method :total_pages, :last_page
 
     def last_page?
       current_page == last_page
@@ -55,5 +62,36 @@ module ActionPager
       page = current_page + 1
       page <= last_page ? page : nil
     end
+
+    def shown_page_count
+      near * 2 + 1
+    end
+
+    # pages that numbers are displayed
+    def near_pages
+      @near_pages ||= begin
+        if current_page <= near + 1
+          upper_page = shown_page_count >= last_page ? last_page : shown_page_count
+          1..upper_page
+        elsif current_page >= last_page - near - 1
+          bottom_page = last_page - shown_page_count + 1
+          (bottom_page > 1 ? bottom_page : 1)..last_page
+        else
+          bottom_page = current_page - near
+          upper_page = current_page + near
+          (bottom_page > 1 ? bottom_page : 1)..(upper_page < last_page ? upper_page : last_page)
+        end
+      end
+    end
+
+    # show bottom (left) gap mark in pager?
+    def bottom_gap?
+      near_pages.first > 1
+    end
+
+    # show upper (right) gap mark in pager?
+    def upper_gap?
+      near_pages.last < last_page
+    end
   end
 end

data/lib/action_pager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionPager
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpager
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryo Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile