will_paginate 2.3.14 → 2.3.15

data/lib/will_paginate.rb

@@ -36,7 +36,7 @@ module WillPaginate
 
       # support pagination on associations
       a = ActiveRecord::Associations
-      returning([ a::AssociationCollection ]) { |classes|
+      [ a::AssociationCollection ].tap { |classes|
         # detect http://dev.rubyonrails.org/changeset/9230
         unless a::HasManyThroughAssociation.superclass == a::HasManyAssociation
           classes << a::HasManyThroughAssociation

data/lib/will_paginate/finder.rb

@@ -155,7 +155,7 @@ module WillPaginate
         when :paginate, :paginate_by_sql
           true
         else
-          super(method.to_s.sub(/^paginate/, 'find'), include_priv)
+          super || super(method.to_s.sub(/^paginate/, 'find'), include_priv)
         end
       end
 
@@ -198,7 +198,7 @@ module WillPaginate
 
         if options[:select] and options[:select] =~ /^\s*DISTINCT\b/i
           # Remove quoting and check for table_name.*-like statement.
-          if options[:select].gsub('`', '') =~ /\w+\.\*/
+          if options[:select].gsub(/[`"]/, '') =~ /\w+\.\*/
             options[:select] = "DISTINCT #{klass.table_name}.#{klass.primary_key}"
           end
         else
@@ -235,7 +235,7 @@ module WillPaginate
                   counter.call
                 end
 
-        count.respond_to?(:length) ? count.length : count
+        (!count.is_a?(Integer) && count.respond_to?(:length)) ? count.length : count
       end
 
       def wp_parse_options(options) #:nodoc:

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate
   module VERSION
     MAJOR = 2
     MINOR = 3
-    TINY  = 14
+    TINY  = 15
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/boot.rb

@@ -15,7 +15,7 @@ else
   if version
     gem 'rails', version
   else
-    gem 'actionpack'
-    gem 'activerecord'
+    gem 'actionpack', '< 3.0.0.a'
+    gem 'activerecord', '< 3.0.0.a'
   end
 end

data/test/finder_test.rb

@@ -9,7 +9,7 @@ class FinderTest < ActiveRecordTestCase
   fixtures :topics, :replies, :users, :projects, :developers_projects
 
   def test_new_methods_presence
-    assert_respond_to_all Topic, %w(per_page paginate paginate_by_sql)
+    assert_respond_to_all Topic, %w(per_page paginate paginate_by_sql paginate_by_definition_in_class)
   end
   
   def test_simple_paginate
@@ -39,6 +39,22 @@ class FinderTest < ActiveRecordTestCase
     assert_nothing_raised { Topic.paginate :page => 1, :count => nil }
   end
   
+  def test_counting_when_integer_has_length_method
+    Integer.module_eval { def length; to_s.length; end }
+    begin
+      assert_equal 2, 11.length
+      entries = Developer.paginate :page => 1, :per_page => 5
+      assert_equal 11, entries.total_entries
+      assert_equal 5, entries.size
+      assert_equal 3, entries.total_pages
+    ensure
+      begin
+        Integer.module_eval { remove_method :length }
+      rescue
+      end
+    end
+  end
+  
   def test_paginate_with_per_page
     entries = Topic.paginate :page => 1, :per_page => 1
     assert_equal 1, entries.size
@@ -197,7 +213,7 @@ class FinderTest < ActiveRecordTestCase
 
   def test_paginate_with_dynamic_finder
     expected = [replies(:witty_retort), replies(:spam)]
-    assert_equal expected, Reply.paginate_by_topic_id(1, :page => 1)
+    assert_equal expected, Reply.paginate_by_topic_id(1, :page => 1, :order => :created_at)
 
     entries = Developer.paginate :conditions => { :salary => 100000 }, :page => 1, :per_page => 5
     assert_equal 8, entries.total_entries
@@ -469,5 +485,12 @@ class FinderTest < ActiveRecordTestCase
       
       # I cannot reproduce any of the failures from those reports :(
     end
+
+    def test_hmt_with_uniq
+      project = Project.find(1)
+      result = project.unique_replies.paginate :page => 1, :per_page => 1,
+        :order => 'replies.id'
+      assert_equal replies(:decisive), result.first
+    end
   end
 end

data/test/fixtures/project.rb

@@ -12,4 +12,6 @@ class Project < ActiveRecord::Base
       end
     end
   end
+
+  has_many :unique_replies, :through => :topics, :source => :replies, :uniq => true
 end

data/test/fixtures/topic.rb

@@ -7,4 +7,6 @@ class Topic < ActiveRecord::Base
   named_scope :with_replies_starting_with, lambda { |text|
     { :conditions => "replies.content LIKE '#{text}%' ", :include  => :replies }
   }
+
+  def self.paginate_by_definition_in_class; end
 end

data/test/lib/activerecord_test_connector.rb

@@ -28,7 +28,8 @@ class ActiveRecordTestConnector
   
   def self.add_load_path(path)
     dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
-    dep.load_paths.unshift path
+    autoload_paths = dep.respond_to?(:autoload_paths) ? dep.autoload_paths : dep.load_paths
+    autoload_paths.unshift path
   end
 
   def self.setup_connection

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 3
-  - 14
-  version: 2.3.14
+  - 15
+  version: 2.3.15
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: []