kaminari 0.15.1 → 0.16.0

data/gemfiles/sinatra_14.gemfile

@@ -1,11 +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 'rspec', '~> 2.14.1'
+
+if RUBY_VERSION <= "1.8.7"
+  gem 'padrino-helpers', '~> 0.11.0'
+else
+  gem 'padrino-helpers', '~> 0.12.0'
+end
+
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.4.0'
 
@@ -15,8 +19,12 @@ gem 'nokogiri', '< 1.6'
 gem 'capybara', '< 2.1'
 gem 'rubyzip', '< 1'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'

data/lib/generators/kaminari/views_generator.rb

@@ -96,10 +96,10 @@ BANNER
     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 +109,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/helpers/action_view_extension.rb

@@ -39,7 +39,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 +64,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,17 +86,7 @@ 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.is_a?(::Kaminari::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
@@ -131,18 +121,8 @@ 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), :only_path => true)) + '"/>'
-        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1), :only_path => true)) + '"/>'
-      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), :only_path => true)) + '"/>' 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), :only_path => true)) + '"/>' 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

data/lib/kaminari/helpers/paginator.rb

@@ -25,7 +25,8 @@ module Kaminari
           h[:right] = outer_window if h[:right] == 0
         end
         @template, @options = template, options
-        @theme = @options[:theme] ? "#{@options[:theme]}/" : ''
+        @theme = @options.delete(:theme)
+        @views_prefix = @options[:views_prefix]
         @window_options.merge! @options
         @window_options[:current_page] = @options[:current_page] = PageProxy.new(@window_options, @options[:current_page], nil)
 
@@ -49,8 +50,8 @@ module Kaminari
       def each_relevant_page
         return to_enum(:each_relevant_page) unless block_given?
 
-        relevant_pages(@window_options).each do |i|
-          yield PageProxy.new(@window_options, i, @last)
+        relevant_pages(@window_options).each do |page|
+          yield PageProxy.new(@window_options, page, @last)
         end
       end
       alias each_page each_relevant_page
@@ -106,6 +107,12 @@ module Kaminari
         end
       end
 
+      # delegates view helper methods to @template
+      def method_missing(name, *args, &block)
+        @template.respond_to?(name) ? @template.send(name, *args, &block) : super
+      end
+      private :method_missing
+
       # Wraps a "page number" and provides some utility methods
       class PageProxy
         include Comparable

data/lib/kaminari/helpers/sinatra_helpers.rb

@@ -93,6 +93,36 @@ module Kaminari::Helpers
         paginator.to_s
       end
 
+      # A simple "Twitter like" pagination link that creates a link to the previous page.
+      # Works on Sinatra.
+      #
+      # ==== Examples
+      # Basic usage:
+      #
+      #   <%= link_to_previous_page @items, 'Previous Page' %>
+      #
+      # Ajax:
+      #
+      #   <%= link_to_previous_page @items, 'Previous Page', :remote => true %>
+      #
+      # By default, it renders nothing if there are no more results on the previous page.
+      # You can customize this output by passing a parameter <tt>:placeholder</tt>.
+      #
+      #   <%= link_to_previous_page @users, 'Previous Page', :placeholder => %{<span>At the Beginning</span>} %>
+      #
+      def link_to_previous_page(scope, name, options = {})
+        params = options.delete(:params) || (Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {})
+        param_name = options.delete(:param_name) || Kaminari.config.param_name
+        placeholder = options.delete(:placeholder)
+
+        unless scope.first_page?
+          query = params.merge(param_name => scope.prev_page)
+          link_to name, env['PATH_INFO'] + (query.empty? ? '' : "?#{query.to_query}"), options.reverse_merge(:rel => 'previous')
+        else
+          placeholder.to_s.html_safe
+        end
+      end
+
       # A simple "Twitter like" pagination link that creates a link to the next page.
       # Works on Sinatra.
       #
@@ -114,11 +144,12 @@ module Kaminari::Helpers
         params = options.delete(:params) || (Rack::Utils.parse_query(env['QUERY_STRING']).symbolize_keys rescue {})
         param_name = options.delete(:param_name) || Kaminari.config.param_name
         placeholder = options.delete(:placeholder)
-        query = params.merge(param_name => (scope.current_page + 1))
+
         unless scope.last_page?
+          query = params.merge(param_name => scope.next_page)
           link_to name, env['PATH_INFO'] + (query.empty? ? '' : "?#{query.to_query}"), options.reverse_merge(:rel => 'next')
         else
-          placeholder
+          placeholder.to_s.html_safe
         end
       end
     end

