kaminari 0.9.13 → 0.10.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+== 0.10.0
+
+* Railtie initializer name is "kaminari" from now
+* Changed bundler settings to work both on 1.9.2 and 1.8.7 #12 [l15n]
+* Fixed bugs encountered when running specs on Ruby 1.9.2 #12 [l15n]
+* Clean up documentation (formatting and editing) #12 [l15n]
+* Use Proc.new instead of lambda for scoped_options #13 [l15n]
+* Use AS hooks for loading AR #14 [hasimo]
+* Refactor scope definition with Concerns #15 [l15n]
+* Ensure output_buffer is always initialized #11 [kichiro]
+
 == 0.9.13
 
 * Added Mongoid support #5 [juno, hibariya]

data/Gemfile

@@ -19,7 +19,12 @@ group :development do
   gem 'arel', :git => 'git://github.com/rails/arel.git'
   gem 'rspec-rails', '>= 2.5.0'
   gem 'sqlite3', '>= 1.3.3'
-  gem 'ruby-debug'
   gem 'mongoid', '2.0.0.rc.7'
   gem 'bson_ext', '~> 1.2'
+#   platforms :mri_18 do
+#     gem 'ruby-debug'
+#   end
+#   platforms :mri_19 do
+#     gem 'ruby-debug19'
+#   end
 end

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 829de9d98e59f9b083ed96a9031cd9841c83ae47
+  revision: 289cc15f1a89a179116f67e5f666f4ff6d645f03
   specs:
     actionmailer (3.1.0.beta)
       actionpack (= 3.1.0.beta)
@@ -73,10 +73,9 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    celerity (0.8.7)
+    celerity (0.8.8)
     childprocess (0.1.7)
       ffi (~> 0.6.3)
-    columnize (0.3.2)
     culerity (0.2.15)
     diff-lcs (1.1.2)
     erubis (2.6.6)
@@ -89,9 +88,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-      ruby-debug
     json_pure (1.5.1)
-    linecache (0.43)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -129,13 +126,8 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.5.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
+    selenium-webdriver (0.1.3)
       childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
@@ -167,6 +159,5 @@ DEPENDENCIES
   rr (>= 1.0.2)
   rspec (>= 2.5.0)
   rspec-rails (>= 2.5.0)
-  ruby-debug
   sqlite3 (>= 1.3.3)
   steak (>= 1.1.0)

data/README.rdoc

@@ -1,35 +1,35 @@
 = Kaminari
 
-A Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3
+A Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3
 
 
 == Features
 
-* Clean
-Does not globally pollute Array, Hash, Object or AR::Base.
+=== Clean
+Does not globally pollute +Array+, +Hash+, +Object+ or <tt>AR::Base</tt>.
 
-* Easy to use
-Just bundle the gem, then your models are ready to be paginated. No configuration. Don't have to define anything in your models or helpers.
+=== Easy to use
+Just bundle the gem, then your models are ready to be paginated. No configuration required. Don't have to define anything in your models or helpers.
 
-* Scope based simple API
+=== Simple scope-based API
 Everything is method chainable with less "Hasheritis". You know, that's the Rails 3 way.
-No special collection class or something for the paginated values but uses a general AR::Relation instance. So, of course you can chain any other conditions before or after the paginator scope.
+No special collection class or anything for the paginated values, instead using a general <tt>AR::Relation</tt> instance. So, of course you can chain any other conditions before or after the paginator scope.
 
-* Engine based I18n aware customizable helper
-As the whole pagination helper is basically just a collection of links and non-links, Kaminari renders each of them through its own partial template inside the Engine. So, you can easily modify their behaviour or style or whatever by overriding partial templates.
+=== Customizable engine-based I18n-aware helper
+As the whole pagination helper is basically just a collection of links and non-links, Kaminari renders each of them through its own partial template inside the Engine. So, you can easily modify their behaviour, style or whatever by overriding partial templates.
 
