From 537fe2bf83fba71a4f75b6ed0ad39935d87045be Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 1 Aug 2013 10:06:47 -0700 Subject: remove dependency on @model when defining callbacks --- .../lib/active_record/associations/builder/association.rb | 6 +++--- .../lib/active_record/associations/builder/belongs_to.rb | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 9b304cb5e6..b20347a52a 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -28,7 +28,7 @@ module ActiveRecord::Associations::Builder builder = new(model, name, scope, options, &block) reflection = builder.build builder.define_accessors model.generated_feature_methods - builder.define_callbacks reflection + builder.define_callbacks model, reflection reflection end @@ -69,9 +69,9 @@ module ActiveRecord::Associations::Builder options.assert_valid_keys(valid_options) end - def define_callbacks(reflection) + def define_callbacks(model, reflection) Association.extensions.each do |extension| - extension.build @model, reflection + extension.build model, reflection end end diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb index a4e314b7fb..4e88b50ec5 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -16,10 +16,10 @@ module ActiveRecord::Associations::Builder [:destroy, :delete] end - def define_callbacks(reflection) + def define_callbacks(model, reflection) super - add_counter_cache_callbacks(reflection) if options[:counter_cache] - add_touch_callbacks(reflection) if options[:touch] + add_counter_cache_callbacks(model, reflection) if options[:counter_cache] + add_touch_callbacks(model, reflection) if options[:touch] end def define_accessors(mixin) @@ -74,7 +74,7 @@ module ActiveRecord::Associations::Builder end end - def add_counter_cache_callbacks(reflection) + def add_counter_cache_callbacks(model, reflection) cache_column = reflection.counter_cache_column association = self @@ -120,7 +120,7 @@ module ActiveRecord::Associations::Builder end end - def add_touch_callbacks(reflection) + def add_touch_callbacks(model, reflection) foreign_key = reflection.foreign_key n = name touch = options[:touch] -- cgit v1.2.3