kaminari 0.9.5 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 0.9.6
+
+* added paginates_per method for setting default per_page value for each model
+in a declarative way
+  Example:
+  class Article < ActiveRecord::Base
+    paginates_per 10
+  end
+
 == 0.9.5
 
 * works on AR 3.0.0 and 3.0.1 now #4 [danillos]

data/README.rdoc

@@ -49,6 +49,14 @@ To show a lot more users per each page (change the per_page value)
   User.page(7).per(50)
 Note that the :per scope is not directly defined on the models but is just a method defined on the page scope. This is absolutely reasonable because you will never actually use "per_page" without specifying the "page" number.
 
+=== Configuring default per_page value for each model
+
+* paginates_per
+You can specify default per_page value per each model using the following declarative DSL.
+  class User
+    paginates_per 50
+  end
+
 === Controllers
 
 * the page parameter is in params[:page]

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-12}
   s.description = %q{Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
@@ -91,14 +91,13 @@ Gem::Specification.new do |s|
     "spec/acceptance/support/helpers.rb",
     "spec/acceptance/support/paths.rb",
     "spec/acceptance/users_spec.rb",
+    "spec/fake_app.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/helpers/tags_spec.rb",
+    "spec/models/default_per_page_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/20110128122508_create_users.rb",
-    "spec/support/fake_app.rb",
-    "spec/support/matchers.rb",
-    "spec/support/user.rb"
+    "spec/support/matchers.rb"
   ]
   s.homepage = %q{http://github.com/amatsuda/kaminari}
   s.licenses = ["MIT"]
@@ -110,14 +109,13 @@ Gem::Specification.new do |s|
     "spec/acceptance/support/helpers.rb",
     "spec/acceptance/support/paths.rb",
     "spec/acceptance/users_spec.rb",
+    "spec/fake_app.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/helpers/tags_spec.rb",
+    "spec/models/default_per_page_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/20110128122508_create_users.rb",
-    "spec/support/fake_app.rb",
-    "spec/support/matchers.rb",
-    "spec/support/user.rb"
+    "spec/support/matchers.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/kaminari/active_record.rb

@@ -1,7 +1,7 @@
 module Kaminari
   module ActiveRecord
     extend ActiveSupport::Concern
-    PER_PAGE = 25
+    DEFAULT_PER_PAGE = 25
 
     included do
       def self.inherited(kls)
@@ -12,10 +12,12 @@ module Kaminari
           end]
           kls.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
         end
+
         kls.class_eval do
           # page(5)
           scope :page, lambda {|num|
-            limit(PER_PAGE).offset(PER_PAGE * ([num.to_i, 1].max - 1))
+            per_page = @_default_per_page || Kaminari::ActiveRecord::DEFAULT_PER_PAGE
+            limit(per_page).offset(per_page * ([num.to_i, 1].max - 1))
           } do
             # page(3).per(10)
             def per(num)
@@ -30,6 +32,14 @@ module Kaminari
               (offset_value / limit_value) + 1
             end
           end
+
+          # overrides the default per_page value per model
+          #   class Article < ActiveRecord::Base
+          #     paginates_per 10
+          #   end
+          def self.paginates_per(val)
+            @_default_per_page = val
+          end
         end
       end
     end

data/spec/{support/fake_app.rb → fake_app.rb}

@@ -2,19 +2,29 @@ require 'active_record'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 
+# database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
 ActiveRecord::Base.establish_connection('test')
 
+# config
 app = Class.new(Rails::Application)
 app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
 app.config.session_store :cookie_store, :key => "_myapp_session"
 app.config.active_support.deprecation = :log
 app.initialize!
 
+# routes
 app.routes.draw do
   resources :users
 end
 
+# models
+class User < ActiveRecord::Base
+  default_scope order(:name)
+end
+class Book < ActiveRecord::Base; end
+
+# controllers
 class ApplicationController < ActionController::Base; end
 class UsersController < ApplicationController
   def index
@@ -26,4 +36,13 @@ ERB
   end
 end
 
+# helpers
 Object.const_set(:ApplicationHelper, Module.new)
+
+#migrations
+class CreateAllTables < ActiveRecord::Migration
+  def self.up
+    create_table(:users) {|t| t.string :name }
+    create_table(:books) {|t| t.string :title }
+  end
+end

data/spec/models/default_per_page_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe 'default per_page' do
+  subject { User.page 0 }
+
+  context 'by default' do
+    its(:limit_value) { should == 25 }
+  end
+
+  context 'when explicitly set via paginates_per' do
+    before { User.paginates_per 1326 }
+    its(:limit_value) { should == 1326 }
+    after { User.paginates_per nil }
+  end
+
+  describe "default per_page value's independency per model" do
+    context "when User's default per_page was changed" do
+      before { User.paginates_per 1326 }
+      subject { Book.page 0 }
+      its(:limit_value) { should == 25 }
+      after { User.paginates_per nil }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'kaminari'
 
-require File.join(File.dirname(__FILE__), 'support/fake_app')
+require File.join(File.dirname(__FILE__), 'fake_app')
 
 require 'rspec/rails'
 # Requires supporting files with custom matchers and macros, etc,
@@ -14,6 +14,6 @@ RSpec.configure do |config|
   config.mock_with :rr
   config.before :all do
 #     ActiveRecord::Base.connection.execute 'CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))' unless ActiveRecord::Base.connection.table_exists? 'users'
-    CreateUsers.up unless ActiveRecord::Base.connection.table_exists? 'users'
+    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +09:00
+date: 2011-02-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -317,14 +317,13 @@ files:
 - spec/acceptance/support/helpers.rb
 - spec/acceptance/support/paths.rb
 - spec/acceptance/users_spec.rb
+- spec/fake_app.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/tags_spec.rb
+- spec/models/default_per_page_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
-- spec/support/20110128122508_create_users.rb
-- spec/support/fake_app.rb
 - spec/support/matchers.rb
-- spec/support/user.rb
 has_rdoc: true
 homepage: http://github.com/amatsuda/kaminari
 licenses: 
@@ -364,11 +363,10 @@ test_files:
 - spec/acceptance/support/helpers.rb
 - spec/acceptance/support/paths.rb
 - spec/acceptance/users_spec.rb
+- spec/fake_app.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/tags_spec.rb
+- spec/models/default_per_page_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
-- spec/support/20110128122508_create_users.rb
-- spec/support/fake_app.rb
 - spec/support/matchers.rb
-- spec/support/user.rb

data/spec/support/20110128122508_create_users.rb

@@ -1,8 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
-      t.string :name
-      t.timestamps
-    end
-  end
-end

data/spec/support/user.rb

@@ -1,3 +0,0 @@
-class User < ActiveRecord::Base
-  default_scope order('name')
-end