will_paginate 3.0.pre4 → 3.0.0

data/spec/fixtures/project.rb

@@ -10,4 +10,6 @@ class Project < ActiveRecord::Base
       scoped.where(['replies.created_at > ?', 15.minutes.ago])
     end
   end
+
+  has_many :unique_replies, :through => :topics, :source => :replies, :uniq => true
 end

data/spec/page_number_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'will_paginate/page_number'
+
+describe WillPaginate::PageNumber do
+  describe "valid" do
+    subject { described_class.new('12', 'page') }
+
+    it { should eq(12) }
+    its(:inspect) { should eq('page 12') }
+    it { should be_a(WillPaginate::PageNumber) }
+    it { should be_instance_of(WillPaginate::PageNumber) }
+    it { should be_a(Numeric) }
+    it { should be_a(Fixnum) }
+    it { should_not be_instance_of(Fixnum) }
+
+    it "passes the PageNumber=== type check" do |variable|
+      (WillPaginate::PageNumber === subject).should be
+    end
+
+    it "passes the Numeric=== type check" do |variable|
+      (Numeric === subject).should be
+      (Fixnum === subject).should be
+    end
+  end
+
+  describe "invalid" do
+    def create(value, name = 'page')
+      described_class.new(value, name)
+    end
+
+    it "errors out on non-int values" do
+      lambda { create(nil) }.should raise_error(WillPaginate::InvalidPage)
+      lambda { create('') }.should raise_error(WillPaginate::InvalidPage)
+      lambda { create('Schnitzel') }.should raise_error(WillPaginate::InvalidPage)
+    end
+
+    it "errors out on zero or less" do
+      lambda { create(0) }.should raise_error(WillPaginate::InvalidPage)
+      lambda { create(-1) }.should raise_error(WillPaginate::InvalidPage)
+    end
+
+    it "doesn't error out on zero for 'offset'" do
+      lambda { create(0, 'offset') }.should_not raise_error
+      lambda { create(-1, 'offset') }.should raise_error(WillPaginate::InvalidPage)
+    end
+  end
+
+  describe "coercion method" do
+    it "defaults to 'page' name" do
+      num = WillPaginate::PageNumber(12)
+      num.inspect.should eq('page 12')
+    end
+
+    it "accepts a custom name" do
+      num = WillPaginate::PageNumber(12, 'monkeys')
+      num.inspect.should eq('monkeys 12')
+    end
+
+    it "doesn't affect PageNumber instances" do
+      num = WillPaginate::PageNumber(12)
+      num2 = WillPaginate::PageNumber(num)
+      num2.object_id.should eq(num.object_id)
+    end
+  end
+end

data/spec/per_page_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'will_paginate/per_page'
+
+describe WillPaginate::PerPage do
+
+  class MyModel
+    extend WillPaginate::PerPage
+  end
+
+  it "has the default value" do
+    MyModel.per_page.should == 30
+
+    WillPaginate.per_page = 10
+    begin
+      MyModel.per_page.should == 10
+    ensure
+      WillPaginate.per_page = 30
+    end
+  end
+
+  it "casts values to int" do
+    WillPaginate.per_page = '10'
+    begin
+      MyModel.per_page.should == 10
+    ensure
+      WillPaginate.per_page = 30
+    end
+  end
+
+  it "has an explicit value" do
+    MyModel.per_page = 12
+    begin
+      MyModel.per_page.should == 12
+      subclass = Class.new(MyModel)
+      subclass.per_page.should == 12
+    ensure
+      MyModel.send(:remove_instance_variable, '@per_page')
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 require 'rspec'
 require File.expand_path('../view_helpers/view_example_group', __FILE__)
+begin
+  require 'ruby-debug'
+rescue LoadError
+  # no debugger available
+end
 
 module MyExtras
   protected
@@ -15,10 +20,6 @@ module MyExtras
     end
     WillPaginate::Collection.new(params[:page] || 1, params[:per_page] || 30, params[:total_entries])
   end
-  
-  def have_deprecation
-    DeprecationMatcher.new
-  end
 end
 
 RSpec.configure do |config|
@@ -48,28 +49,3 @@ class PhraseMatcher
     "expected #{@actual.inspect} not to contain phrase #{@string.inspect}"
   end
 end
-
-class DeprecationMatcher
-  def initialize
-    @old_behavior = WillPaginate::Deprecation.behavior
-    @messages = []
-    WillPaginate::Deprecation.behavior = lambda { |message, callstack|
-      @messages << message
-    }
-  end
-
-  def matches?(block)
-    block.call
-    !@messages.empty?
-  ensure
-    WillPaginate::Deprecation.behavior = @old_behavior
-  end
-
-  def failure_message
-    "expected block to raise a deprecation warning"
-  end
-
-  def negative_failure_message
-    "expected block not to raise deprecation warnings, #{@messages.size} raised"
-  end
-end

data/spec/view_helpers/action_view_spec.rb

@@ -4,8 +4,6 @@ require 'action_controller'
 require 'will_paginate/view_helpers/action_view'
 require 'will_paginate/collection'
 
