kaminari 0.13.0 → 0.14.0

data/.gitignore

@@ -1,6 +1,8 @@
 *.gem
 .bundle
+.idea
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 
 doc

data/.travis.yml

@@ -1,6 +1,13 @@
+script: "bundle exec rake spec"
+
 rvm:
   - 1.8.7
   - 1.9.3
   - ruby-head
 
-script: bundle exec rake spec
+gemfile:
+  - gemfiles/active_record_32.gemfile
+  - gemfiles/data_mapper_12.gemfile
+  - gemfiles/mongo_mapper.gemfile
+  - gemfiles/mongoid_24.gemfile
+  - gemfiles/sinatra.gemfile

data/CHANGELOG

@@ -1,3 +1,39 @@
+== 0.14.0
+
+* Grape framework support! #218 [mrplum]
+
+* Mongoid 3 ready! #238 [shingara]
+
+* Added link_to_previous_page helper #191 [timgremore]
+
+* Added helper to generate rel="next" and rel="prev" link tags for SEO #200
+[joe1chen]
+
+* Added `max_per_page` configuration option #274 [keiko0713]
+  This would be useful for the case when you are using user input `per_page`
+  value but want to impose the upper bound.
+
+* Added I18n to page_entries_info #207 [plribeiro3000]
+
+* Changed method name "num_pages" to "total_pages"
+  num_pages" is still available as an alias of "total_pages", but will be
+  deprecated or removed in some future version.
+
+* Changed the way page_entries_info behave so it can show appropriate names
+for models with namespace #207 [plribeiro3000]
+
+* Added html_safe to page_entries_info helper #190 [lucapette]
+
+* Fixed displayed number of items on each page w/ Mongoid 2.4.x and
+MongoMapper #194 [dblock]
+
+* Removed a unused local variable from templates from default tamplate #245 [juno]
+
+* Fixed page_entry_info to use the value of `entry_name` option when given
+collection is empty or a PaginatableArray #265, #277 [eitoball]
+
+* Added require 'dm-aggregates' in DataMapper hook #259 [shingara]
+
 == 0.13.0
 
 * Rails 3.2 ready! #180 [slbug]
@@ -23,7 +59,7 @@ windows #154 [cbeer]
 * Added `link_to_next_page` helper method that simply links to the next page
   Example:
   <%= link_to_next_page @posts, 'More' %>
-	#=> <a href="/posts?page=7" rel="next">More</a>
+  #=> <a href="/posts?page=7" rel="next">More</a>
 
 * Let one override the `rel` attribute for 'link_to_next_page` helper #177
 [webmat]
@@ -33,7 +69,7 @@ RSolr #141 [samdalton]
 
 * Changed `Kaminari.paginate_array` API to take a Hash `options`
   And specifying :limit & :offset immediately builds a pagination ready object
-	Example:
+  Example:
   # the following two are equivalent. Use whichever you like
   Kaminari.paginate_array((1..100).to_a, limit: 10, offset: 10)
   Kaminari.paginate_array((1..100).to_a).page(2).per(10)
@@ -45,8 +81,8 @@ RSolr #141 [samdalton]
 * Made the pagination method name (defaulted to `page`) configurable #57, #162
   Example:
   # you can use the config file and its generator for this
-	Kaminari.config.page_method_name = :paging
-	Article.paging(3).per(30)
+  Kaminari.config.page_method_name = :paging
+  Article.paging(3).per(30)
 
 * Only add extensions to direct descendents of ActiveRecord::Base #108
 [seejohnrun]
@@ -193,10 +229,10 @@ from ActiveRecord::Base.inherited #34 [rolftimmermans]
 * Moved the whole pagination logic to the paginator partial so that users can
 touch it
   Note: You need to update your _paginator.html.* if you've already customized
-	it. If you haven't overridden _paginator.html.* files, then probably
-	there're nothing you have to do.
-	See this commit for the example:
-		https://github.com/amatsuda/kaminari_themes/commit/2dfb41c
+  it. If you haven't overridden _paginator.html.* files, then probably
+  there're nothing you have to do.
+  See this commit for the example:
+    https://github.com/amatsuda/kaminari_themes/commit/2dfb41c
 
 == 0.9.10
 
@@ -210,8 +246,8 @@ touch it
 
 * :params option for the helper [yomukaku_memo]
   You can override each link's url_for option by this option