-* ORM, template engine agnostic
+=== ORM & template engine agnostic
 Kaminari supports multiple ORMs (ActiveRecord, Mongoid) and multiple template engines (ERB, Haml).
 
-* Modern
-The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper supports the Rails 3 unobtrusive Ajax.
+=== Modern
+The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper supports Rails 3 unobtrusive Ajax.
 
 
 == Supported versions
 
-* Ruby 1.8.7 and 1.9.2 and 1.9.3
+* Ruby 1.8.7, 1.9.2, 1.9.3
 
-* Rails 3.0.x and 3.1
+* Rails 3.0.x, 3.1
 
 * Haml 3
 
@@ -43,68 +43,77 @@ Put this line in your Gemfile:
 Then bundle:
   % bundle
 
-
 == Usage
 
 === Query Basics
 
-* the :page scope
-To fetch the 7th page of the users (per_page = 25 by default)
-  User.page(7)
+* the +:page+ scope
+
+  To fetch the 7th page of users (default +per_page+ is 25)
+    User.page(7)
+
+* the +:per+ scope
+
+  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.
 
-* the :per scope
-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
 
-=== Configuring default per_page value for each model
+* +paginates_per+
 
-* paginates_per
-You can specify default per_page value per each model using the following declarative DSL.
-  class User < ActiveRecord::Base
-    paginates_per 50
-  end
+  You can specify default +per_page+ value per each model using the following declarative DSL.
+    class User < ActiveRecord::Base
+      paginates_per 50
+    end
 
 === Controllers
 
-* the page parameter is in params[:page]
-Typically, your controller code will look like this:
-  @users = User.order(:name).page params[:page]
+* the page parameter is in <tt>params[:page]</tt>
+
+  Typically, your controller code will look like this:
+    @users = User.order(:name).page params[:page]
 
 === Views
 
 * the same old helper method
-Just call the "paginate" helper:
-  <%= paginate @users %>
 
-This will render several "?page=N" pagination links surrounded by an HTML5 <nav> tag.
+  Just call the +paginate+ helper:
+    <%= paginate @users %>
+
+  This will render several <tt>?page=N</tt> pagination links surrounded by an HTML5 <+nav+> tag.
 
 === Helper Options
 
 * specifing the "inner window" size (4 by default)
-This would output something like ... 5 6 7 8 9 ... when 7 is the current page.
-  <%= paginate @users, :window => 2 %>
+
+  This would output something like <tt>... 5 6 7 8 9 ...</tt> when 7 is the current page.
+    <%= paginate @users, :window => 2 %>
 
 * specifing the "outer window" size (1 by default)
-This would output something like 1 2 3 4 ...(snip)... 17 18 19 20 while having 20 pages in total.
-  <%= paginate @users, :outer_window => 3 %>
 
-* outer window can be separetely specified by "left", "right" (1 by default)
-This would output something like 1 ...(snip)... 18 19 20 while having 20 pages in total.
-  <%= paginate @users, :left => 0, :right => 2 %>
+  This would output something like <tt>1 2 3 4 ...(snip)... 17 18 19 20</tt> while having 20 pages in total.
+    <%= paginate @users, :outer_window => 3 %>
 
-* extra parameters (:params) for the links
-This would modify each link's url_option. :controller and :action might be the keys in common.
-  <%= paginate @users, :params => {:controller => 'foo', :action => 'bar'}
+* outer window can be separetely specified by +left+ +right+ (1 by default)
+
+  This would output something like <tt>1 ...(snip)... 18 19 20</tt> while having 20 pages in total.
+    <%= paginate @users, :left => 0, :right => 2 %>
+
+* extra parameters (+:params+) for the links
+
+  This would modify each link's +url_option+. +:controller+ and +:action+ might be the keys in common.
+    <%= paginate @users, :params => {:controller => 'foo', :action => 'bar'}
 
 * Ajax links (crazy simple, but works perfectly!)