-ActionView::Base.send(:include, WillPaginate::ViewHelpers::ActionView)
-
 Routes = ActionDispatch::Routing::RouteSet.new
 
 Routes.draw do
@@ -17,7 +15,16 @@ Routes.draw do
   match ':controller(/:action(/:id(.:format)))'
 end
 
-describe WillPaginate::ViewHelpers::ActionView do
+describe WillPaginate::ActionView do
+
+  before(:all) do
+    I18n.load_path.concat WillPaginate::I18n.load_path
+  end
+
+  before(:each) do
+    I18n.reload!
+  end
+
   before(:each) do
     @assigns = {}
     @controller = DummyController.new
@@ -44,7 +51,7 @@ describe WillPaginate::ViewHelpers::ActionView do
       end
       assert_select 'span', 1
       assert_select 'span.disabled:first-child', '← Previous'
-      assert_select 'em', '1'
+      assert_select 'em.current', '1'
       pagination.first.inner_text.should == '← Previous 1 2 3 Next →'
     end
   end
@@ -68,7 +75,7 @@ describe WillPaginate::ViewHelpers::ActionView do
           link.first['rel'].should == 'next'
         end
       end
-      assert_select 'em', '2'
+      assert_select '.current', '2'
     end
   end
 
@@ -79,7 +86,7 @@ describe WillPaginate::ViewHelpers::ActionView do
   end
 
   it "should paginate using a custom renderer instance" do
-    renderer = WillPaginate::ViewHelpers::LinkRenderer.new
+    renderer = WillPaginate::ActionView::LinkRenderer.new
     def renderer.gap() '<span class="my-gap">~~</span>' end
     
     paginate({ :per_page => 2 }, :inner_window => 0, :outer_window => 0, :renderer => renderer) do
@@ -98,20 +105,12 @@ describe WillPaginate::ViewHelpers::ActionView do
       assert_select 'a.next_page[href]:last-child'
     end
   end
-  
-  it "should warn about :prev_label being deprecated" do
-    lambda {
-      paginate({ :page => 2 }, :prev_label => 'Deprecated') do
-        assert_select 'a[href]:first-child', 'Deprecated'
-      end
-    }.should have_deprecation
-  end
 
   it "should match expected markup" do
     paginate
     expected = <<-HTML
       <div class="pagination"><span class="previous_page disabled">&#8592; Previous</span>
-      <em>1</em>
+      <em class="current">1</em>
       <a href="/foo/bar?page=2" rel="next">2</a>
       <a href="/foo/bar?page=3">3</a>
       <a href="/foo/bar?page=2" class="next_page" rel="next">Next &#8594;</a></div>
@@ -148,22 +147,6 @@ describe WillPaginate::ViewHelpers::ActionView do
     end
   end
 
-  it "should have magic HTML ID for the container" do
-    paginate do |div|
-      div.first['id'].should be_nil
-    end
-    
-    # magic ID
-    paginate({}, :id => true) do |div|
-      div.first['id'].should == 'fixnums_pagination'
-    end
-    
-    # explicit ID
-    paginate({}, :id => 'custom_id') do |div|
-      div.first['id'].should == 'custom_id'
-    end
-  end
-
   ## other helpers ##
   
   it "should render a paginated section" do
@@ -177,6 +160,18 @@ describe WillPaginate::ViewHelpers::ActionView do
     assert_select 'div.pagination', 2
     assert_select 'div.pagination + div#developers', 1
   end
+
+  it "should not render a paginated section with a single page" do
+    @template = <<-ERB
+      <%= paginated_section collection, options do %>
+        <%= content_tag :div, '', :id => "developers" %>
+      <% end %>
+    ERB
+
+    paginate(:total_entries => 1)
+    assert_select 'div.pagination', 0
+    assert_select 'div#developers', 1
+  end
   
   ## parameter handling in page links ##
   
@@ -283,9 +278,30 @@ describe WillPaginate::ViewHelpers::ActionView do
       paginate(nil)
     }.should raise_error(ActionView::TemplateError, /@developers/)
   end
+
+  ## i18n
+
+  it "is able to translate previous/next labels" do
+    translation :will_paginate => {
+      :previous_label => 'Go back',
+      :next_label => 'Load more'
+    }
+
+    paginate do |pagination|
+      assert_select 'span.disabled:first-child', 'Go back'
+      assert_select 'a[rel=next]', 'Load more'
+    end
+  end
+
+  private
+
+  def translation(data)
+    I18n.available_locales # triggers loading existing translations
+    I18n.backend.store_translations(:en, data)
+  end
 end
 
-class AdditionalLinkAttributesRenderer < WillPaginate::ViewHelpers::LinkRenderer
+class AdditionalLinkAttributesRenderer < WillPaginate::ActionView::LinkRenderer
   def initialize(link_attributes = nil)
     super()
     @additional_link_attributes = link_attributes || { :default => 'true' }

data/spec/view_helpers/base_spec.rb

@@ -1,10 +1,22 @@
 require 'spec_helper'
-require 'will_paginate/view_helpers/base'
+require 'will_paginate/view_helpers'
 require 'will_paginate/array'
