diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-09-12 22:12:12 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-09-13 00:01:58 +0100 |
commit | ac687ed651773fccecbc22cd6d8b07d5439ceb76 (patch) | |
tree | eba4a000c8053dbe32f648d6042a494a2d16095f /activerecord/lib | |
parent | cf115d2f8ef48764e095aa453f729b60705088f1 (diff) | |
download | rails-ac687ed651773fccecbc22cd6d8b07d5439ceb76.tar.gz rails-ac687ed651773fccecbc22cd6d8b07d5439ceb76.tar.bz2 rails-ac687ed651773fccecbc22cd6d8b07d5439ceb76.zip |
Let Ruby deal with method visibility.
Check respond_to_without_attributes? in method_missing. If there is any
method that responds (even private), let super handle it and raise
NoMethodError if necessary.
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index a8cb89fb65..8d7eb4a48d 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -61,14 +61,17 @@ module ActiveRecord end end - def method_missing(method_id, *args, &block) - # If we haven't generated any methods yet, generate them, then - # see if we've created the method we're looking for. - if !self.class.attribute_methods_generated? + # If we haven't generated any methods yet, generate them, then + # see if we've created the method we're looking for. + def method_missing(method, *args, &block) + unless self.class.attribute_methods_generated? self.class.define_attribute_methods - method_name = method_id.to_s - guard_private_attribute_method!(method_name, args) - send(method_id, *args, &block) + + if respond_to_without_attributes?(method) + send(method, *args, &block) + else + super + end else super end |