Remove some sends

Author: andrewn617

activemodel/lib/active_model/attribute_registration.rb

@@ -50,6 +50,16 @@ def type_for_attribute(attribute_name, &block)
         end
       end
 
+      def apply_pending_attribute_modifications(attribute_set) # :nodoc:
+        if superclass.respond_to?(:apply_pending_attribute_modifications, true)
+          superclass.send(:apply_pending_attribute_modifications, attribute_set)
+        end
+
+        pending_attribute_modifications.each do |modification|
+          modification.apply_to(attribute_set)
+        end
+      end
+
       private
         PendingType = Struct.new(:name, :type) do # :nodoc:
           def apply_to(attribute_set)
@@ -78,16 +88,6 @@ def pending_attribute_modifications
           @pending_attribute_modifications ||= []
         end
 
-        def apply_pending_attribute_modifications(attribute_set)
-          if superclass.respond_to?(:apply_pending_attribute_modifications, true)
-            superclass.send(:apply_pending_attribute_modifications, attribute_set)
-          end
-
-          pending_attribute_modifications.each do |modification|
-            modification.apply_to(attribute_set)
-          end
-        end
-
         def reset_default_attributes
           reset_default_attributes!
           subclasses.each { |subclass| subclass.send(:reset_default_attributes) }

activerecord/lib/active_record/attributes.rb

@@ -258,6 +258,10 @@ def attribute_types # :nodoc:
         model_schema.attribute_types
       end
 
+      def type_for_column(column) # :nodoc:
+        hook_attribute_type(column.name, super)
+      end
+
       ##
       # :method: type_for_attribute
       # :call-seq: type_for_attribute(attribute_name, &block)
@@ -303,10 +307,6 @@ def reset_default_attributes
         def resolve_type_name(name, **options)
           Type.lookup(name, **options, adapter: Type.adapter_name_from(self))
         end
-
-        def type_for_column(column)
-          hook_attribute_type(column.name, super)
-        end
     end
   end
 end

activerecord/lib/active_record/model_schema/schema.rb

@@ -32,7 +32,7 @@ def initialize(model_class, context_key)
 
       # Returns the columns hash for this schema context
       def columns_hash
-        model_class.send(:load_schema) unless @columns_hash
+        model_class.load_schema unless @columns_hash
         @columns_hash
       end
 
@@ -62,11 +62,11 @@ def primary_key
       def _default_attributes
         @default_attributes ||= begin
           attributes_hash = columns_hash.transform_values do |column|
-            ActiveModel::Attribute.from_database(column.name, column.default, model_class.send(:type_for_column, column))
+            ActiveModel::Attribute.from_database(column.name, column.default, model_class.type_for_column(column))
           end
 
           attribute_set = ActiveModel::AttributeSet.new(attributes_hash)
-          model_class.send(:apply_pending_attribute_modifications, attribute_set)
+          model_class.apply_pending_attribute_modifications(attribute_set)
           attribute_set
         end
       end
@@ -81,7 +81,7 @@ def attributes_builder
 
       # Returns column defaults hash
       def column_defaults
-        model_class.send(:load_schema)
+        model_class.load_schema
         @column_defaults ||= _default_attributes.deep_dup.to_hash.freeze
       end