kaminari 0.14.1 → 0.15.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5b6445e79b7d22acadc130f9d6d1dd502b6a669d
+  data.tar.gz: 0d095f1cd3c31d7eab8acc0a832c7c1916267d99
+SHA512:
+  metadata.gz: 69c51c0b94c98fa207bf505b96139c3b5baf79345dc49308c4a2dba12a310380d7e994507fef6919ec3e521b5ecaa6586c44abf3084a6c0bf88ce29847c5c2f2
+  data.tar.gz: cdd68849dea19237aca6fdc95c6b225592a9c6c00d3a837b41be8c947a95606854fb5790d4f26c70d09795df483783c654cb271f65f9d0a5452ff708bc58ed01

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.document

@@ -1,5 +1,2 @@
 lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt
+MIT-LICENSE

data/.gitignore

@@ -3,6 +3,7 @@
 .idea
 Gemfile.lock
 gemfiles/*.lock
+coverage/*
 pkg/*
 
 doc

data/.travis.yml

@@ -1,17 +1,35 @@
+services: mongodb
+
 script: "bundle exec rake spec"
 
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - rbx-19mode
 
 gemfile:
+  - gemfiles/active_record_30.gemfile
+  - gemfiles/active_record_31.gemfile
   - gemfiles/active_record_32.gemfile
+  - gemfiles/active_record_40.gemfile
+  - gemfiles/active_record_edge.gemfile
   - gemfiles/data_mapper_12.gemfile
   - gemfiles/mongo_mapper.gemfile
+  - gemfiles/mongoid_24.gemfile
   - gemfiles/mongoid_30.gemfile
-  - gemfiles/sinatra.gemfile
+  - gemfiles/mongoid_31.gemfile
+  - gemfiles/sinatra_13.gemfile
+  - gemfiles/sinatra_14.gemfile
 
 matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid_30.gemfile
+  allow_failures:
+    - rvm: 1.9.3
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/sinatra_13.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/sinatra_14.gemfile

data/CHANGELOG

@@ -1,3 +1,36 @@
+== 0.15.0
+
+* Allow count, total count to pass parameters to super #193 [bsimpson]
+
+* Add `max_pages` and `max_pages_per` methods to limit displayed pages per
+model or globally #301 [zpieslak]
+
+* Add support for Sinatra views overrides (add app views paths) #332 [j15e]
+
+* Fix wrong pagination when used with `padding` #359 [vladimir-vg, negipo]
+
+* check for Hash in addition to OrderedHash, which seems to break in Rails 4,
+for total_count #369 [aew]
+
+* Make `to_s` in paginator threadsafe #374 [bf4]
+
+* Fix Missing partial Error when 'paginate' called from different format
+template #381 [joker1007]
+
+* Add `PageScopeMethods#next_page`, `prev_page`, and `out_of_range?` [yuki24]
+
+* Use html_safe in view partials instead of raw fixed #73 [zzak]
+
+* Fix a bug that `PaginatableArray#total_pages` returns the wrong value #416 [yuki24]
+
+* Make `num_pages` to return the same value as `total_pages` for backward compat [yuki24, eitoball]
+
+* Change #page_entries_info to use model name #340, #348 [znz, eitoball]
+
+* Change scope to class method #433 [kolodovskyy]
+
+* Fix arity problem with Rails 4.1.0 #449 [bricker]
+
 == 0.14.1
 
 * Changed the default "truncation" String from  "..." to … #264 [pjaspers]

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kaminari.gemspec
 gemspec

data/README.rdoc

@@ -1,4 +1,4 @@
-= Kaminari
+= Kaminari {<img src="https://travis-ci.org/amatsuda/kaminari.png"/>}[http://travis-ci.org/amatsuda/kaminari] {<img src="https://codeclimate.com/github/amatsuda/kaminari.png" />}[https://codeclimate.com/github/amatsuda/kaminari]
 
 A Scope & Engine based, clean, powerful, customizable and sophisticated paginator for modern web app frameworks and ORMs
 
@@ -19,7 +19,7 @@ No special collection class or anything for the paginated values, instead using
 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
-Kaminari supports multiple ORMs (ActiveRecord, Mongoid, MongoMapper) multiple web frameworks (Rails, Sinatra), and multiple template engines (ERB, Haml).
+Kaminari supports multiple ORMs (ActiveRecord, DataMapper, Mongoid, MongoMapper) multiple web frameworks (Rails, Sinatra, Grape), and multiple template engines (ERB, Haml, Slim).
 
 === Modern
 The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper supports Rails 3 unobtrusive Ajax.
@@ -27,9 +27,9 @@ The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper s
 
 == Supported versions
 
-* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0 (trunk)
+* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1 (trunk)
 
-* Rails 3.0.x, 3.1, 3.2, 4.0 (edge)
+* Rails 3.0.x, 3.1, 3.2, 4.0, 4.1 (edge)
 
 * Haml 3+
 
@@ -63,9 +63,14 @@ Then bundle:
     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.
 
+  Keep in mind that +per+ utilizes internally +limit+ and so it will override any +limit+ that was set previously
+    User.count                  # => 1000
+    a = User.limit(5).count     # => 5
+    b = a.page(1).per(20).size  # => 20
+
 * the +padding+ scope
 
-  Occasionally you need to padding a number of records that is not a multiple of the page size.
+  Occasionally you need to pad a number of records that is not a multiple of the page size.
     User.page(7).per(50).padding(3)
   Note that the +padding+ scope also is not directly defined on the models.
 
@@ -87,7 +92,7 @@ Run the following generator command, then edit the generated file.
 
 * changing +page_method_name+
 
-  You can change the method name `page` to `bonzo` or `plant` or whatever you like, in order to play nice with existing `page` method or association or scope or any other plugin that defines `page` method on your models.
+  You can change the method name +page+ to +bonzo+ or +plant+ or whatever you like, in order to play nice with existing +page+ method or association or scope or any other plugin that defines +page+ method on your models.
 
 
 === Configuring default +per_page+ value for each model
@@ -104,7 +109,7 @@ Run the following generator command, then edit the generated file.
 * +max_paginates_per+
 
   You can specify max +per_page+ value per each model using the following declarative DSL.
-  If the variable that specified via +per+ scope is more than this variable, max +paginates_per+ is used instead of it. Default value is nil, which means you are not imposing any max +per_page+ value.
+  If the variable that specified via +per+ scope is more than this variable, +max_paginates_per+ is used instead of it. Default value is nil, which means you are not imposing any max +per_page+ value.
     class User < ActiveRecord::Base
       max_paginates_per 100
     end
@@ -132,17 +137,17 @@ Run the following generator command, then edit the generated file.
     <%= paginate @users %>
   This would output several pagination links such as <tt>« First ‹ Prev ... 2 3 4 5 6 7 8 9 10 ... Next › Last »</tt>
 
-* specifing the "inner window" size (4 by default)
+* specifying the "inner window" size (4 by default)
 
     <%= paginate @users, :window => 2 %>
   This would output something like <tt>... 5 6 7 8 9 ...</tt> when 7 is the current page.
 
-* specifing the "outer window" size (0 by default)
+* specifying the "outer window" size (0 by default)
 
     <%= paginate @users, :outer_window => 3 %>
   This would output something like <tt>1 2 3 4 ...(snip)... 17 18 19 20</tt> while having 20 pages in total.
 
-* outer window can be separetely specified by +left+, +right+ (0 by default)
+* outer window can be separately specified by +left+, +right+ (0 by default)
 
     <%= paginate @users, :left => 1, :right => 3 %>
   This would output something like <tt>1 ...(snip)... 18 19 20</tt> while having 20 pages in total.
@@ -165,7 +170,7 @@ Run the following generator command, then edit the generated file.
 * the +link_to_next_page+ and +link_to_previous_page+ helper method
 
     <%= link_to_next_page @items, 'Next Page' %>
-  This simply renders a link to the next page. This would be helpful for creating "Twitter like" pagination feature.
+  This simply renders a link to the next page. This would be helpful for creating a Twitter-like pagination feature.
 
 * the +page_entries_info+ helper method
 
@@ -206,7 +211,7 @@ Kaminari includes a handy template generator.
 * themes
 
   The generator has the ability to fetch several sample template themes from
-  the external repository (https://github.com/amatsuda/kaminari_themes) in 
+  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
@@ -223,7 +228,7 @@ Kaminari includes a handy template generator.
     % mkdir my_custom_theme
     % cp _*.html.* my_custom_theme/
 
-  Next reference that directory when calling the paginate method:
+  Next, reference that directory when calling the +paginate+ method:
 
     <%= paginate @users, :theme => 'my_custom_theme' %>
 
@@ -238,22 +243,22 @@ However, the <tt>paginate</tt> helper doesn't automatically handle your Array ob
 <tt>Kaminari::paginate_array</tt> method converts your Array object into a paginatable Array that accepts <tt>page</tt> method.
   Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
 
-You can specify the `total_count` value through options Hash. This would be helpful when handling an Array-ish object that has a different `count` value from actual `count` such as RSolr search result or when you need to generate a custom pagination. For example:
+You can specify the +total_count+ value through options Hash. This would be helpful when handling an Array-ish object that has a different +count+ value from actual +count+ such as RSolr search result or when you need to generate a custom pagination. For example:
   Kaminari.paginate_array([], total_count: 145).page(params[:page]).per(10)
 
 == Creating friendly URLs and caching
 
-Because of the `page` parameter and Rails 3 routing, you can easily generate SEO and user-friendly URLs. For any resource you'd like to paginate, just add the following to your `routes.rb`:
+Because of the +page+ parameter and Rails 3 routing, you can easily generate SEO and user-friendly URLs. For any resource you'd like to paginate, just add the following to your +routes.rb+:
 
     resources :my_resources do
       get 'page/:page', :action => :index, :on => :collection
     end
 
-This will create URLs like `/my_resources/page/33` instead of `/my_resources?page=33`. This is now a friendly URL, but it also has other added benefits...
+This will create URLs like <tt>/my_resources/page/33</tt> instead of <tt>/my_resources?page=33</tt>. This is now a friendly URL, but it also has other added benefits...
 
-Because the `page` parameter is now a URL segment, we can leverage on Rails page caching[http://guides.rubyonrails.org/caching_with_rails.html#page-caching]!
+Because the +page+ parameter is now a URL segment, we can leverage on Rails page caching[http://guides.rubyonrails.org/caching_with_rails.html#page-caching]!
 
-NOTE: In this example, I've pointed the route to my `:index` action. You may have defined a custom pagination action in your controller - you should point `:action => :your_custom_action` instead.
+NOTE: In this example, I've pointed the route to my <tt>:index</tt> action. You may have defined a custom pagination action in your controller - you should point <tt>:action => :your_custom_action</tt> instead.
 
 
 == Sinatra/Padrino support
@@ -277,9 +282,6 @@ Check out Kaminari recipes on the GitHub Wiki for more advanced tips and techniq
 https://github.com/amatsuda/kaminari/wiki/Kaminari-recipes
 
 
-== Build Status {<img src="https://secure.travis-ci.org/amatsuda/kaminari.png"/>}[http://travis-ci.org/amatsuda/kaminari]
-
-
 == Questions, Feedback
 
 Feel free to message me on Github (amatsuda) or Twitter (@a_matsuda)  ☇☇☇  :)
@@ -287,7 +289,23 @@ Feel free to message me on Github (amatsuda) or Twitter (@a_matsuda)  ☇☇☇
 
 == Contributing to Kaminari
 
-* Fork, fix, then send me a pull request.
+Fork, fix, then send a pull request.
+
+To run the test suite locally against all supported frameworks:
+
+  % bundle install
+  % rake spec:all
+
+To target the test suite against one framework:
+
+  % rake spec:active_record_40
+
+You can find a list of supported spec tasks by running <tt>rake -T</tt>. You may also find it useful to run a specific test
+for a specific framework. To do so, you'll have to first make sure you have bundled everything for that configuration,
+then you can run the specific test:
+
+  % BUNDLE_GEMFILE='gemfiles/active_record_40.gemfile' bundle install
+  % BUNDLE_GEMFILE='gemfiles/active_record_40.gemfile' bundle exec rspec ./spec/requests/users_spec.rb
 
 
 == Copyright

data/Rakefile

@@ -13,7 +13,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra).each do |gemfile|
+  %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_31 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -23,7 +23,7 @@ namespace :spec do
 
   desc "Run Tests against all ORMs"
   task :all do
-    %w(active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra).each do |gemfile|
+    %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_31 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end

data/app/views/kaminari/_first_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="first">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %>
 </span>

data/app/views/kaminari/_first_page.html.haml

@@ -6,4 +6,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.first
-  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
+  = link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote

data/app/views/kaminari/_first_page.html.slim

@@ -6,5 +6,5 @@
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.first
-  == link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
+  == link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote
 '

data/app/views/kaminari/_gap.html.erb

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
+<span class="page gap"><%= t('views.pagination.truncate').html_safe %></span>

data/app/views/kaminari/_gap.html.haml

@@ -5,4 +5,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.page.gap
-  = raw(t 'views.pagination.truncate')
+  = t('views.pagination.truncate').html_safe

data/app/views/kaminari/_gap.html.slim

@@ -5,5 +5,5 @@
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.page.gap
-  == raw(t 'views.pagination.truncate')
+  == t('views.pagination.truncate').html_safe
 '

data/app/views/kaminari/_last_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="last">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
 </span>

data/app/views/kaminari/_last_page.html.haml

@@ -6,4 +6,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.last
-  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
+  = link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote

data/app/views/kaminari/_last_page.html.slim

@@ -6,5 +6,5 @@
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.last
-	== link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
+	== link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote
 '

data/app/views/kaminari/_next_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="next">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %>
 </span>

data/app/views/kaminari/_next_page.html.haml

@@ -6,4 +6,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.next
-  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
+  = link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote

data/app/views/kaminari/_next_page.html.slim

@@ -6,5 +6,5 @@
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.next
-  == link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
+  == link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote
 '

data/app/views/kaminari/_prev_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="prev">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %>
 </span>

data/app/views/kaminari/_prev_page.html.haml

@@ -6,4 +6,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.prev
-  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
+  = link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote

data/app/views/kaminari/_prev_page.html.slim

@@ -6,5 +6,5 @@
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.prev
-  == link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
+  == link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote
 '

data/gemfiles/active_record_30.gemfile

@@ -1,7 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.0.13'
-gem 'activerecord', '>= 3.0.13', :require => 'active_record'
+gem 'railties', '~> 3.0.20'
+gem 'activerecord', '~> 3.0.20', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
+gem 'nokogiri', '< 1.6'
+gem 'capybara', '< 2.1'
 
 gemspec :path => '../'

data/gemfiles/active_record_31.gemfile

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.1.5'
-gem 'activerecord', '>= 3.1.5', :require => 'active_record'
+gem 'railties', '~> 3.1.12'
+gem 'activerecord', '~> 3.1.12', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
 
 gemspec :path => '../'

data/gemfiles/active_record_32.gemfile

@@ -1,7 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.2.3'
-gem 'activerecord', '>= 3.2.3', :require => 'active_record'
+gem 'railties', '~> 3.2.3'
+gem 'activerecord', '~> 3.2.3', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
 
 gemspec :path => '../'

data/gemfiles/active_record_40.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'railties', '>= 4.0.0'
+gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+gem 'rspec-rails', '>= 2.0'
+
+gemspec :path => '../'

data/gemfiles/active_record_edge.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+git 'git://github.com/rails/rails.git' do
+  gem 'railties'
+  gem 'activerecord', :require => 'active_record'
+  gem 'actionview', :require => 'action_view'
+end
+
+gem 'rspec-rails', '>= 2.0'
+
+gemspec :path => '../'

data/gemfiles/data_mapper_12.gemfile

@@ -1,12 +1,15 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
-gem 'dm-core', '>= 1.2.0'
-gem 'dm-migrations', '>= 1.2.0'
-gem 'dm-aggregates', '>= 1.2.0'
-gem 'dm-transactions', '>= 1.2.0'
-gem 'dm-active_model', '>= 1.2.0'
-gem 'dm-sqlite-adapter', '>= 1.2.0'
+gem 'dm-core', '~> 1.2.0'
+gem 'dm-migrations', '~> 1.2.0'
+gem 'dm-aggregates', '~> 1.2.0'
+gem 'dm-transactions', '~> 1.2.0'
+gem 'dm-active_model', '~> 1.2.1'
+gem 'dm-sqlite-adapter', '~> 1.2.0'
 gem 'rspec-rails', '>= 2.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
 
 gemspec :path => '../'

data/gemfiles/mongo_mapper.gemfile

@@ -1,7 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
 gem 'mongo_mapper', '>= 0.11.0'
 gem 'rspec-rails', '>= 2.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
 
 gemspec :path => '../'

data/gemfiles/mongoid_24.gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
 gem 'mongoid', '~> 2.4.0'

data/gemfiles/mongoid_30.gemfile

@@ -1,7 +1,12 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
-gem 'mongoid', '>= 3.0'
+gem 'mongoid', '~> 3.0.0'
 gem 'rspec-rails', '>= 2.0'
+gem 'origin'
+gem 'moped'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
 
 gemspec :path => '../'

data/gemfiles/mongoid_31.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 3.2'
+gem 'mongoid', '~> 3.1.0'
+gem 'rspec-rails', '>= 2.0'
+gem 'origin'
+gem 'moped'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/sinatra_13.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.3', :require => 'active_record'
+gem 'railties', '~> 3.2.3'
+gem 'rspec-rails', '>= 2.0'
+gem 'sinatra', '~> 1.3.0'
+gem 'tilt', '~> 1.3.0'
+gem 'padrino-helpers', '~> 0.10.6'
+gem 'rack-test', '>= 0'
+gem 'sinatra-contrib', '~> 1.3.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
+
+gemspec :path => '../'

data/gemfiles/sinatra_14.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0', :require => 'active_record'
+gem 'railties', '~> 3.2.3'
+gem 'rspec-rails', '>= 2.0'
+gem 'sinatra', '~> 1.4.0'
+gem 'tilt', '~> 1.3.0'
+gem 'padrino-helpers', '~> 0.11.3'
+gem 'rack-test', '>= 0'
+gem 'sinatra-contrib', '~> 1.4.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
+
+gemspec :path => '../'

data/kaminari.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name        = 'kaminari'
   s.version     = Kaminari::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Akira Matsuda']
+  s.authors     = ['Akira Matsuda', 'Zachary Scott', 'Yuki Nishijima', 'Hiroshi Shibata']
   s.email       = ['ronnie@dio.jp']
   s.homepage    = 'https://github.com/amatsuda/kaminari'
-  s.summary     = 'A pagination engine plugin for Rails 3 or other modern frameworks'
-  s.description = 'Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 3'
+  s.summary     = 'A pagination engine plugin for Rails 3+ or other modern frameworks'
+  s.description = 'Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 3+'
 
   s.rubyforge_project = 'kaminari'
 
@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', ['>= 0']
   s.add_development_dependency 'rr', ['>= 0']
   s.add_development_dependency 'capybara', ['>= 1.0']
-  s.add_development_dependency 'database_cleaner', ['>= 0']
+  s.add_development_dependency 'database_cleaner', ['~> 1.2.0']
   s.add_development_dependency 'rdoc', ['>= 0']
 end

data/lib/kaminari/config.rb

@@ -24,6 +24,7 @@ module Kaminari
     config_accessor :left
     config_accessor :right
     config_accessor :page_method_name
+    config_accessor :max_pages
 
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
@@ -45,5 +46,6 @@ module Kaminari
     config.right = 0
     config.page_method_name = :page
     config.param_name = :page
+    config.max_pages = nil
   end
 end