kaminari 0.14.1 → 0.17.0

data/gemfiles/active_record_30.gemfile

@@ -1,7 +1,28 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.0.13'
-gem 'activerecord', '>= 3.0.13', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'railties', '~> 3.0.20'
+gem 'activerecord', '~> 3.0.20', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'nokogiri', '< 1.6'
+gem 'capybara', '< 2.1'
+
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/active_record_31.gemfile

@@ -1,7 +1,26 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.1.5'
-gem 'activerecord', '>= 3.1.5', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'railties', '~> 3.1.12'
+gem 'activerecord', '~> 3.1.12', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/active_record_32.gemfile

@@ -1,7 +1,25 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'railties', '>= 3.2.3'
-gem 'activerecord', '>= 3.2.3', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'railties', '~> 3.2.3'
+gem 'activerecord', '~> 3.2.3', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/active_record_40.gemfile

@@ -0,0 +1,26 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0.0'
+gem 'activerecord', '~> 4.0.0', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+    gem 'test-unit'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/active_record_41.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.1.0'
+gem 'activerecord', '~> 4.1.0', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/active_record_42.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.2.0'
+gem 'activerecord', '~> 4.2.0', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/active_record_edge.gemfile

@@ -0,0 +1,30 @@
+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 'arel', :github => 'rails/arel'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gem 'rspec-rails', '2.99.0'
+
+gemspec :path => '../'

data/gemfiles/data_mapper_12.gemfile

@@ -1,12 +1,32 @@
-source :rubygems
-
-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 'rspec-rails', '>= 2.0'
+source 'https://rubygems.org'
+
+gem 'railties', '~> 3.2.21'
+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.14.1'
+
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+    gem 'test-unit'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongo_mapper.gemfile

@@ -1,7 +1,25 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
+gem 'bson', '~> 1.9.2'
 gem 'mongo_mapper', '>= 0.11.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
+
+gem 'capybara'
+gem 'nokogiri'
+gem 'rubyzip'
+
+if RUBY_VERSION == '1.9.3'
+  gem 'mime-types', '2.99'
+else
+  gem 'mime-types'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongoid_30.gemfile

@@ -1,7 +1,22 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
-gem 'mongoid', '>= 3.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'mongoid', '~> 3.0.0'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'origin'
+gem 'moped'
+gem 'activesupport', '~> 3.2.18'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongoid_31.gemfile

@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 3.2'
+gem 'mongoid', '~> 3.1.0'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'origin'
+gem 'moped'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/mongoid_40.gemfile

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0'
+gem "mongoid", "~> 4.0.0.beta2"
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/mongoid_50.gemfile

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0'
+gem 'mongoid', '~> 5.0.0'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+group :development, :test do
+  gem 'database_cleaner', '~> 1.5.1'
+end
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > '2.1.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/sinatra_13.gemfile

@@ -0,0 +1,36 @@
+source 'https://rubygems.org'
+
+gem 'sinatra', '~> 1.3.0'
+gem 'tilt'
+
+if RUBY_VERSION >= "2.2.0"
+  gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+  gem 'padrino-helpers'
+else
+  gem 'activerecord', '~> 3.2.3', :require => 'active_record'
+  gem 'padrino-helpers', '~> 0.10.6'
+end
+
+gem 'rack-test'
+gem 'sinatra-contrib'
+gem 'rspec', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/sinatra_14.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gem 'sinatra', '~> 1.4.0'
+gem 'rspec', '~> 2.14.1'
+
+gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+gem 'padrino-helpers', '~> 0.12.0'
+
+gem 'rack-test', '>= 0'
+gem 'sinatra-contrib', '~> 1.4.0'
+
+if RUBY_VERSION == '1.9.3'
+  gem 'mime-types', '2.99'
+end
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
+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', 'Yuki Nishijima', 'Zachary Scott', '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+ and 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'
 
@@ -21,16 +21,15 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'activesupport', ['>= 3.0.0']
-  s.add_dependency 'actionpack', ['>= 3.0.0']
+  s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'actionpack', '>= 3.0.0'
 
-  s.add_development_dependency 'bundler', ['>= 1.0.0']
-  s.add_development_dependency 'rake', ['>= 0']
-  s.add_development_dependency 'sqlite3', ['>= 0']
-  s.add_development_dependency 'tzinfo', ['>= 0']
-  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 'rdoc', ['>= 0']
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rake', '>= 0'
+  s.add_development_dependency 'tzinfo', '>= 0'
+  s.add_development_dependency 'rspec', '>= 0'
+  s.add_development_dependency 'rr', (RUBY_VERSION < '2' ? '< 1.2' : '>= 0')
+  s.add_development_dependency 'capybara', '>= 1.0'
+  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
+  s.add_development_dependency 'rdoc', '>= 0'
 end

data/lib/generators/kaminari/views_generator.rb

@@ -24,11 +24,12 @@ BANNER
       def copy_or_fetch #:nodoc:
         return copy_default_views if file_name == 'default'
 