+require 'active_support'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/inflections'
 
-describe WillPaginate::ViewHelpers::Base do
+describe WillPaginate::ViewHelpers do
 
-  include WillPaginate::ViewHelpers::Base
+  before(:all) do
+    # make sure default translations aren't loaded
+    I18n.load_path.clear
+  end
+
+  before(:each) do
+    I18n.reload!
+  end
+
+  include WillPaginate::ViewHelpers
   
   describe "will_paginate" do
     it "should render" do
@@ -28,17 +40,31 @@ describe WillPaginate::ViewHelpers::Base do
     end
 
     def info(params, options = {})
-      options[:html] ||= false unless options.key?(:html) and options[:html].nil?
       collection = Hash === params ? @array.paginate(params) : params
-      page_entries_info collection, options
+      page_entries_info collection, {:html => false}.merge(options)
     end
 
     it "should display middle results and total count" do
       info(:page => 2, :per_page => 5).should == "Displaying strings 6 - 10 of 26 in total"
     end
 
+    it "uses translation if available" do
+      translation :will_paginate => {
+        :page_entries_info => {:multi_page => 'Showing %{from} - %{to}'}
+      }
+      info(:page => 2, :per_page => 5).should == "Showing 6 - 10"
+    end
+
+    it "uses specific translation if available" do
+      translation :will_paginate => {
+        :page_entries_info => {:multi_page => 'Showing %{from} - %{to}'},
+        :string => { :page_entries_info => {:multi_page => 'Strings %{from} to %{to}'} }
+      }
+      info(:page => 2, :per_page => 5).should == "Strings 6 to 10"
+    end
+
     it "should output HTML by default" do
-      info({ :page => 2, :per_page => 5 }, :html => nil).should ==
+      info({ :page => 2, :per_page => 5 }, :html => true).should ==
         "Displaying strings <b>6&nbsp;-&nbsp;10</b> of <b>26</b> in total"
     end
 
@@ -48,7 +74,8 @@ describe WillPaginate::ViewHelpers::Base do
 
     it "should handle longer class names" do
       collection = @array.paginate(:page => 2, :per_page => 5)
-      collection.first.stubs(:class).returns(mock('Class', :name => 'ProjectType'))
+      model = stub('Class', :name => 'ProjectType', :to_s => 'ProjectType')
+      collection.first.stubs(:class).returns(model)
       info(collection).should include_phrase('project types')
     end
 
@@ -60,5 +87,30 @@ describe WillPaginate::ViewHelpers::Base do
     it "should display 'no entries found' for empty collections" do
       info([].paginate(:page => 1, :per_page => 5)).should == "No entries found"
     end
+
+    it "uses model_name.human when available" do
+      name = stub('model name', :i18n_key => :flower_key)
+      name.expects(:human).with(:count => 1).returns('flower')
+      model = stub('Class', :model_name => name)
+      collection = [1].paginate(:page => 1)
+
+      info(collection, :model => model).should == "Displaying 1 flower"
+    end
+
+    it "uses custom translation instead of model_name.human" do
+      name = stub('model name', :i18n_key => :flower_key)
+      name.expects(:human).never
+      model = stub('Class', :model_name => name)
+      translation :will_paginate => {:models => {:flower_key => 'tulip'}}
+      collection = [1].paginate(:page => 1)
+
+      info(collection, :model => model).should == "Displaying 1 tulip"
+    end
+
+    private
+
+    def translation(data)
+      I18n.backend.store_translations(:en, data)
+    end
   end
 end

data/spec/view_helpers/link_renderer_base_spec.rb

@@ -5,36 +5,31 @@ require 'will_paginate/collection'
 describe WillPaginate::ViewHelpers::LinkRendererBase do
   
   before do
-    @renderer = WillPaginate::ViewHelpers::LinkRendererBase.new
+    @renderer = described_class.new
   end
   
   it "should raise error when unprepared" do
     lambda {
-      @renderer.send :param_name
+      @renderer.pagination
     }.should raise_error
   end
   
   it "should prepare with collection and options" do
-    prepare({}, :param_name => 'mypage')
+    prepare({})
     @renderer.send(:current_page).should == 1
-    @renderer.send(:param_name).should == 'mypage'
   end
   
   it "should have total_pages accessor" do
     prepare :total_pages => 42
-    lambda {
-      @renderer.send(:total_pages).should == 42
-    }.should_not have_deprecation
+    @renderer.send(:total_pages).should == 42
   end
   
   it "should clear old cached values when prepared" do
-    prepare({ :total_pages => 1 }, :param_name => 'foo')
+    prepare(:total_pages => 1)
     @renderer.send(:total_pages).should == 1
-    @renderer.send(:param_name).should == 'foo'
-    # prepare with different object and options:
-    prepare({ :total_pages => 2 }, :param_name => 'bar')
+    # prepare with different object:
+    prepare(:total_pages => 2)
     @renderer.send(:total_pages).should == 2
-    @renderer.send(:param_name).should == 'bar'
   end
   
   it "should have pagination definition" do