data/lib/kaminari/helpers/tags.rb

@@ -16,17 +16,27 @@ module Kaminari
       def initialize(template, options = {}) #:nodoc:
         @template, @options = template, options.dup
         @param_name = @options.delete(:param_name) || Kaminari.config.param_name
-        @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : ''
+        @theme = @options.delete(:theme)
+        @views_prefix = @options[:views_prefix]
         @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
       end
 
       def to_s(locals = {}) #:nodoc:
-        @template.render :partial => "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", :locals => @options.merge(locals), :formats => [:html]
+        @template.render :partial => partial_path, :locals => @options.merge(locals), :formats => [:html]
       end
 
       def page_url_for(page)
         @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page), :only_path => true)
       end
+
+      def partial_path
+        [
+         @views_prefix,
+         "kaminari",
+         @theme,
+         self.class.name.demodulize.underscore
+        ].compact.join("/")
+      end
     end
 
     # Tag that contains a link

data/lib/kaminari/hooks.rb

@@ -18,7 +18,6 @@ module Kaminari
       begin; require 'mongoid'; rescue LoadError; end
       if defined? ::Mongoid
         require 'kaminari/models/mongoid_extension'
-        ::Mongoid::Criteria.send :include, Kaminari::MongoidExtension::Criteria
         ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
       end
 

data/lib/kaminari/models/active_record_extension.rb

@@ -8,14 +8,14 @@ module Kaminari
       class << self
         def inherited_with_kaminari(kls) #:nodoc:
           inherited_without_kaminari kls
-          kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
+          kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base
         end
         alias_method_chain :inherited, :kaminari
       end
 
       # Existing subclasses pick up the model extension as well
       self.descendants.each do |kls|
-        kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ActiveRecord::Base
+        kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base
       end
     end
   end

data/lib/kaminari/models/active_record_relation_methods.rb

@@ -8,6 +8,10 @@ module Kaminari
       end
     end
 
+    def entry_name
+      model_name.human.downcase
+    end
+
     def total_count(column_name = :all, options = {}) #:nodoc:
       # #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
       @total_count ||= begin

data/lib/kaminari/models/array_extension.rb

@@ -17,11 +17,15 @@ module Kaminari
         extend Kaminari::PageScopeMethods
       end
 
-      if options[:total_count]
-        super original_array
-      else
-        super(original_array[@_offset_value, @_limit_value] || [])
+      if @_total_count
+        original_array = original_array.first(@_total_count)
       end
+
+      super(original_array[@_offset_value, @_limit_value] || [])
+    end
+
+    def entry_name
+      "entry"
     end
 
     # items at the specified "page"

data/lib/kaminari/models/data_mapper_collection_methods.rb

@@ -1,5 +1,9 @@
 module Kaminari
   module DataMapperCollectionMethods
+    def entry_name
+      model.model_name.human.downcase
+    end
+
     def limit_value #:nodoc:
       query.options[:limit] || 0
     end

data/lib/kaminari/models/mongoid_criteria_methods.rb

@@ -1,5 +1,9 @@
 module Kaminari
   module MongoidCriteriaMethods
+    def entry_name
+      model_name.human.downcase
+    end
+
     def limit_value #:nodoc:
       options[:limit]
     end
@@ -9,7 +13,15 @@ module Kaminari
     end
 
     def total_count #:nodoc:
-      embedded? ? unpage.length : length
+      @total_count ||= if embedded?
+        unpage.count
+      else
+        if options[:max_scan] && options[:max_scan] < count
+          options[:max_scan]
+        else
+          count
+        end
+      end
     end
 
     private

data/lib/kaminari/models/mongoid_extension.rb

@@ -2,18 +2,6 @@ require 'kaminari/models/mongoid_criteria_methods'
 
 module Kaminari
   module MongoidExtension
-    module Criteria
-      extend ActiveSupport::Concern
-
-      included do
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{Kaminari.config.page_method_name}(*args)
-            super(*args).criteria.merge(self)
-          end
-        RUBY
-      end
-    end
-
     module Document
       extend ActiveSupport::Concern
       include Kaminari::ConfigurationMethods

data/lib/kaminari/models/plucky_criteria_methods.rb

@@ -4,6 +4,10 @@ module Kaminari
 
     delegate :default_per_page, :max_per_page, :max_pages, :to => :model
 
+    def entry_name
+      model.model_name.human.downcase
+    end
+
     def limit_value #:nodoc:
       options[:limit]
     end

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.15.1'
+  VERSION = '0.16.0'
 end

data/spec/fake_app/active_record/config.rb

