pagers 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4048f8520c23f5b8199fb067f94da9323f3be53
-  data.tar.gz: c370940b4f2585dce3525d61199874494de7c860
+  metadata.gz: 724e7f6b146b6719a0b7738c3d7ec5779ea40d48
+  data.tar.gz: f2330ed5b923978d163599b69850651d6936b378
 SHA512:
-  metadata.gz: e060cb836a1ef39df1bf2d39574c40ddcd4b0f2d1140c87076f94439b0ba4807f3975db99b62d611ecc8035875cbd4d9b5b6cd62d4f2c769172448401248d274
-  data.tar.gz: b2953675abbd3bd1546719302ad978f31a0bed6f24304a7a0fdabc6870b5237d21c2351c389904f0d8966d99833b4615345afd01e8130c6f6f410f0ded950f20
+  metadata.gz: 9df59fd8f65f0da8b75620454fd6a9d8b4622879277743c674a19200a78d0f298b5349a763776124071961dc2ec0b9d1920be0ec4ebb5345cb77a92ab20c2a59
+  data.tar.gz: deb5bdeec0cd3841f9721aa2d60cff8746d6ff6f4072c1703e5fbd0011ed5ee0c8526f4bac3e6f95b16c0f355ee07a8bf13b7dfac30b7e54b48e755ccfed98f1

data/lib/generators/pagers/install_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Pagers
+  class InstallGenerator < Rails::Generators::Base
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_initializer
+      copy_file 'pagers.rb', 'config/initializers/pagers.rb'
+    end
+
+  end
+end

data/lib/generators/pagers/templates/pagers.rb

@@ -0,0 +1,2 @@
+Pagers.configure do |config|
+end

data/lib/pagers/action_view/base.rb

@@ -4,12 +4,12 @@ module Pagers
       extend ActiveSupport::Concern
 
       def page_path(page, options={})
-        parameter = options[:parameter] || Rails.application.config.pagers.parameter
-        request.path + '?' + request.query_parameters.merge(parameter => page).to_query
+        parameter = options[:parameter] || Pagers.config.parameter
+        url_for request.query_parameters.merge(parameter => page, only_path: true)
       end
 
       def paginate(collection, options={})
-        pages = options[:pages] || Rails.application.config.pagers.pages
+        pages = options[:pages] || Pagers.config.pages
         if collection.total_pages >= pages
           middle = (pages / 2).ceil
           if collection.current_page > (collection.total_pages - middle)

data/lib/pagers/active_record/base.rb

@@ -8,8 +8,8 @@ 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] || Pagers.config.length
+                padding = options[:padding] || Pagers.config.padding
                 current_page = [number.to_i, 1].max
                 offset_value = (length * (current_page - 1)) + padding
                 limit_value = length

data/lib/pagers/railtie.rb

@@ -1,12 +1,6 @@
 module Pagers
   class Railtie < Rails::Railtie
 
-    config.pagers = ActiveSupport::OrderedOptions.new
-    config.pagers.length = 20
-    config.pagers.padding = 0
-    config.pagers.parameter = :p
-    config.pagers.pages = 5
-
     initializer 'pagers' do
       ::ActiveRecord::Base.send :include, Pagers::ActiveRecord::Base
       ::ActionView::Base.send :include, Pagers::ActionView::Base

data/lib/pagers/version.rb

@@ -1,5 +1,5 @@
 module Pagers
 
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 
 end

data/lib/pagers.rb

@@ -5,4 +5,22 @@ require 'pagers/engine'
 require 'pagers/railtie'
 
 module Pagers
+  class << self
+
+    def configure
+      yield config
+    end
+
+    def config
+      @config ||= begin
+        ActiveSupport::OrderedOptions.new.tap do |config|
+          config.length = 20
+          config.padding = 0
+          config.parameter = :page
+          config.pages = 5
+        end
+      end
+    end
+
+  end
 end

data/test/dummy/app/controllers/pages_controller.rb

@@ -1,7 +1,7 @@
 class PagesController < ApplicationController
 
   def index
-    @collection = Model.page((params[:p] || 1), length: 1)
+    @collection = Record.page((params[:page] || 1), length: 1)
   end
 
 end

data/test/dummy/app/models/record.rb

@@ -0,0 +1,2 @@
+class Record < ActiveRecord::Base
+end

data/test/dummy/config/routes.rb

@@ -1,5 +1,2 @@
 Rails.application.routes.draw do
-
-  root to: 'pages#index'
-
 end

data/test/dummy/db/migrate/{20130820024335_create_models.rb → 20130820024335_create_records.rb}

@@ -1,6 +1,6 @@
 class CreateModels < ActiveRecord::Migration
   def change
-    create_table :models do |t|
+    create_table :records do |t|
       t.string :name
 
       t.timestamps

data/test/dummy/db/schema.rb

@@ -13,7 +13,7 @@
 
 ActiveRecord::Schema.define(version: 20130820024335) do
 
-  create_table "models", force: true do |t|
+  create_table "records", force: true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"

data/test/dummy/log/development.log

@@ -1271,3 +1271,27 @@ Processing by PagesController#index as HTML
   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)
+
+
+Started GET "/" for 127.0.0.1 at 2014-09-16 17:38:59 -0300
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by PagesController#index as HTML
+   (0.4ms)  SELECT COUNT(*) FROM "models"
+  Rendered /Users/Matt/Documents/Museways/Herramientas/Rails/pagers/app/views/pagers/_main.html.erb (9.1ms)
+  Rendered pages/index.html.erb within layouts/application (15.7ms)
+Completed 200 OK in 50ms (Views: 41.4ms | ActiveRecord: 0.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-09-16 17:38:59 -0300
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-09-16 17:38:59 -0300
+
+
+Started GET "/" for 127.0.0.1 at 2014-09-16 17:40:31 -0300
+  ActiveRecord::SchemaMigration Load (0.1ms)  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 (7.0ms)
+  Rendered pages/index.html.erb within layouts/application (12.5ms)
+Completed 200 OK in 35ms (Views: 33.3ms | ActiveRecord: 0.4ms)