-This would add data-remote="true" to all the links inside.
-  <%= paginate @users, :remote => true %>
+
+  This would add <tt>data-remote="true"</tt> to all the links inside.
+    <%= paginate @users, :remote => true %>
 
 === I18n and labels
 
 The default labels for 'previous', '...' and 'next' are stored in the I18n yaml inside the engine, and rendered through I18n API. You can switch the label value per I18n.locale for your internationalized application.
-Keys and the default values are the following. You can override them by adding to a YAML file in your Rails.root/config/locales directory.
+Keys and the default values are the following. You can override them by adding to a YAML file in your <tt>Rails.root/config/locales</tt> directory.
 
   en:
     views:
@@ -118,22 +127,28 @@ Keys and the default values are the following. You can override them by adding t
 Kaminari includes a handy template generator.
 
 * to edit your paginator
-Run the generator first,
+
+  Run the generator first,
   % rails g kaminari:views default
 
-then edit the partials in your app's app/views/kaminari/ directory.
+  then edit the partials in your app's <tt>app/views/kaminari/</tt> directory.
 
 * for Haml users
-Haml templates generator is also available by adding "-e haml" option (this would actually be automatically invoked while the default template_engine is set to Haml).
+  Haml templates generator is also available by adding the <tt>-e haml</tt> option (this is automatically invoked when the default template_engine is set to Haml).
 
   % rails g kaminari:views default -e haml
 
 * themes
