From 6e43fcb33365c66359e6363abdc2d108aef9fd67 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 2 Jul 2013 15:43:29 -0700 Subject: remove private attribute reader --- activerecord/lib/active_record/attribute_methods.rb | 8 ++------ activerecord/test/cases/attribute_methods/read_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index be6d50e542..ff93640814 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -37,7 +37,7 @@ module ActiveRecord # 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 @@ -45,12 +45,8 @@ module ActiveRecord 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 diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb index 8d8ff2f952..6dbebf4b6f 100644 --- a/activerecord/test/cases/attribute_methods/read_test.rb +++ b/activerecord/test/cases/attribute_methods/read_test.rb @@ -56,9 +56,9 @@ module ActiveRecord 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 -- cgit v1.2.3