Merge pull request rails#49972 from rails/revert-44534-active_model-before_type_cast

Revert "Port `BeforeTypeCast` to Active Model"

Author: rafaelfranca

activemodel/CHANGELOG.md

@@ -1,24 +1,3 @@
-*   Port the `BeforeTypeCast` module to Active Model. Classes that include
-    `ActiveModel::Attributes` will now automatically define methods such as
-    `*_before_type_cast`, `*_for_database`, etc. These methods behave the same
-    for Active Model as they do for Active Record.
-
-      ```ruby
-      class MyModel
-        include ActiveModel::Attributes
-
-        attribute :my_attribute, :integer
-      end
-
-      m = MyModel.new
-      m.my_attribute = "123"
-      m.my_attribute                                   # => 123
-      m.my_attribute_before_type_cast                  # => "123"
-      m.read_attribute_before_type_cast(:my_attribute) # => "123"
-      ```
-
-    *Jonathan Hefner*
-
 *   Port the `type_for_attribute` method to Active Model. Classes that include
     `ActiveModel::Attributes` will now provide this method. This method behaves
     the same for Active Model as it does for Active Record.

activemodel/lib/active_model.rb

@@ -39,7 +39,6 @@ module ActiveModel
   autoload :AttributeAssignment
   autoload :AttributeMethods
   autoload :AttributeRegistration
-  autoload :BeforeTypeCast
   autoload :BlockValidator, "active_model/validator"
   autoload :Callbacks
   autoload :Conversion

activemodel/lib/active_model/attribute_methods.rb

@@ -376,10 +376,6 @@ def aliases_by_attribute_name # :nodoc:
         @aliases_by_attribute_name ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      def resolve_attribute_name(name) # :nodoc:
-        attribute_aliases.fetch(super, &:itself)
-      end
-
       private
         def inherited(base) # :nodoc:
           super
@@ -388,6 +384,10 @@ def inherited(base) # :nodoc:
           end
         end
 
+        def resolve_attribute_name(name)
+          attribute_aliases.fetch(super, &:itself)
+        end
+
         def generated_attribute_methods
           @generated_attribute_methods ||= Module.new.tap { |mod| include mod }
         end

activemodel/lib/active_model/attribute_registration.rb

@@ -55,10 +55,6 @@ def type_for_attribute(attribute_name, &block)
         end
       end
 
-      def resolve_attribute_name(name) # :nodoc:
-        name.to_s
-      end
-
       private
         PendingType = Struct.new(:name, :type) do # :nodoc:
           def apply_to(attribute_set)
@@ -107,6 +103,10 @@ def reset_default_attributes!
           @attribute_types = nil
         end
 
+        def resolve_attribute_name(name)
+          name.to_s
+        end
+
         def resolve_type_name(name, **options)
           Type.lookup(name, **options)
         end

activemodel/lib/active_model/attributes.rb

@@ -31,7 +31,6 @@ module Attributes
     extend ActiveSupport::Concern
     include ActiveModel::AttributeRegistration
     include ActiveModel::AttributeMethods
-    include ActiveModel::BeforeTypeCast
 
     included do
       attribute_method_suffix "=", parameters: "value"