diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-18 17:57:19 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-19 08:30:45 -0700 |
| commit | 1856e975c380920b5d4a67e903ed7c96624fd27b (patch) | |
| tree | e3d0bf34b0bebf16cfac0513731c27609b3b441e /activerecord | |
| parent | de3603c2552df3d7bb37be2d810aa719fbf7b94f (diff) | |
| download | rails-1856e975c380920b5d4a67e903ed7c96624fd27b.tar.gz rails-1856e975c380920b5d4a67e903ed7c96624fd27b.tar.bz2 rails-1856e975c380920b5d4a67e903ed7c96624fd27b.zip | |
"instance_methods" includes public and protected
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 7297af9f79..67f70c434e 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -18,7 +18,7 @@ module ActiveRecord # method is defined by Active Record though. def instance_method_already_implemented?(method_name) method_name = method_name.to_s - @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.map {|m| m.to_s }.to_set + @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.instance_methods(false) | m.private_instance_methods(false) }.map {|m| m.to_s }.to_set @@_defined_activerecord_methods ||= defined_activerecord_methods raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord" if @@_defined_activerecord_methods.include?(method_name) @_defined_class_methods.include?(method_name) |