From 17ad71e5141eaa79bfb4aedc2f3a5b4abfa0baba Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 15 Dec 2011 20:21:05 +0000
Subject: [PATCH] Let AttributeMethods do its own including etc

---
 .../lib/active_record/attribute_methods.rb    | 23 +++++++++++++++++++
 activerecord/lib/active_record/base.rb        | 17 --------------
 .../test/cases/attribute_methods/read_test.rb |  6 ++---
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 43ab289bdc..650fa3fc42 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -7,6 +7,29 @@ module ActiveRecord
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
+    included do
+      include Read
+      include Write
+      include BeforeTypeCast
+      include Query
+      include PrimaryKey
+      include TimeZoneConversion
+      include Dirty
+      include Serialization
+      include DeprecatedUnderscoreRead
+
+      # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
+      # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
+      # (Alias for the protected read_attribute method).
+      alias [] read_attribute
+
+      # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
+      # (Alias for the protected write_attribute method).
+      alias []= write_attribute
+
+      public :[], :[]=
+    end
+
     module ClassMethods
       # Generates all the attribute related methods for columns in the database
       # accessors, mutators and query methods.
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f5a01adebf..819c616927 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -696,12 +696,6 @@ module ActiveRecord #:nodoc:
     extend CounterCache
     include Locking::Optimistic, Locking::Pessimistic
     include AttributeMethods
-    include AttributeMethods::Read, AttributeMethods::Write, AttributeMethods::BeforeTypeCast, AttributeMethods::Query
-    include AttributeMethods::PrimaryKey
-    include AttributeMethods::TimeZoneConversion
-    include AttributeMethods::Dirty
-    include AttributeMethods::Serialization
-    include AttributeMethods::DeprecatedUnderscoreRead
     include Callbacks, ActiveModel::Observing, Timestamp
     include Associations, NamedScope
     include IdentityMap
@@ -712,17 +706,6 @@ module ActiveRecord #:nodoc:
     # #save_with_autosave_associations to be wrapped inside a transaction.
     include AutosaveAssociation, NestedAttributes
     include Aggregations, Transactions, Reflection, Serialization, Store
-
-    # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
-    # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
-    # (Alias for the protected read_attribute method).
-    alias [] read_attribute
-
-    # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
-    # (Alias for the protected write_attribute method).
-    alias []= write_attribute
-
-    public :[], :[]=
   end
 end
 
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index e03ed33591..86a240d93c 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -14,8 +14,9 @@ module ActiveRecord
 
       def setup
         @klass = Class.new do
+          def self.base_class; self; end
+
           include ActiveRecord::AttributeMethods
-          include ActiveRecord::AttributeMethods::Read
 
           def self.column_names
             %w{ one two three }
@@ -33,9 +34,6 @@ module ActiveRecord
               [name, FakeColumn.new(name)]
             }]
           end
-
-          def self.serialized_attributes; {}; end
-          def self.base_class; self; end
         end
       end