diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-08-01 10:53:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-08-01 11:02:15 -0700 |
| commit | 655953cd4899bb5337bae6aad081dd1beab520eb (patch) | |
| tree | 090fe56a876aeb31799cd8d6ff7aae1f8bb1a4de /activerecord/lib/active_record/associations/builder/collection_association.rb | |
| parent | 92ab4d6a8af7654d5d00f3d9047f17106e310118 (diff) | |
| download | rails-655953cd4899bb5337bae6aad081dd1beab520eb.tar.gz rails-655953cd4899bb5337bae6aad081dd1beab520eb.tar.bz2 rails-655953cd4899bb5337bae6aad081dd1beab520eb.zip | |
assert that constants have been set rather than the names
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/collection_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/collection_association.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb index 6cce519494..076fedc1a9 100644 --- a/activerecord/lib/active_record/associations/builder/collection_association.rb +++ b/activerecord/lib/active_record/associations/builder/collection_association.rb @@ -12,7 +12,7 @@ module ActiveRecord::Associations::Builder :after_add, :before_remove, :after_remove, :extend] end - attr_reader :block_extension, :extension_module + attr_reader :block_extension def initialize(*args, &extension) super(*args) @@ -20,7 +20,7 @@ module ActiveRecord::Associations::Builder end def build - wrap_block_extension + define_extensions(model) reflection = super reflection end @@ -30,7 +30,7 @@ module ActiveRecord::Associations::Builder CALLBACKS.each { |callback_name| define_callback(model, callback_name) } end - def wrap_block_extension + def define_extensions(model) if block_extension @extension_module = mod = Module.new(&block_extension) silence_warnings do |