0
@@ -33,22 +33,68 @@ module WillPaginate
0
       require 'will_paginate/finder'
0
       ActiveRecord::Base.class_eval { include Finder }
0
 
0
-      # support paginating finders on associations
0
-      a = ActiveRecord::Associations
0
-      [a::AssociationCollection, a::HasManyThroughAssociation].each do |klass|
0
+      if patch_named_scope = !defined?(ActiveRecord::NamedScope)
0
+        # bring in a Rails 2.1 feature
0
+        require 'will_paginate/named_scope'
0
+
0
+        ActiveRecord::Base.class_eval do
0
+          include WillPaginate::NamedScope
0
+        end
0
+        
0
+        ActiveRecord::Associations::AssociationProxy.class_eval do
0
+          protected
0
+          def with_scope(*args, &block)
0
+            @reflection.klass.send :with_scope, *args, &block
0
+          end
0
+        end
0
+      end
0
+
0
+      # support pagination on associations
0
+      [ ActiveRecord::Associations::AssociationCollection,
0
+          ActiveRecord::Associations::HasManyThroughAssociation ].each do |klass|
0
+        klass.class_eval do
0
+          protected
0
+          def method_missing(method, *args)
0
+            if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
0
+              if block_given?
0
+                super { |*block_args| yield(*block_args) }
0
+              else
0
+                super
0
+              end
0
+            elsif @reflection.klass.scopes.include?(method)
0
+              @reflection.klass.scopes[method].call(self, *args)
0
+            else
0
+              with_scope construct_scope do
0
+                if block_given?
0
+                  @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) }
0
+                else
0
+                  @reflection.klass.send(method, *args)
0
+                end
0
+              end
0
+            end
0
+          end
0
+        end if patch_named_scope
0
+        
0
         klass.class_eval do
0
           include Finder::ClassMethods
0
           alias_method_chain :method_missing, :paginate
0
         end
0
       end
0
 
0
-      unless defined? ActiveRecord::NamedScope
0
-        require 'will_paginate/named_scope'
0
-
0
-        ActiveRecord::Base.class_eval do
0
-          include WillPaginate::NamedScope
0
+      ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
0
+        protected
0
+        def method_missing(method, *args, &block)
0
+          if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
0
+            super
0
+          elsif @reflection.klass.scopes.include?(method)
0
+            @reflection.klass.scopes[method].call(self, *args)
0
+          else
0
+            @reflection.klass.with_scope(:find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false }) do
0
+              @reflection.klass.send(method, *args, &block)
0
+            end
0
+          end
0
         end
0
-      end
0
+      end if ActiveRecord::VERSION::MAJOR < 2 and patch_named_scope
0
     end
0
   end
0
 

0
@@ -226,6 +226,38 @@ class FinderTest < ActiveRecordTestCase
0
     assert_equal 1, entries.size
0
     assert_equal 2, entries.total_entries
0
   end
0
+  
0
+  def test_paginate_in_named_scope_on_habtm_association
0
+    project = projects(:active_record)
0
+    assert_queries(2) do
0
+      entries = project.developers.poor.paginate :page => 1, :per_page => 1
0
+
0
+      assert_equal 1, entries.size, 'one developer should be found'
0
+      assert_equal 1, entries.total_entries, 'only one developer should be found'
0
+    end
0
+  end
0
+
0
+  def test_paginate_in_named_scope_on_hmt_association
0
+    project = projects(:active_record)
0
+    expected = [replies(:brave)]
0
+    
0
+    assert_queries(2) do
0
+      entries = project.replies.recent.paginate :page => 1, :per_page => 1
0
+      assert_equal expected, entries
0
+      assert_equal 1, entries.total_entries, 'only one reply should be found'
0
+    end
0
+  end
0
+
0
+  def test_paginate_in_named_scope_on_has_many_association
0
+    project = projects(:active_record)
0
+    expected = [topics(:ar)]
0
+    
0
+    assert_queries(2) do
0
+      entries = project.topics.mentions_activerecord.paginate :page => 1, :per_page => 1
0
+      assert_equal expected, entries
0
+      assert_equal 1, entries.total_entries, 'only one topic should be found'
0
+    end
0
+  end
0
 
0
   def test_readonly
0
     assert_nothing_raised { Developer.paginate :readonly => true, :page => 1 }

0
@@ -1,7 +1,6 @@
0
-action_controller:
0
-  id: 2
0
-  name: Active Controller
0
-
0
 active_record:
0
   id: 1
0
   name: Active Record
0
+action_controller:
0
+  id: 2
0
+  name: Active Controller

0
@@ -1,5 +1,7 @@
0
 class Reply < ActiveRecord::Base
0
   belongs_to :topic, :include => [:replies]
0
+
0
+  named_scope :recent, :conditions => ['replies.created_at > ?', 15.minutes.ago]
0
   
0
   validates_presence_of :content
0
 end

0
@@ -1,4 +1,6 @@
0
 class Topic < ActiveRecord::Base
0
   has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
0
   belongs_to :project
0
+
0
+  named_scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
0
 end

0
@@ -55,7 +55,7 @@ class ActiveRecordTestConnector
0
 
0
   def self.prepare(conn)
0
     class << conn
0
-      IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
0
+      IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SHOW FIELDS /]
0
 
0
       def execute_with_counting(sql, name = nil, &block)
0
         $query_count ||= 0