fish0 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ad008f501706091d3cf602b636333982e72320
-  data.tar.gz: 148e3cd7a84c008d4e5e2a6a494457c95906e030
+  metadata.gz: 048704aaeb4383c08255111e8b66d8273daea0c7
+  data.tar.gz: 4a74e88910112b37d4f17f8f8750fbf8a006e1b4
 SHA512:
-  metadata.gz: b44448b52d5423bfa0f965a5fb6f35e97c9e4b0776a36ff1ea4043bc87a316d9de709237e07306fb8c2f4f3b562b4acadd528fa2f1e75095816326ec30ffba72
-  data.tar.gz: e0a8e3441868b6c7f81bcb2e2e49ecc6cab33829b618cef0e0cfcd4a5e46a5a42d0d3ff1d9901944a3bd0489b0e0d8e98537e0103a83f9db175fae525f9e2865
+  metadata.gz: eeb878243f1e950b2b90f21e188aeb25156412504863964732bd54eb23785520c0543fd564110158ef3fb03bd364664e0b36c79169e5cf59e1805a616a17811c
+  data.tar.gz: ce76dc82914d6dbec6d6021a762e1c9ca6385da183d3f6d49bf4e621a71a02603105f8852dafc2a9294ddee61223c57537c48a2278759efe9d3af135ea057273

data/lib/fish0/paginator.rb

@@ -1,14 +1,14 @@
 module Fish0
   class Paginator
     include Enumerable
-    delegate :each, :all, :skip, :limit, :padding, to: :collection
+    delegate :each, :all, :skip, :limit, :padding, :fetch, to: :collection
 
     attr_reader :collection
 
     def initialize(collection, page_number: 1, per_page: 22, padding: 0)
       @collection = collection || (raise ArgumentError)
       @per = per_page
-      @page = page_number - 1
+      @page = page_number
       @padding = padding
       per(per_page)
       page(page_number)
@@ -16,13 +16,13 @@ module Fish0
 
     def page(value = @page)
       @page = value
-      skip(@page * @per + @padding)
+      skip((@page - 1) * @per + @padding)
       self
     end
 
     def per(value = @per)
       @per = value
-      skip(@page * @per + @padding)
+      skip((@page - 1) * @per + @padding)
       limit(@per)
       self
     end
@@ -33,5 +33,21 @@ module Fish0
       skip
       self
     end
+
+    def total
+      collection.count
+    end
+
+    def current_page
+      @page
+    end
+
+    def pages
+      (total.to_f / @per).ceil
+    end
+
+    def last_page?
+      current_page >= pages
+    end
   end
 end

data/lib/fish0/version.rb

@@ -1,3 +1,3 @@
 module Fish0
-  VERSION = '0.0.11'.freeze
+  VERSION = '0.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fish0
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Dmitry Zuev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport