kaminari 0.9.9 → 0.9.10

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.9.10
+
+* the per() method accepts String, zero and minus value now #7 [koic]
+  This enables you to do something like this:
+	Model.page(params[:page]).per(params[:per])
+
+* Added support for Gem Testers (http://gem-testers.org/) #8 [joealba]
+
 == 0.9.9
 
 * :params option for the helper [yomukaku_memo]

data/README.rdoc

@@ -86,7 +86,7 @@ This would output something like 1 ...(snip)... 18 19 20 while having 20 pages i
   <%= paginate @users, :left => 0, :right => 2 %>
 
 * extra parameters (:params) for the links
-This would modify each link's url_option. :controller and :action would be the usual keys.
+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!)

data/Rakefile

@@ -50,3 +50,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :test do 
+	Rake::Task[:spec].invoke 
+end

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-13}
+  s.date = %q{2011-02-17}
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".gemtest",
     ".rspec",
     "CHANGELOG",
     "Gemfile",

data/lib/kaminari/active_record.rb

@@ -4,7 +4,7 @@ module Kaminari
     DEFAULT_PER_PAGE = 25
 
     included do
-      def self.inherited(kls)
+      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|
@@ -14,32 +14,45 @@ module Kaminari
         end
 
         kls.class_eval do
-          # page(5)
+          # Fetch the values at the specified page number
+          #   Model.page(5)
           scope :page, lambda {|num|
-            per_page = @_default_per_page || Kaminari::ActiveRecord::DEFAULT_PER_PAGE
-            limit(per_page).offset(per_page * ([num.to_i, 1].max - 1))
+            limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
           } do
-            # page(3).per(10)
+            # Specify the <tt>per_page</tt> value for the preceding <tt>page</tt> scope
+            #   Model.page(3).per(10)
             def per(num)
-              limit(num).offset(offset_value / limit_value * 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
+          # 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::ActiveRecord::DEFAULT_PER_PAGE
+          end
         end
       end
     end

data/lib/kaminari/helpers.rb

@@ -60,7 +60,7 @@ module Kaminari
           method.call name, 'kaminari', true
         else
           # 3.1
-          method.call name, 'kaminari', true, []
+          method.call name, ['kaminari'], true, []
         end
       end
 

data/lib/kaminari/tags.rb

@@ -26,19 +26,24 @@ module Kaminari
       end
 
       private
+      def self.ancestor_renderables
+        arr = []
+        ancestors.each do |klass|
+          return arr if klass == Tag
+          arr << klass if klass != Renderable
+        end
+      end
+
       # OMG yet another super dirty hack
       # this method finds
       #   1. a template for the given class from app/views
       #   2. a template for its parent class from app/views
       #   3. the default one inside the engine
-      def find_template(klass = self.class)
-        if @renderer.partial_exists? klass.template_filename
-          "kaminari/#{klass.template_filename}"
-        elsif (parent = klass.ancestors[1]) == Renderable
-          "kaminari/#{self.class.template_filename}"
-        else
-          find_template parent
+      def find_template
+        self.class.ancestor_renderables.each do |klass|
+          return "kaminari/#{klass.template_filename}" if @renderer.partial_exists? klass.template_filename
         end
+        "kaminari/#{self.class.template_filename}"
       end
 
       def page_url_for(page)

data/spec/helpers/tags_spec.rb

@@ -2,25 +2,46 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 include Kaminari::Helpers
 
 describe 'Kaminari::Helpers' do
-  let :renderer do
-    stub(r = Object.new) do
-      render.with_any_args
-      options { {} }
-      params { {} }
-      partial_exists?.with_any_args {|a| puts a; false }
-      url_for {|h| "/foo?page=#{h[:page]}"}
-    end
-    r
-  end
-  describe 'PageLink' do
-    subject { PageLink.new renderer, :page => 3 }
-    its('class.template_filename') { should == 'page_link' }
-    describe 'template lookup rule' do
-      before do
-        pending "spies doesn't work on RSpec 2 ATM: https://github.com/btakita/rr/issues#issue/45"
-        subject.to_s
-      end
-      specify { renderer.should have_received.partial_exists? PageLink }
+  describe 'template lookup rule' do
+    describe 'Paginator' do
+      subject { Paginator }
+      its(:ancestor_renderables) { should == [Paginator] }
+    end
+    describe 'PrevLink' do
+      subject { PrevLink }
+      its(:ancestor_renderables) { should == [PrevLink, Prev, Link, Page] }
+    end
+    describe 'PrevSpan' do
+      subject { PrevSpan }
+      its(:ancestor_renderables) { should == [PrevSpan, Prev, NonLink] }
+    end
+    describe 'FirstPageLink' do
+      subject { FirstPageLink }
+      its(:ancestor_renderables) { should == [FirstPageLink, PageLink, Link, Page] }
+    end
+    describe 'PageLink' do
+      subject { PageLink }
+      its(:ancestor_renderables) { should == [PageLink, Link, Page] }
+    end
+    describe 'CurrentPage' do
+      subject { CurrentPage }
+      its(:ancestor_renderables) { should == [CurrentPage, NonLink, Page] }
+    end
+    describe 'TruncatedSpan' do
+      subject { TruncatedSpan }
+      its(:ancestor_renderables) { should == [TruncatedSpan, NonLink] }
+    end
+    describe 'LastPageLink' do
+      subject { LastPageLink }
+      its(:ancestor_renderables) { should == [LastPageLink, PageLink, Link, Page] }
+    end
+    describe 'NextLink' do
+      subject { NextLink }
+      its(:ancestor_renderables) { should == [NextLink, Next, Link, Page] }
+    end
+    describe 'NextSpan' do
+      subject { NextSpan }
+      its(:ancestor_renderables) { should == [NextSpan, Next, NonLink] }
     end
   end
 end

data/spec/models/scopes_spec.rb

@@ -66,6 +66,21 @@ describe Kaminari::ActiveRecord do
       subject { User.page(50).per(65536) }
       its(:num_pages) { should == 1 }
     end
+
+    context 'per 0 (using default)' do
+      subject { User.page(50).per(0) }
+      its(:num_pages) { should == 4 }
+    end
+
+    context 'per -1 (using default)' do
+      subject { User.page(5).per(-1) }
+      its(:num_pages) { should == 4 }
+    end
+
+    context 'per "String value that can not be converted into Number" (using default)' do
+      subject { User.page(5).per('aho') }
+      its(:num_pages) { should == 4 }
+    end
   end
 
   describe '#current_page' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +09:00
+date: 2011-02-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -244,6 +244,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gemtest
 - .rspec
 - CHANGELOG
 - Gemfile