@@ -1,3 +1,3 @@
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
+ActiveRecord::Base.establish_connection :test

data/spec/fake_app/mongoid/config.rb

@@ -3,12 +3,14 @@
 # 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
+require 'mongoid/version'
+
 if RUBY_VERSION >= '1.9.2'
   YAML::ENGINE.yamler = 'syck'
 end
 
 Mongoid.configure do |config|
-  if Mongoid::VERSION =~ /^3/
+  if Mongoid::VERSION > '3.0.0'
     config.sessions = {:default => {:hosts => ['localhost:27017'], :database => 'kaminari_test'}}
   else
     config.master = Mongo::Connection.new.db('kaminari_test')

data/spec/fake_app/mongoid/models.rb

@@ -1,5 +1,9 @@
 class User
   include ::Mongoid::Document
+  if Mongoid::VERSION > '4.0.0'
+    include Mongoid::Attributes::Dynamic
+  end
+
   field :name, :type => String
   field :age, :type => Integer
 end

data/spec/fake_app/views/alternative/kaminari/_first_page.html.erb

@@ -0,0 +1 @@
+<b><%= current_page %></b>

data/spec/fake_app/views/alternative/kaminari/_paginator.html.erb

@@ -0,0 +1,3 @@
+<%= paginator.render do -%>
+  <%= first_page_tag %>
+<% end -%>

data/spec/generators/views_generator_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+if defined?(Rails)
+  require 'rails/generators'
+  require 'generators/kaminari/views_generator'
+
+  describe Kaminari::Generators::GitHubApiHelper, :generator_spec => true do
+    describe '.get_files_in_master' do
+      subject { Kaminari::Generators::GitHubApiHelper.get_files_in_master }
+      it { should include(["README", "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"]) }
+    end
+
+    describe '.get_content_for' do
+      subject { Kaminari::Generators::GitHubApiHelper.get_content_for("README") }
+      it { should == "" }
+    end
+  end
+end

data/spec/helpers/action_view_extension_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Kaminari::ActionViewExtension' do
+describe 'Kaminari::ActionViewExtension', :if => defined?(Rails)do
   describe '#paginate' do
     before do
       50.times {|i| User.create! :name => "user#{i}"}
@@ -15,6 +15,12 @@ describe 'Kaminari::ActionViewExtension' do
         lambda { helper.escape_javascript(helper.paginate @users, :params => {:controller => 'users', :action => 'index'}) }.should_not raise_error
       end
     end
+
+    context 'accepts :view_prefix option' do
+      before { helper.controller.append_view_path "spec/fake_app/views" }
+      subject { helper.paginate @users, :views_prefix => "alternative/", :params => {:controller => 'users', :action => 'index'} }
+      it { should eq("  <b>1</b>\n") }
+    end
   end
 
   describe '#link_to_previous_page' do
@@ -248,7 +254,7 @@ describe 'Kaminari::ActionViewExtension' do
 
   describe '#rel_next_prev_link_tags' do
     before do
-      75.times {|i| User.create! :name => "user#{i}"}
+      80.times {|i| User.create! :name => "user#{i}"}
     end
 
     context 'the first page' do
@@ -257,31 +263,32 @@ describe 'Kaminari::ActionViewExtension' do
       end
 
       subject { helper.rel_next_prev_link_tags @users, :params => {:controller => 'users', :action => 'index'} }
-      it { should be_a String }
-      it { should match(/rel="next"/) }
       it { should_not match(/rel="prev"/) }
+      it { should match(/rel="next"/) }
+      it { should match(/\?page=2/) }
     end
 
     context 'the middle page' do
       before do
-        @users = User.page(2).per(25)
+        @users = User.page(3).per(25)
       end
 
       subject { helper.rel_next_prev_link_tags @users, :params => {:controller => 'users', :action => 'index'} }
-      it { should be_a String }
-      it { should match(/rel="next"/) }
       it { should match(/rel="prev"/) }
+      it { should match(/\?page=2/) }
+      it { should match(/rel="next"/) }
+      it { should match(/\?page=4/) }
     end
 
     context 'the last page' do
       before do
-        @users = User.page(3).per(25)
+        @users = User.page(4).per(25)
       end
 
       subject { helper.rel_next_prev_link_tags @users, :params => {:controller => 'users', :action => 'index'} }
-      it { should be_a String }
-      it { should_not match(/rel="next"/) }
       it { should match(/rel="prev"/) }
+      it { should match(/\?page=3"/) }
+      it { should_not match(/rel="next"/) }
     end
   end
 end