New named scope patches for 2.0.4 and 1.2.6. Change rake test_all to …

…use 2.0.4 vs 2.0.2. Add an empty setup ArrayPaginationTest so that fixtures are not loaded for this case in 1.2.6 tests.

lib/will_paginate/named_scope_patch_1.2.6.rb

@@ -0,0 +1,54 @@
+
+ActiveRecord::Associations::HasManyAssociation.class_eval do
+  protected
+  def method_missing(method, *args, &block)
+    if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
+      super
+    elsif @reflection.klass.scopes.include?(method)
+      @reflection.klass.scopes[method].call(self, *args)
+    else
+      create_scoping = {}
+      set_belongs_to_association_for(create_scoping)
+
+      @reflection.klass.with_scope(
+        :create => create_scoping,
+        :find => {
+          :conditions => @finder_sql, 
+          :joins      => @join_sql, 
+          :readonly   => false
+        }
+      ) do
+        @reflection.klass.send(method, *args, &block)
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
+  protected
+  def method_missing(method, *args, &block)
+    if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
+      super
+    elsif @reflection.klass.scopes.include?(method)
+      @reflection.klass.scopes[method].call(self, *args)
+    else
+      @reflection.klass.with_scope(construct_scope) { @reflection.klass.send(method, *args, &block) }
+    end
+  end
+end
+
+ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
+  protected
+  def method_missing(method, *args, &block)
+    if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
+      super
+    elsif @reflection.klass.scopes.include?(method)
+      @reflection.klass.scopes[method].call(self, *args)
+    else
+      @reflection.klass.with_scope(:find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false }) do
+        @reflection.klass.send(method, *args, &block)
+      end
+    end
+  end
+end
+

lib/will_paginate/named_scope_patch_2.0.rb

@@ -0,0 +1,24 @@
+
+ActiveRecord::Associations::AssociationCollection.class_eval do
+  protected
+  def method_missing(method, *args)
+    if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
+      if block_given?
+        super { |*block_args| yield(*block_args) }
+      else
+        super
+      end
+    elsif @reflection.klass.scopes.include?(method)
+      @reflection.klass.scopes[method].call(self, *args)
+    else          
+      with_scope(construct_scope) do
+        if block_given?
+          @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) }
+        else
+          @reflection.klass.send(method, *args)
+        end
+      end
+    end
+  end
+end
+

test/collection_test.rb

@@ -2,6 +2,9 @@
 require 'will_paginate/array'
 
 class ArrayPaginationTest < Test::Unit::TestCase
+
+  def setup ; end
+
   def test_simple
     collection = ('a'..'e').to_a
 

test/tasks.rake

@@ -35,7 +35,7 @@ task :test_full => %w(test test_mysql test_postgres)
 desc %{Test everything with Rails 2.1.x, 2.0.x & 1.2.x gems}
 task :test_all do
   all = Rake::Task['test_full']
-  versions = %w(2.1.0 2.0.2 1.2.6)
+  versions = %w(2.1.0 2.0.4 1.2.6)
   versions.each do |version|
     ENV['RAILS_VERSION'] = "~> #{version}"
     all.invoke