Skip to content
Browse files

Ruby 1.9 compat: attribute methods

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent e781fad commit 240b4c527e7b2b6b57767fcb74b540b50a0a11af @jeremy jeremy committed
Showing with 4 additions and 3 deletions.
  1. +3 −2 activerecord/lib/active_record/attribute_methods.rb
  2. +1 −1 activerecord/test/associations_test.rb
View
5 activerecord/lib/active_record/attribute_methods.rb
@@ -82,9 +82,10 @@ def define_attribute_methods
# Check to see if the method is defined in the model or any of its subclasses that also derive from ActiveRecord.
# Raise DangerousAttributeError if the method is defined by ActiveRecord though.
def instance_method_already_implemented?(method_name)
+ method_name = method_name.to_s
return true if method_name =~ /^id(=$|\?$|$)/
- @_defined_class_methods ||= Set.new(ancestors.first(ancestors.index(ActiveRecord::Base)).collect! { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.flatten)
- @@_defined_activerecord_methods ||= Set.new(ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false))
+ @_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(&:to_s).to_set
+ @@_defined_activerecord_methods ||= (ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false)).map(&:to_s).to_set
raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord" if @@_defined_activerecord_methods.include?(method_name)
@_defined_class_methods.include?(method_name)
end
View
2 activerecord/test/associations_test.rb
@@ -2033,7 +2033,7 @@ def test_join_with_group
end
def test_get_ids
- assert_equal projects(:active_record, :action_controller).map(&:id), developers(:david).project_ids
+ assert_equal projects(:active_record, :action_controller).map(&:id).sort, developers(:david).project_ids.sort
assert_equal [projects(:active_record).id], developers(:jamis).project_ids
end

0 comments on commit 240b4c5

Please sign in to comment.
Something went wrong with that request. Please try again.