pagers 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0045ecc04a429c56771d9dce706949fc3836c9b5
-  data.tar.gz: 6fdd2abf723af68ecb4f4fecb88eb8eb6c5b7945
+  metadata.gz: 60cb3aa5e6534fa01d610ee97b51a57a608fa1ea
+  data.tar.gz: 387fbe739a703c9bbace61aa93e8954b6f5f618a
 SHA512:
-  metadata.gz: 92da1eeafdfabaf9a2389e7e49941f13cbd6c53c9a83d1c2be30243a667fdd33ee865685b1f24c4717e2c990abe77a8c5b4fc002321e95d13c121e3099644680
-  data.tar.gz: 64fd9a84bbc9f6659276bb697ac70f749aafecbf768b0a1eeee73100ce1994c9e1ea34f22c7efe835e36440c655a9d533b2d282f0d64f6f293c000329f292059
+  metadata.gz: bd1833f8e500783bdf98ea79b575204cbfda882de16f8eead6aba6c7b2f15d0164a761fc59cf720af0ac4a3f3742afbf59d9be4053911146f3d0b6f237bf76dd
+  data.tar.gz: a77c456c35e087e34acfab715cded647c3feedb824dab64496cab3a66687d727edffacee513a551fd47132794fb5c09f78b71403d96fd820b81aa49dff8cf3e9

data/README.rdoc

@@ -15,7 +15,7 @@ Then bundle:
 = Usage
 
 Call the page scope:
-  @collection = Model.page(1, length: 10)
+  @collection = Model.page(1, length: 10, padding: 4)
 
 And in your views just:
   <%= paginate @collection %>

data/lib/pagers/active_record/base.rb

@@ -9,12 +9,15 @@ module Pagers
           subclass.class_eval do
             if superclass == ::ActiveRecord::Base
               scope :page, ->(number, options={}) {
-                length = options[:length] || Rails.application.config.pagers.length
-                padding = options[:padding] || Rails.application.config.pagers.padding
+                length = options[:length] || Rails.application.config.pagers[:length]
+                padding = options[:padding] || Rails.application.config.pagers[:padding]
                 current_page = [number.to_i, 1].max
-                offset_value = (length * (current_page - 1)) + (current_page == 1 ? padding : 0)
-                limit_value = length - (current_page == 1 ? padding : 0)
+                offset_value = (length * (current_page - 1)) + padding
+                limit_value = length
                 values = Module.new do
+                  define_method :padding do
+                    padding
+                  end
                   define_method :page_length do
                     length
                   end

data/lib/pagers/active_record/relation.rb

@@ -32,7 +32,7 @@ module Pagers
           r = except(:limit, :offset, :order, :reorder)
           r = r.except(:includes) unless references_eager_loaded_tables?
           r = r.count
-          r.respond_to?(:count) ? r.count : r
+          (r.respond_to?(:count) ? r.count : r) - padding
         end
       end
 

data/lib/pagers/version.rb

@@ -1,5 +1,5 @@
 module Pagers
 
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 
 end

data/test/dummy/log/development.log

@@ -1234,3 +1234,40 @@ Processing by PagesController#index as HTML
   Rendered /Users/Matt/Documents/Museways/Herramientas/Rails/pagers/app/views/pagers/_main.html.erb (0.6ms)
   Rendered pages/index.html.erb within layouts/application (2.1ms)
 Completed 200 OK in 5ms (Views: 4.8ms | ActiveRecord: 0.1ms)
+  Model Load (1.3ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (0.3ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (0.4ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.1ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.2ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+
+***** Debugger requested, but was not available (ensure the debugger gem is listed in Gemfile/installed as gem): Start server with --debugger to enable *****
+
+  Model Load (1.3ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.1ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.3ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.1ms)  SELECT  "models".* FROM "models"  LIMIT 4 OFFSET 0
+  Model Load (1.9ms)  SELECT  "models".* FROM "models"  LIMIT 20 OFFSET 0
+
+
+Started GET "/" for 127.0.0.1 at 2014-05-27 11:28:45 -0300
+  ActiveRecord::SchemaMigration Load (2.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by PagesController#index as HTML
+   (0.1ms)  SELECT COUNT(*) FROM "models"
+  Rendered /Users/Matt/Documents/Museways/Herramientas/Rails/pagers/app/views/pagers/_main.html.erb (6.3ms)
+  Rendered pages/index.html.erb within layouts/application (11.5ms)
+Completed 200 OK in 37ms (Views: 35.3ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-05-27 11:28:45 -0300
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-05-27 11:28:45 -0300
+
+
+Started GET "/?p=2" for 127.0.0.1 at 2014-05-27 11:28:47 -0300
+Processing by PagesController#index as HTML
+  Parameters: {"p"=>"2"}
+   (0.1ms)  SELECT COUNT(*) FROM "models"
+  Rendered /Users/Matt/Documents/Museways/Herramientas/Rails/pagers/app/views/pagers/_main.html.erb (1.3ms)
+  Rendered pages/index.html.erb within layouts/application (3.1ms)
+Completed 200 OK in 6ms (Views: 5.8ms | ActiveRecord: 0.1ms)