will_paginate 3.0.3 → 3.0.4

data/lib/will_paginate/active_record.rb

@@ -39,6 +39,26 @@ module WillPaginate
         end
       end
 
+      # dirty hack to enable `first` after `limit` behavior above
+      def first(*args)
+        if current_page
+          rel = clone
+          rel.current_page = nil
+          rel.first(*args)
+        else
+          super
+        end
+      end
+
+      # fix for Rails 3.0
+      def find_last
+        if !loaded? and offset_value || limit_value
+          @last ||= to_a.last
+        else
+          super
+        end
+      end
+
       def offset(value = nil)
         if value.nil? then offset_value
         else super(value)
@@ -138,7 +158,17 @@ module WillPaginate
       end
 
       def page(num)
-        rel = scoped.extending(RelationMethods)
+        rel = if ::ActiveRecord::Relation === self
+          self
+        elsif !defined?(::ActiveRecord::Scoping) or ::ActiveRecord::Scoping::ClassMethods.method_defined? :with_scope
+          # Active Record 3
+          scoped
+        else
+          # Active Record 4
+          all
+        end
+
+        rel = rel.extending(RelationMethods)
         pagenum = ::WillPaginate::PageNumber(num.nil? ? 1 : num)
         per_page = rel.limit_value || self.per_page
         rel = rel.offset(pagenum.to_offset(per_page).to_i)

data/lib/will_paginate/railtie.rb

@@ -40,7 +40,6 @@ module WillPaginate
     module ShowExceptionsPatch
       extend ActiveSupport::Concern
       included { alias_method_chain :status_code, :paginate }
-      private
       def status_code_with_paginate(exception = @exception)
         if exception.is_a?(WillPaginate::InvalidPage) or
             (exception.respond_to?(:original_exception) &&

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers.rb

@@ -47,7 +47,6 @@ module WillPaginate
     # * <tt>:class</tt> -- CSS class name for the generated DIV (default: "pagination")
     # * <tt>:previous_label</tt> -- default: "« Previous"
     # * <tt>:next_label</tt> -- default: "Next »"
-    # * <tt>:page_links</tt> -- when false, only previous/next links are rendered (default: true)
     # * <tt>:inner_window</tt> -- how many links are shown around the current page (default: 4)
     # * <tt>:outer_window</tt> -- how many links are around the first and the last page (default: 1)
     # * <tt>:link_separator</tt> -- string separator for page HTML elements (default: single space)
@@ -137,7 +136,7 @@ module WillPaginate
         i18n_key = :"page_entries_info.single_page#{html_key}"
         keys = [:"#{model_key}.#{i18n_key}", i18n_key]
 
-        will_paginate_translate keys, :count => collection.size, :model => model_name do |_, opts|
+        will_paginate_translate keys, :count => collection.total_entries, :model => model_name do |_, opts|
           case opts[:count]
           when 0; "No #{opts[:model]} found"
           when 1; "Displaying #{b}1#{eb} #{opts[:model]}"

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -59,7 +59,7 @@ module WillPaginate
       end
       
       def next_page
-        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+        num = @collection.current_page < total_pages && @collection.current_page + 1
         previous_or_next_page(num, @options[:next_label], 'next_page')
       end
       

data/spec/finders/active_record_spec.rb

@@ -92,6 +92,19 @@ describe WillPaginate::ActiveRecord do
       rel.offset.should == 6
     end
 
+    it "supports #first" do
+      rel = Developer.order('id').page(2).per_page(4)
+      rel.first.should == users(:dev_5)
+      rel.first(2).should == users(:dev_5, :dev_6)
+    end
+
+    it "supports #last" do
+      rel = Developer.order('id').page(2).per_page(4)
+      rel.last.should == users(:dev_8)
+      rel.last(2).should == users(:dev_7, :dev_8)
+      rel.page(3).last.should == users(:poor_jamis)
+    end
+
     it "keeps pagination data after 'scoped'" do
       rel = Developer.page(2).scoped
       rel.per_page.should == 10
@@ -207,7 +220,7 @@ describe WillPaginate::ActiveRecord do
         sql = "select content from topics where content like '%futurama%'"
         topics = Topic.paginate_by_sql sql, :page => 1, :per_page => 1
         topics.total_entries.should == 1
-        topics.first['title'].should be_nil
+        topics.first.attributes.has_key?('title').should be_false
       }.should run_queries(2)
     end
 