-        themes = self.class.themes
-        if theme = themes.detect {|t| t.name == file_name}
-          download_templates theme
+        if theme = self.class.themes.detect {|t| t.name == file_name}
+          if download_templates(theme).empty?
+            say %Q[template_engine: #{template_engine} is not available for theme: #{file_name}]
+          end
         else
-          say %Q[no such theme: #{file_name}\n  avaliable themes: #{themes.map(&:name).join ", "}]
+          say %Q[no such theme: #{file_name}\n  avaliable themes: #{self.class.themes.map(&:name).join ", "}]
         end
       end
 
@@ -89,17 +90,17 @@ BANNER
       end
 
       def templates_for(template_engine) #:nodoc:
-        @templates.select {|t| !t.description?}.select {|t| !t.view? || (t.engine == template_engine)}
+        @templates.select {|t| t.engine == template_engine }
       end
     end
 
     module GitHubApiHelper
       def get_files_in_master
         master_tree_sha = open('https://api.github.com/repos/amatsuda/kaminari_themes/git/refs/heads/master') do |json|
-          ActiveSupport::JSON.decode(json)['object']['sha']
+          ActiveSupport::JSON.decode(json.read)['object']['sha']
         end
         open('https://api.github.com/repos/amatsuda/kaminari_themes/git/trees/' + master_tree_sha + '?recursive=1') do |json|
-          blobs = ActiveSupport::JSON.decode(json)['tree'].find_all {|i| i['type'] == 'blob' }
+          blobs = ActiveSupport::JSON.decode(json.read)['tree'].find_all {|i| i['type'] == 'blob' }
           blobs.map do |blob|
             [blob['path'], blob['sha']]
           end
@@ -109,7 +110,7 @@ BANNER
 
       def get_content_for(path)
         open('https://api.github.com/repos/amatsuda/kaminari_themes/contents/' + path) do |json|
-          Base64.decode64(ActiveSupport::JSON.decode(json)['content'])
+          Base64.decode64(ActiveSupport::JSON.decode(json.read)['content'])
         end
       end
       module_function :get_content_for

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

data/lib/kaminari/helpers/action_view_extension.rb

@@ -15,7 +15,9 @@ module Kaminari
     # * <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)
-      paginator = Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :total_pages => scope.total_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
+      options[:total_pages] ||= options[:num_pages] || scope.total_pages
+
+      paginator = Kaminari::Helpers::Paginator.new(self, options.reverse_merge(:current_page => scope.current_page, :per_page => scope.limit_value, :remote => false))
       paginator.to_s
     end
 
@@ -39,7 +41,7 @@ module Kaminari
     def link_to_previous_page(scope, name, options = {}, &block)
       params = options.delete(:params) || {}
       param_name = options.delete(:param_name) || Kaminari.config.param_name
-      link_to_unless scope.first_page?, name, params.merge(param_name => (scope.current_page - 1)), options.reverse_merge(:rel => 'previous') do
+      link_to_unless scope.first_page?, name, params.merge(param_name => scope.prev_page), options.reverse_merge(:rel => 'previous') do
         block.call if block
       end
     end
@@ -64,7 +66,7 @@ module Kaminari
     def link_to_next_page(scope, name, options = {}, &block)
       params = options.delete(:params) || {}
       param_name = options.delete(:param_name) || Kaminari.config.param_name
-      link_to_unless scope.last_page?, name, params.merge(param_name => (scope.current_page + 1)), options.reverse_merge(:rel => 'next') do
+      link_to_unless scope.last_page?, name, params.merge(param_name => scope.next_page), options.reverse_merge(:rel => 'next') do
         block.call if block
       end
     end
@@ -86,24 +88,14 @@ module Kaminari
     #   <%= page_entries_info @posts, :entry_name => 'item' %>
     #   #-> Displaying items 6 - 10 of 26 in total
     def page_entries_info(collection, options = {})
-      entry_name = if options[:entry_name]
-        options[:entry_name]
-      elsif collection.empty? || collection.is_a?(PaginatableArray)
-        'entry'
-      else
-        if collection.respond_to? :model  # DataMapper
-          collection.model.model_name.human.downcase
-        else  # AR
-          collection.model_name.human.downcase
-        end
-      end
+      entry_name = options[:entry_name] || collection.entry_name
       entry_name = entry_name.pluralize unless collection.total_count == 1
 
       if collection.total_pages < 2
         t('helpers.page_entries_info.one_page.display_entries', :entry_name => entry_name, :count => collection.total_count)
       else
         first = collection.offset_value + 1
-        last = collection.last_page? ? collection.total_count : collection.offset_value + collection.limit_value
+        last = (sum = collection.offset_value + collection.limit_value) > collection.total_count ? collection.total_count : sum
         t('helpers.page_entries_info.more_pages.display_entries', :entry_name => entry_name, :first => first, :last => last, :total => collection.total_count)
       end.html_safe
     end
@@ -131,21 +123,10 @@ module Kaminari
       param_name = options.delete(:param_name) || Kaminari.config.param_name
 
       output = ""
-
-      if !scope.first_page? && !scope.last_page?
-        # If not first and not last, then output both links.
-        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1))) + '"/>'
-        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1))) + '"/>'
-      elsif scope.first_page?
-        # If first page, add next link unless last page.
-        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1))) + '"/>' unless scope.last_page?
-      else
-        # If last page, add prev link unless first page.
-        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1))) + '"/>' unless scope.first_page?
-      end
+      output << '<link rel="next" href="' + url_for(params.merge(param_name => scope.next_page, :only_path => true)) + '"/>' if scope.next_page
+      output << '<link rel="prev" href="' + url_for(params.merge(param_name => scope.prev_page, :only_path => true)) + '"/>' if scope.prev_page
 
       output.html_safe
     end
-
   end
 end