From 61555a0df11f535d46a0a631fbb0d0773613d08e Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 27 Apr 2012 11:52:34 +0100 Subject: allow AssociationProxy#scoped to take options so that API is the same as Base#scoped --- activerecord/lib/active_record/associations/collection_proxy.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 44cbf473a1..ad029d1101 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -61,11 +61,15 @@ module ActiveRecord @association end - def scoped + def scoped(options = nil) association = @association - association.scoped.extending do + scope = association.scoped + + scope.extending! do define_method(:proxy_association) { association } end + scope.merge!(options) if options + scope end def respond_to?(name, include_private = false) -- cgit v1.2.3