@@ -368,7 +381,7 @@ describe WillPaginate::ActiveRecord do
     end
 
     it "should paginate through association extension" do
-      project = Project.find(:first)
+      project = Project.order('id').first
       expected = [replies(:brave)]
 
       lambda {

data/spec/finders/activerecord_test_connector.rb

@@ -30,7 +30,9 @@ module ActiverecordTestConnector
 
   FIXTURES_PATH = File.expand_path('../../fixtures', __FILE__)
 
-  Fixtures = defined?(ActiveRecord::Fixtures) ? ActiveRecord::Fixtures : ::Fixtures
+  Fixtures = defined?(ActiveRecord::FixtureSet) ? ActiveRecord::FixtureSet :
+             defined?(ActiveRecord::Fixtures) ? ActiveRecord::Fixtures :
+             ::Fixtures
 
   # Set our defaults
   self.connected = false

data/spec/finders/sequel_test_connector.rb

@@ -1,5 +1,11 @@
 require 'sequel'
 
+Symbol.class_eval do
+  # Active Record calculations tries `as` on some objects but chokes when that
+  # object was a Symbol and it gets a Sequel::SQL::AliasedExpression.
+  undef as if method_defined? :as
+end
+
 db = Sequel.sqlite
 
 db.create_table :cars do

data/spec/fixtures/developer.rb

@@ -1,5 +1,5 @@
 class Developer < User
-  has_and_belongs_to_many :projects, :include => :topics, :order => 'projects.name'
+  has_and_belongs_to_many :projects, :include => :topics, :order => 'projects.name', :join_table => 'developers_projects'
 
   def self.with_poor_ones(&block)
     with_scope :find => { :conditions => ['salary <= ?', 80000], :order => 'salary' } do

data/spec/fixtures/project.rb

@@ -1,5 +1,5 @@
 class Project < ActiveRecord::Base
-  has_and_belongs_to_many :developers, :uniq => true
+  has_and_belongs_to_many :developers, :uniq => true, :join_table => 'developers_projects'
   
   has_many :topics
     # :finder_sql  => 'SELECT * FROM topics WHERE (topics.project_id = #{id})',

data/spec/view_helpers/action_view_spec.rb

@@ -7,12 +7,12 @@ require 'will_paginate/collection'
 Routes = ActionDispatch::Routing::RouteSet.new
 
 Routes.draw do
-  match 'dummy/page/:page' => 'dummy#index'
-  match 'dummy/dots/page.:page' => 'dummy#dots'
-  match 'ibocorp(/:page)' => 'ibocorp#index',
+  get 'dummy/page/:page' => 'dummy#index'
+  get 'dummy/dots/page.:page' => 'dummy#dots'
+  get 'ibocorp(/:page)' => 'ibocorp#index',
         :constraints => { :page => /\d+/ }, :defaults => { :page => 1 }
 
-  match ':controller(/:action(/:id(.:format)))'
+  get ':controller(/:action(/:id(.:format)))'
 end
 
 describe WillPaginate::ActionView do

data/spec/view_helpers/view_example_group.rb

@@ -1,11 +1,18 @@
 require 'active_support'
+begin
+  require 'minitest/unit'
+rescue LoadError
+  # Fails on Ruby 1.8, but it's OK since we only need MiniTest::Assertions
+  # on Rails 4 which doesn't support 1.8 anyway.
+end
 require 'action_dispatch/testing/assertions'
 require 'will_paginate/array'
 
 module ViewExampleGroup
   
   include ActionDispatch::Assertions::SelectorAssertions
-  
+  include MiniTest::Assertions if defined? MiniTest
+
   def assert(value, message)
     raise message unless value
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies: []
 description: will_paginate provides a simple API for performing paginated queries
   with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pagination plugin for web frameworks and other apps