diff options
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index 652c167ca1..04e017a92a 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -14,9 +14,13 @@ module ActiveRecord::Associations::Builder attr_reader :block_extension - def initialize(*args, &extension) + def initialize(*args) super(*args) - @block_extension = extension + @mod = nil + if block_given? + @mod = Module.new(&Proc.new) + @scope = wrap_scope @scope, @mod + end end def build @@ -31,19 +35,9 @@ module ActiveRecord::Associations::Builder end def define_extensions(model) - if block_extension - mod = Module.new(&block_extension) + if @mod extension_module_name = "#{model.name.demodulize}#{name.to_s.camelize}AssociationExtension" - - model.parent.const_set(extension_module_name, mod) - - prev_scope = @scope - - if prev_scope - @scope = proc { |owner| instance_exec(owner, &prev_scope).extending(mod) } - else - @scope = proc { extending(mod) } - end + model.parent.const_set(extension_module_name, @mod) end end @@ -86,5 +80,17 @@ module ActiveRecord::Associations::Builder end CODE end + + private + + def wrap_scope(scope, mod) + prev_scope = scope + + if prev_scope + proc { |owner| instance_exec(owner, &prev_scope).extending(mod) } + else + proc { extending(mod) } + end + end end end |