-	Example:
-	= paginate @users, :params => {:controller => 'users', :action => 'index2'}
+  Example:
+  = paginate @users, :params => {:controller => 'users', :action => 'index2'}
 
 * refactor tags
 

data/README.rdoc

@@ -73,6 +73,7 @@ Then bundle:
 
 You can configure the following default values by overriding these values using <tt>Kaminari.configure</tt> method.
   default_per_page  # 25 by default
+  max_per_page      # nil by default
   window            # 4 by default
   outer_window      # 0 by default
   left              # 0 by default
@@ -98,6 +99,16 @@ Run the following generator command, then edit the generated file.
       paginates_per 50
     end
 
+=== Configuring max +per_page+ value for each model
+
+* +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.
+    class User < ActiveRecord::Base
+      max_paginates_per 100
+    end
+
 === Controllers
 
 * the page parameter is in <tt>params[:page]</tt>
@@ -151,7 +162,7 @@ Run the following generator command, then edit the generated file.
     <%= paginate @users, :remote => true %>
   This would add <tt>data-remote="true"</tt> to all the links inside.
 
-* the +link_to_next_page+ helper method
+* 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.
@@ -227,8 +238,8 @@ 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.
-
+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
 

data/Rakefile

@@ -5,13 +5,33 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+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|
+    desc "Run Tests against #{gemfile}"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+    end
+  end
+
+  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|
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
+    end
+  end
+end
+
+require 'rdoc/task'
 
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   require 'kaminari/version'
 

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

@@ -2,7 +2,7 @@
   - available local variables
     url:           url to the first page
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>

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

@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the first page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.first

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

@@ -2,7 +2,7 @@
   - available local variables
     url          : url to the first page
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.first

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

@@ -1,7 +1,7 @@
 <%# Non-link tag that stands for skipped pages...
   - available local variables
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>

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

@@ -1,7 +1,7 @@
 -#  Non-link tag that stands for skipped pages...
 -#  available local variables
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.page.gap

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

@@ -1,7 +1,7 @@
 / Non-link tag that stands for skipped pages...
   - available local variables
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.page.gap

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

@@ -2,7 +2,7 @@
   - available local variables
     url:           url to the last page
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>

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

@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the last page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.last

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

@@ -2,7 +2,7 @@
   - available local variables
     url          : url to the last page
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.last

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

@@ -2,7 +2,7 @@
   - available local variables
     url:           url to the next page
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>

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

@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the next page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.next

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

@@ -2,7 +2,7 @@
 	- available local variables
     url          : url to the next page
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.next

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

@@ -3,10 +3,10 @@
     page:          a page object for "this" page
     url:           url to this page
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
 <span class="page<%= ' current' if page.current? %>">
-  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <%= link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
 </span>

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

@@ -3,7 +3,7 @@
 -#    page:          a page object for "this" page
 -#    url:           url to this page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span{:class => "page#{' current' if page.current?}"}

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

@@ -3,7 +3,7 @@
     page         : a page object for "this" page
     url          : url to this page
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span class="page#{' current' if page.current?}"

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

@@ -1,7 +1,7 @@
 <%# The container tag
   - available local variables
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside

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

@@ -1,7 +1,7 @@
 -#  The container tag
 -#  available local variables
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 -#    paginator:     the paginator that renders the pagination tags inside

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

@@ -1,7 +1,7 @@
 / The container tag
   - available local variables
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
     paginator    : the paginator that renders the pagination tags inside

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

@@ -2,7 +2,7 @@
   - available local variables
     url:           url to the previous page
     current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
+    total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>

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

@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the previous page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %span.prev

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

@@ -2,7 +2,7 @@
   - available local variables
     url          : url to the previous page
     current_page : a page object for the currently displayed page
-    num_pages    : total number of pages
+    total_pages  : total number of pages
     per_page     : number of items to fetch per page
     remote       : data-remote
 span.prev

data/config/locales/kaminari.yml

@@ -8,3 +8,12 @@ en:
       previous: "‹ Prev"
       next: "Next ›"
       truncate: "..."
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "No %{entry_name} found"
+          one: "Displaying <b>1</b> %{entry_name}"
+          other: "Displaying <b>all %{count}</b> %{entry_name}"
+      more_pages:
+        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"

data/gemfiles/active_record_30.gemfile

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

data/gemfiles/active_record_31.gemfile

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

data/gemfiles/active_record_32.gemfile

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