Skip to content

Commit

Permalink
bring back old named_scope_patch.rb and delete version-specific ones
Browse files Browse the repository at this point in the history
  • Loading branch information
mislav committed Oct 7, 2008
1 parent de98ac9 commit 0318fff
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 78 deletions.
37 changes: 37 additions & 0 deletions lib/will_paginate/named_scope_patch.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
ActiveRecord::Associations::AssociationProxy.class_eval do
protected
def with_scope(*args, &block)
@reflection.klass.send :with_scope, *args, &block
end
end

[ ActiveRecord::Associations::AssociationCollection,
ActiveRecord::Associations::HasManyThroughAssociation ].each do |klass|
klass.class_eval do
protected
alias :method_missing_without_scopes :method_missing_without_paginate
def method_missing_without_paginate(method, *args, &block)
if @reflection.klass.scopes.include?(method)
@reflection.klass.scopes[method].call(self, *args, &block)
else
method_missing_without_scopes(method, *args, &block)
end
end
end
end

# Rails 1.2.6
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 if ActiveRecord::Base.respond_to? :find_first
54 changes: 0 additions & 54 deletions lib/will_paginate/named_scope_patch_1.2.6.rb

This file was deleted.

24 changes: 0 additions & 24 deletions lib/will_paginate/named_scope_patch_2.0.rb

This file was deleted.

0 comments on commit 0318fff

Please sign in to comment.