-The generator has the ability to fetch several sample template themes from the external repository (https://github.com/amatsuda/kaminari_themes) in addition to the bundled "default" one, which will help you creating a nice looking paginator.
-  % rails g kaminari:views THEME
 
-To see the full list of avaliable themes, take a look at the themes repository, or just hit the generator without specifying THEME argument.
-  % rails g kaminari:views
+  The generator has the ability to fetch several sample template themes from
+  the external repository (https://github.com/amatsuda/kaminari_themes) in 
+  addition to the bundled "default" one, which will help you creating a nice
+  looking paginator.
+    % rails g kaminari:views THEME
+
+  To see the full list of avaliable themes, take a look at the themes repository,
+  or just hit the generator without specifying +THEME+ argument.
+    % rails g kaminari:views
 
 
 == For more information
@@ -141,7 +156,7 @@ To see the full list of avaliable themes, take a look at the themes repository,
 Check out Kaminari recipes on the GitHub Wiki for more advanced tips and techniques.
 https://github.com/amatsuda/kaminari/wiki/Kaminari-recipes
 
-== Questions, Feedbacks
+== Questions, Feedback
 
 Feel free to message me on Github (amatsuda) or Twitter (@a_matsuda)  ☇☇☇  :)
 

data/Rakefile

@@ -17,7 +17,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "kaminari"
   gem.homepage = "http://github.com/amatsuda/kaminari"
   gem.license = "MIT"
-  gem.summary = 'A pagnation engine plugin for Rails 3'
+  gem.summary = 'A pagination engine plugin for Rails 3'
   gem.description = 'Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3'
   gem.email = "ronnie@dio.jp"
   gem.authors = ["Akira Matsuda"]
@@ -51,6 +51,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task :test do 
-	Rake::Task[:spec].invoke 
-end
+task :test do
+	Rake::Task[:spec].invoke
+end

data/VERSION

@@ -1 +1 @@
-0.9.13
+0.10.0

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.9.13"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-18}
+  s.date = %q{2011-02-21}
   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 = [
@@ -51,12 +51,17 @@ Gem::Specification.new do |s|
     "kaminari.gemspec",
     "lib/generators/kaminari/views_generator.rb",
     "lib/kaminari.rb",
-    "lib/kaminari/active_record_extension.rb",
     "lib/kaminari/engine.rb",
-    "lib/kaminari/helpers.rb",
-    "lib/kaminari/mongoid_extension.rb",
+    "lib/kaminari/helpers/action_view_extension.rb",
+    "lib/kaminari/helpers/helpers.rb",
+    "lib/kaminari/helpers/tags.rb",
+    "lib/kaminari/models/active_record_extension.rb",
+    "lib/kaminari/models/active_record_relation_methods.rb",
+    "lib/kaminari/models/configuration_methods.rb",
+    "lib/kaminari/models/mongoid_criteria_methods.rb",
+    "lib/kaminari/models/mongoid_extension.rb",
+    "lib/kaminari/models/page_scope_methods.rb",
     "lib/kaminari/railtie.rb",
-    "lib/kaminari/tags.rb",
     "spec/acceptance/acceptance_helper.rb",
     "spec/acceptance/support/helpers.rb",
     "spec/acceptance/support/paths.rb",
@@ -74,7 +79,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
-  s.summary = %q{A pagnation engine plugin for Rails 3}
+  s.summary = %q{A pagination engine plugin for Rails 3}
   s.test_files = [
     "spec/acceptance/acceptance_helper.rb",
     "spec/acceptance/support/helpers.rb",
@@ -106,7 +111,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<arel>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.5.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
       s.add_development_dependency(%q<bson_ext>, ["~> 1.2"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
@@ -123,7 +127,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<arel>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 2.5.0"])
       s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
       s.add_dependency(%q<bson_ext>, ["~> 1.2"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -141,7 +144,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<arel>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 2.5.0"])
     s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
     s.add_dependency(%q<bson_ext>, ["~> 1.2"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])

data/lib/kaminari/helpers/action_view_extension.rb

@@ -0,0 +1,24 @@
+module Kaminari
+  module ActionViewExtension
+    extend ActiveSupport::Concern
+    module InstanceMethods
+      # = Helpers
+      #
+      # A helper that renders the pagination links.
+      #
+      #   <%= paginate @articles %>
+      #
+      # ==== Options
+      # * <tt>:window</tt> - The "inner window" size (2 by default).
+      # * <tt>:outer_window</tt> - The "outer window" size (1 by default).
+      # * <tt>:left</tt> - The "left outer window" size (1 by default).
+      # * <tt>:right</tt> - The "right outer window" size (1 by default).
+      # * <tt>:params</tt> - url_for parameters for the links (:controller, :action, etc.)
+      # * <tt>:remote</tt> - Ajax? (false by default)
+      # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
+      def paginate(scope, options = {}, &block)
+        Kaminari::Helpers::PaginationRenderer.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :remote => false)
+      end
+    end
+  end
+end

data/lib/kaminari/{helpers.rb → helpers/helpers.rb}

@@ -75,23 +75,5 @@ module Kaminari
         end
       end
     end
-
-    # = Helpers
-    #
-    # A helper that renders the pagination links.
-    #
-    #   <%= paginate @articles %>
-    #
-    # ==== Options
-    # * <tt>:window</tt> - The "inner window" size (2 by default).
-    # * <tt>:outer_window</tt> - The "outer window" size (1 by default).
-    # * <tt>:left</tt> - The "left outer window" size (1 by default).
-    # * <tt>:right</tt> - The "right outer window" size (1 by default).
-    # * <tt>:params</tt> - url_for parameters for the links (:controller, :action, etc.)
-    # * <tt>:remote</tt> - Ajax? (false by default)
-    # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
-    def paginate(scope, options = {}, &block)
-      PaginationRenderer.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :remote => false)
-    end
   end
 end

data/lib/kaminari/{tags.rb → helpers/tags.rb}

@@ -73,7 +73,7 @@ module Kaminari
       def initialize(template, window_options) #:nodoc:
         @template, @options = template, window_options.reverse_merge(template.options)
         # so that this instance can actually "render". Black magic?
-        @output_buffer = @template.output_buffer
+        @output_buffer = @template.output_buffer || ActionView::OutputBuffer.new
       end
 
       # render given block as a view template
@@ -174,6 +174,7 @@ module Kaminari
     module Link
       include Renderable
       include Page
+      # the link's href
       def url
         page_url_for page
       end

data/lib/kaminari/models/active_record_extension.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), 'active_record_relation_methods')
+module Kaminari
+  module ActiveRecordExtension
+    extend ActiveSupport::Concern
+    included do
+      def self.inherited(kls) #:nodoc:
+        # TERRIBLE HORRIBLE NO GOOD VERY BAD HACK: inheritable_attributes is not yet set here on AR 3.0
+        unless kls.default_scoping
+          new_inheritable_attributes = Hash[inheritable_attributes.map do |key, value|
+            [key, value.duplicable? ? value.dup : value]
+          end]
+          kls.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
+        end
+
+        kls.class_eval do
+          include Kaminari::ConfigurationMethods
+
+          # Fetch the values at the specified page number
+          #   Model.page(5)
+          scope :page, Proc.new {|num|
+            limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
+          } do
+            include Kaminari::ActiveRecordRelationMethods
+            include Kaminari::PageScopeMethods
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kaminari/models/active_record_relation_methods.rb

@@ -0,0 +1,10 @@
+module Kaminari
+  module ActiveRecordRelationMethods
+    extend ActiveSupport::Concern
+    module InstanceMethods
+      def total_count #:nodoc:
+        except(:offset, :limit).count
+      end
+    end
+  end
+end

data/lib/kaminari/models/configuration_methods.rb

@@ -0,0 +1,20 @@
+module Kaminari
+  module ConfigurationMethods
+    extend ActiveSupport::Concern
+    module ClassMethods
+      # Overrides the default per_page value per model
+      #   class Article < ActiveRecord::Base
+      #     paginates_per 10
+      #   end
+      def paginates_per(val)
+        @_default_per_page = val
+      end
+
+      # This model's default per_page value
+      # returns 25 unless explicitly overridden via <tt>paginates_per</tt>
+      def default_per_page
+        @_default_per_page || Kaminari::DEFAULT_PER_PAGE
+      end
+    end
+  end
+end

data/lib/kaminari/models/mongoid_criteria_methods.rb

@@ -0,0 +1,18 @@
+module Kaminari
+  module MongoidCriteriaMethods
+    extend ActiveSupport::Concern
+    module InstanceMethods
+      def limit_value #:nodoc:
+        options[:limit]
+      end
+
+      def offset_value #:nodoc:
+        options[:skip]
+      end
+
+      def total_count #:nodoc:
+        count
+      end
+    end
+  end
+end

data/lib/kaminari/models/mongoid_extension.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), 'mongoid_criteria_methods')
+module Kaminari
+  module MongoidExtension
+    module Criteria
+      extend ActiveSupport::Concern
+
+      included do
+        delegate :page, :per, :num_pages, :current_page, :limit_value, :offset_value, :pagination_count, :to => '@klass'
+      end
+    end
+
+    module Document
+      extend ActiveSupport::Concern
+      include Kaminari::ConfigurationMethods
+
+      included do
+        # Fetch the values at the specified page number
+        #   Model.page(5)
+        scope :page, Proc.new {|num|
+          limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
+        } do
+          include Kaminari::MongoidCriteriaMethods
+          include Kaminari::PageScopeMethods
+        end
+      end
+    end
+  end
+end

data/lib/kaminari/models/page_scope_methods.rb

@@ -0,0 +1,26 @@
+module Kaminari
+  module PageScopeMethods
+    extend ActiveSupport::Concern
+    module InstanceMethods
+      # Specify the <tt>per_page</tt> value for the preceding <tt>page</tt> scope
+      #   Model.page(3).per(10)
+      def per(num)
+        if (n = num.to_i) <= 0
+          self
+        else
+          limit(n).offset(offset_value / limit_value * n)
+        end
+      end
+
+      # Total number of pages
+      def num_pages
+        (total_count.to_f / limit_value).ceil
+      end
+
+      # Current page number
+      def current_page
+        (offset_value / limit_value) + 1
+      end
+    end
+  end
+end

data/lib/kaminari/railtie.rb

@@ -1,24 +1,28 @@
 require 'rails'
-require 'action_view'
 # ensure ORMs are loaded *before* initializing Kaminari
-begin; require 'active_record'; rescue LoadError; end
 begin; require 'mongoid'; rescue LoadError; end
 
-require File.join(File.dirname(__FILE__), 'helpers')
+require File.join(File.dirname(__FILE__), 'helpers/action_view_extension')
+require File.join(File.dirname(__FILE__), 'helpers/helpers')
+require File.join(File.dirname(__FILE__), 'models/page_scope_methods')
+require File.join(File.dirname(__FILE__), 'models/configuration_methods')
 
 module Kaminari
+  DEFAULT_PER_PAGE = 25 unless defined? ::Kaminari::DEFAULT_PER_PAGE
   class Railtie < ::Rails::Railtie #:nodoc:
-    initializer 'paginatablize' do |app|
-      if defined? ::ActiveRecord
-        require File.join(File.dirname(__FILE__), 'active_record_extension')
+    initializer 'kaminari' do |app|
+      ActiveSupport.on_load(:active_record) do
+        require File.join(File.dirname(__FILE__), 'models/active_record_extension')
         ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
       end
       if defined? ::Mongoid
-        require File.join(File.dirname(__FILE__), 'mongoid_extension')
+        require File.join(File.dirname(__FILE__), 'models/mongoid_extension')
         ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
         ::Mongoid::Criteria.send :include, Kaminari::MongoidExtension::Criteria
       end
-      ::ActionView::Base.send :include, Kaminari::Helpers
+      ActiveSupport.on_load(:action_view) do
+        ::ActionView::Base.send :include, Kaminari::ActionViewExtension
+      end
     end
   end
 end

data/spec/acceptance/users_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
 
 feature 'Users' do

data/spec/models/default_per_page_spec.rb

@@ -1,6 +1,11 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe 'default per_page' do
+  describe 'AR::Base' do
+    subject { ActiveRecord::Base }
+    it { should_not respond_to :paginates_per }
+  end
+
   subject { User.page 0 }
 
   context 'by default' do

data/spec/models/mongoid_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 require 'mongoid'
-require File.expand_path('../../lib/kaminari/mongoid_extension', File.dirname(__FILE__))
+require File.expand_path('../../lib/kaminari/models/mongoid_extension', File.dirname(__FILE__))
 
 describe Kaminari::MongoidExtension do
   before :all do

data/spec/spec_helper.rb

@@ -3,7 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'mongoid'
 require 'kaminari'
-
+# Ensure we use 'syck' instead of 'psych' in 1.9.2
+# RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
+# Psych does not yet support YAML 1.1 merge keys.
+# Merge keys is often used in mongoid.yml
+# See: http://redmine.ruby-lang.org/issues/show/4300
+if RUBY_VERSION >= '1.9.2'
+  YAML::ENGINE.yamler = 'syck'
+end
 require File.join(File.dirname(__FILE__), 'fake_app')
 
 require 'rspec/rails'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 13
-  version: 0.9.13
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +09:00
+date: 2011-02-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -203,23 +203,9 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id012
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -234,10 +220,10 @@ dependencies:
         version: 2.0.0.rc.7
   prerelease: false
   type: :development
-  requirement: *id014
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -249,10 +235,10 @@ dependencies:
         version: "1.2"
   prerelease: false
   type: :development
-  requirement: *id015
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   name: rails
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -265,7 +251,7 @@ dependencies:
         version: 3.0.0
   prerelease: false
   type: :runtime
-  requirement: *id016
+  requirement: *id015
 description: Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3
 email: ronnie@dio.jp
 executables: []
@@ -310,12 +296,17 @@ files:
 - kaminari.gemspec
 - lib/generators/kaminari/views_generator.rb
 - lib/kaminari.rb
-- lib/kaminari/active_record_extension.rb
 - lib/kaminari/engine.rb
-- lib/kaminari/helpers.rb
-- lib/kaminari/mongoid_extension.rb
+- lib/kaminari/helpers/action_view_extension.rb
+- lib/kaminari/helpers/helpers.rb
+- lib/kaminari/helpers/tags.rb
+- lib/kaminari/models/active_record_extension.rb
+- lib/kaminari/models/active_record_relation_methods.rb
+- lib/kaminari/models/configuration_methods.rb
+- lib/kaminari/models/mongoid_criteria_methods.rb
+- lib/kaminari/models/mongoid_extension.rb
+- lib/kaminari/models/page_scope_methods.rb
 - lib/kaminari/railtie.rb
-- lib/kaminari/tags.rb
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/support/helpers.rb
 - spec/acceptance/support/paths.rb
@@ -361,7 +352,7 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A pagnation engine plugin for Rails 3
+summary: A pagination engine plugin for Rails 3
 test_files: 
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/support/helpers.rb

data/lib/kaminari/active_record_extension.rb

@@ -1,61 +0,0 @@
-module Kaminari
-  DEFAULT_PER_PAGE = 25 unless defined? ::Kaminari::DEFAULT_PER_PAGE
-
-  module ActiveRecordExtension
-    extend ActiveSupport::Concern
-
-    included do
-      def self.inherited(kls) #:nodoc:
-        # TERRIBLE HORRIBLE NO GOOD VERY BAD HACK: inheritable_attributes is not yet set here on AR 3.0
-        unless kls.default_scoping
-          new_inheritable_attributes = Hash[inheritable_attributes.map do |key, value|
-            [key, value.duplicable? ? value.dup : value]
-          end]
-          kls.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
-        end
-
-        kls.class_eval do
-          # Fetch the values at the specified page number
-          #   Model.page(5)
-          scope :page, lambda {|num|
-            limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
-          } do
-            # Specify the <tt>per_page</tt> value for the preceding <tt>page</tt> scope
-            #   Model.page(3).per(10)
-            def per(num)
-              if (n = num.to_i) <= 0
-                self
-              else
-                limit(n).offset(offset_value / limit_value * n)
-              end
-            end
-
-            # Total number of pages
-            def num_pages
-              (except(:offset, :limit).count.to_f / limit_value).ceil
-            end
-
-            # Current page number
-            def current_page
-              (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
-
-          # This model's default per_page value
-          # returns 25 unless explicitly overridden via <tt>paginates_per</tt>
-          def self.default_per_page
-            @_default_per_page || Kaminari::DEFAULT_PER_PAGE
-          end
-        end
-      end
-    end
-  end
-end

data/lib/kaminari/mongoid_extension.rb

@@ -1,63 +0,0 @@
-module Kaminari
-  DEFAULT_PER_PAGE = 25 unless defined? ::Kaminari::DEFAULT_PER_PAGE
-
-  module MongoidExtension
-    module Criteria
-      extend ActiveSupport::Concern
-
-      included do
-        delegate :page, :per, :num_pages, :current_page, :limit_value, :to => '@klass'
-      end
-    end
-
-    module Document
-      extend ActiveSupport::Concern
-
-      included do
-        # Fetch the values at the specified page number
-        #   Model.page(5)
-        scope :page, lambda {|num|
-          limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
-        } do
-          # Specify the <tt>per_page</tt> value for the preceding <tt>page</tt> scope
-          #   Model.page(3).per(10)
-          def per(num)
-            if (n = num.to_i) <= 0
-              self
-            else
-              limit(n).offset(options[:skip] / options[:limit] * n)
-            end
-          end
-
-          # Total number of pages
-          def num_pages
-            (count.to_f / options[:limit]).ceil
-          end
-
-          # Current page number
-          def current_page
-            (options[:skip] / options[:limit]) + 1
-          end
-
-          def limit_value
-            options[:limit]
-          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
-
-        # This model's default per_page value
-        # returns 25 unless explicitly overridden via <tt>paginates_per</tt>
-        def self.default_per_page
-          @_default_per_page || Kaminari::DEFAULT_PER_PAGE
-        end
-      end
-    end
-  end
-end