Permalink
Browse files

remove private attribute reader

  • Loading branch information...
1 parent b670d79 commit 6e43fcb33365c66359e6363abdc2d108aef9fd67 @tenderlove tenderlove committed Jul 2, 2013
View
8 activerecord/lib/active_record/attribute_methods.rb
@@ -37,20 +37,16 @@ def define_attribute_methods # :nodoc:
# Use a mutex; we don't want two thread simultaneously trying to define
# attribute methods.
generated_attribute_methods.synchronize do
- return false if attribute_methods_generated?
+ return false if @attribute_methods_generated
superclass.define_attribute_methods unless self == base_class
super(column_names)
@attribute_methods_generated = true
end
true
end
- def attribute_methods_generated? # :nodoc:
- @attribute_methods_generated
- end
-
def undefine_attribute_methods # :nodoc:
- super if attribute_methods_generated?
+ super if @attribute_methods_generated
@attribute_methods_generated = false
end
View
4 activerecord/test/cases/attribute_methods/read_test.rb
@@ -56,9 +56,9 @@ def test_define_attribute_methods
end
def test_attribute_methods_generated?
- assert(!@klass.attribute_methods_generated?, 'attribute_methods_generated?')
+ assert_not @klass.method_defined?(:one)
@klass.define_attribute_methods
- assert(@klass.attribute_methods_generated?, 'attribute_methods_generated?')
+ assert @klass.method_defined?(:one)
end
end
end

0 comments on commit 6e43fcb

Please sign in to comment.