Merge pull request rails#6743 from steveklabnik/remove_composed_of

Removing composed_of

Author: rafaelfranca

activerecord/README.rdoc

@@ -46,18 +46,6 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Associations/ClassMethods.html]
 
 
-* Aggregations of value objects.
-
-   class Account < ActiveRecord::Base
-     composed_of :balance, :class_name => "Money",
-                 :mapping => %w(balance amount)
-     composed_of :address,
-                 :mapping => [%w(address_street street), %w(address_city city)]
-   end
-
-  {Learn more}[link:classes/ActiveRecord/Aggregations/ClassMethods.html]
-
-
 * Validation rules that can differ for new or existing objects.
 
     class Account < ActiveRecord::Base

activerecord/lib/active_record.rb

@@ -36,7 +36,6 @@ module ActiveRecord
     autoload :ConnectionNotEstablished, 'active_record/errors'
     autoload :ConnectionAdapters, 'active_record/connection_adapters/abstract_adapter'
 
-    autoload :Aggregations
     autoload :Associations
     autoload :AttributeMethods
     autoload :AttributeAssignment

activerecord/lib/active_record/aggregations.rb

@@ -132,7 +132,7 @@ def mass_assignment_role
     private
 
     # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
-    # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
+    # by calling new on the column type or aggregation type object with these parameters.
     # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
     # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
     # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum,
@@ -167,7 +167,7 @@ def execute_callstack_for_multiparameter_attributes(callstack)
     end
 
     def read_value_from_parameter(name, values_hash_from_param)
-      klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
+      klass = column_for_attribute(name).klass
       if values_hash_from_param.values.all?{|v|v.nil?}
         nil
       elsif klass == Time

activerecord/lib/active_record/attribute_assignment.rb

@@ -266,7 +266,6 @@ def initialize_dup(other) # :nodoc:
         @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
       end
 
-      @aggregation_cache = {}
       @association_cache = {}
       @attributes_cache  = {}
 
@@ -391,7 +390,6 @@ def init_internals
 
       @attributes[pk] = nil unless @attributes.key?(pk)
 
-      @aggregation_cache       = {}
       @association_cache       = {}
       @attributes_cache        = {}
       @previously_changed      = {}

activerecord/lib/active_record/core.rb

@@ -56,7 +56,7 @@ def initialize(model, name)
       end
 
       def valid?
-        attribute_names.all? { |name| model.columns_hash[name] || model.reflect_on_aggregation(name.to_sym) }
+        attribute_names.all? { |name| model.columns_hash[name] }
       end
 
       def define

activerecord/lib/active_record/dynamic_matchers.rb

@@ -89,7 +89,6 @@ def self.append_features(base)
     include ActiveModel::SecurePassword
     include AutosaveAssociation
     include NestedAttributes
-    include Aggregations
     include Transactions
     include Reflection
     include Serialization

activerecord/lib/active_record/model.rb

@@ -267,7 +267,6 @@ def toggle!(attribute)
     # may do e.g. record.reload(:lock => true) to reload the same record with
     # an exclusive row lock.
     def reload(options = nil)
-      clear_aggregation_cache
       clear_association_cache
 
       fresh_object =