Simplify AR configuration code.

Get rid of ActiveModel::Configuration, make better use of
ActiveSupport::Concern + class_attribute, etc.

7 files changed, 8 insertions, 302 deletions

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index ded1b752df..f6bacf5ec0 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -30,7 +30,6 @@ module ActiveModel
   autoload :AttributeMethods
   autoload :BlockValidator, 'active_model/validator'
   autoload :Callbacks
-  autoload :Configuration
   autoload :Conversion
   autoload :Dirty
   autoload :EachValidator, 'active_model/validator'
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 846d0d7f86..b5b50847c2 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -61,8 +61,7 @@ module ActiveModel
     CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
 
     included do
-      extend ActiveModel::Configuration
-      config_attribute :attribute_method_matchers
+      class_attribute :attribute_method_matchers, instance_writer: false
       self.attribute_method_matchers = [ClassMethods::AttributeMethodMatcher.new]
     end
 
diff --git a/activemodel/lib/active_model/configuration.rb b/activemodel/lib/active_model/configuration.rb
deleted file mode 100644
index ba5a6a2075..0000000000
--- a/activemodel/lib/active_model/configuration.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'active_support/concern'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/class/attribute_accessors'
-
-module ActiveModel
-  # This API is for Rails' internal use and is not currently considered 'public', so
-  # it may change in the future without warning.
-  #
-  # It creates configuration attributes that can be inherited from a module down
-  # to a class that includes the module. E.g.
-  #
-  #   module MyModel
-  #     extend ActiveModel::Configuration
-  #     config_attribute :awesome
-  #     self.awesome = true
-  #   end
-  #
-  #   class Post
-  #     include MyModel
-  #   end
-  #
-  #   Post.awesome # => true
-  #
-  #   Post.awesome = false
-  #   Post.awesome    # => false
-  #   MyModel.awesome # => true
-  #
-  # We assume that the module will have a ClassMethods submodule containing methods
-  # to be transferred to the including class' singleton class.
-  #
-  # Config options can also be defined directly on a class:
-  #
-  #   class Post
-  #     extend ActiveModel::Configuration
-  #     config_attribute :awesome
-  #   end
-  #
-  # So this allows us to define a module that doesn't care about whether it is being
-  # included in a class or a module:
-  #
-  #   module Awesomeness
-  #     extend ActiveSupport::Concern
-  #
-  #     included do
-  #       extend ActiveModel::Configuration
-  #       config_attribute :awesome
-  #       self.awesome = true
-  #     end
-  #   end
-  #
-  #   class Post
-  #     include Awesomeness
-  #   end
-  #
-  #   module AwesomeModel
-  #     include Awesomeness
-  #   end
-  module Configuration #:nodoc:
-    def config_attribute(name, options = {})
-      klass = self.is_a?(Class) ? ClassAttribute : ModuleAttribute
-      klass.new(self, name, options).define
-    end
-
-    class Attribute
-      attr_reader :host, :name, :options
-
-      def initialize(host, name, options)
-        @host, @name, @options = host, name, options
-      end
-
-      def instance_writer?
-        options.fetch(:instance_writer, false)
-      end
-    end
-
-    class ClassAttribute < Attribute
-      def define
-        if options[:global]
-          host.cattr_accessor name, :instance_writer => instance_writer?
-        else
-          host.class_attribute name, :instance_writer => instance_writer?
-        end
-      end
-    end
-
-    class ModuleAttribute < Attribute
-      def class_methods
-        @class_methods ||= begin
-          if host.const_defined?(:ClassMethods, false)
-            host.const_get(:ClassMethods)
-          else
-            host.const_set(:ClassMethods, Module.new)
-          end
-        end
-      end
-
-      def define
-        host.singleton_class.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          attr_accessor :#{name}
-          def #{name}?; !!#{name}; end
-        CODE
-
-        name, host = self.name, self.host
-
-        class_methods.class_eval do
-          define_method(name) { host.send(name) }
-          define_method("#{name}?") { !!send(name) }
-        end
-
-        host.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{name};  defined?(@#{name}) ? @#{name} : self.class.#{name}; end
-          def #{name}?; !!#{name}; end
-        CODE
-
-        if options[:global]
-          class_methods.class_eval do
-            define_method("#{name}=") { |val| host.send("#{name}=", val) }
-          end
-        else
-          class_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
-            def #{name}=(val)
-              singleton_class.class_eval do
-                remove_possible_method(:#{name})
-                define_method(:#{name}) { val }
-              end
-            end
-          CODE
-        end
-
-        host.send(:attr_writer, name) if instance_writer?
-      end
-    end
-  end
-end
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb
index cfce1542b1..8f2c0bf00a 100644
--- a/activemodel/lib/active_model/mass_assignment_security.rb
+++ b/activemodel/lib/active_model/mass_assignment_security.rb
@@ -9,13 +9,11 @@ module ActiveModel
     extend ActiveSupport::Concern
 
     included do
-      extend ActiveModel::Configuration
+      class_attribute :_accessible_attributes, instance_writer: false
+      class_attribute :_protected_attributes,  instance_writer: false
+      class_attribute :_active_authorizer,     instance_writer: false
 
-      config_attribute :_accessible_attributes
-      config_attribute :_protected_attributes
-      config_attribute :_active_authorizer
-
-      config_attribute :_mass_assignment_sanitizer
+      class_attribute :_mass_assignment_sanitizer, instance_writer: false
       self.mass_assignment_sanitizer = :logger
     end
 
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index e668b4a009..b4baf3a946 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -10,9 +10,8 @@ module ActiveModel
 
       included do
         extend ActiveModel::Naming
-        extend ActiveModel::Configuration
 
-        config_attribute :include_root_in_json
+        class_attribute :include_root_in_json
         self.include_root_in_json = false
       end
 
@@ -106,4 +105,4 @@ module ActiveModel
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 611e9ffd55..06eebf79d9 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -52,8 +52,7 @@ module ActiveModel
       attr_accessor :validation_context
       define_callbacks :validate, :scope => :name
 
-      extend ActiveModel::Configuration
-      config_attribute :_validators
+      class_attribute :_validators
       self._validators = Hash.new { |h,k| h[k] = [] }
     end
 
diff --git a/activemodel/test/cases/configuration_test.rb b/activemodel/test/cases/configuration_test.rb
deleted file mode 100644
index a172fa26a3..0000000000
--- a/activemodel/test/cases/configuration_test.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'cases/helper'
-
-class ConfigurationOnModuleTest < ActiveModel::TestCase
-  def setup
-    @mod = mod = Module.new do
-      extend ActiveSupport::Concern
-      extend ActiveModel::Configuration
-
-      config_attribute :omg
-      self.omg = "default"
-
-      config_attribute :wtf, global: true
-      self.wtf = "default"
-
-      config_attribute :boolean
-
-      config_attribute :lol, instance_writer: true
-    end
-
-    @klass = Class.new do
-      include mod
-    end
-
-    @subklass = Class.new(@klass)
-  end
-
-  test "default" do
-    assert_equal "default", @mod.omg
-    assert_equal "default", @klass.omg
-    assert_equal "default", @klass.new.omg
-  end
-
-  test "setting" do
-    @mod.omg = "lol"
-    assert_equal "lol", @mod.omg
-  end
-
-  test "setting on class including the module" do
-    @klass.omg = "lol"
-    assert_equal "lol", @klass.omg
-    assert_equal "lol", @klass.new.omg
-    assert_equal "default", @mod.omg
-  end
-
-  test "setting on subclass of class including the module" do
-    @subklass.omg = "lol"
-    assert_equal "lol", @subklass.omg
-    assert_equal "default", @klass.omg
-    assert_equal "default", @mod.omg
-  end
-
-  test "setting on instance" do
-    assert !@klass.new.respond_to?(:omg=)
-
-    @klass.lol = "lol"
-    obj = @klass.new
-    assert_equal "lol", obj.lol
-    obj.lol = "omg"
-    assert_equal "omg", obj.lol
-    assert_equal "lol", @klass.lol
-    assert_equal "lol", @klass.new.lol
-    obj.lol = false
-    assert !obj.lol?
-  end
-
-  test "global attribute" do
-    assert_equal "default", @mod.wtf
-    assert_equal "default", @klass.wtf
-
-    @mod.wtf = "wtf"
-
-    assert_equal "wtf", @mod.wtf
-    assert_equal "wtf", @klass.wtf
-
-    @klass.wtf = "lol"
-
-    assert_equal "lol", @mod.wtf
-    assert_equal "lol", @klass.wtf
-  end
-
-  test "boolean" do
-    assert_equal false, @mod.boolean?
-    assert_equal false, @klass.new.boolean?
-    @mod.boolean = true
-    assert_equal true, @mod.boolean?
-    assert_equal true, @klass.new.boolean?
-  end
-end
-
-class ConfigurationOnClassTest < ActiveModel::TestCase
-  def setup
-    @klass = Class.new do
-      extend ActiveModel::Configuration
-
-      config_attribute :omg
-      self.omg = "default"
-
-      config_attribute :wtf, global: true
-      self.wtf = "default"
-
-      config_attribute :omg2, instance_writer: true
-      config_attribute :wtf2, instance_writer: true, global: true
-    end
-
-    @subklass = Class.new(@klass)
-  end
-
-  test "defaults" do
-    assert_equal "default", @klass.omg
-    assert_equal "default", @klass.wtf
-    assert_equal "default", @subklass.omg
-    assert_equal "default", @subklass.wtf
-  end
-
-  test "changing" do
-    @klass.omg = "lol"
-    assert_equal "lol", @klass.omg
-    assert_equal "lol", @subklass.omg
-  end
-
-  test "changing in subclass" do
-    @subklass.omg = "lol"
-    assert_equal "lol", @subklass.omg
-    assert_equal "default", @klass.omg
-  end
-
-  test "changing global" do
-    @klass.wtf = "wtf"
-    assert_equal "wtf", @klass.wtf
-    assert_equal "wtf", @subklass.wtf
-
-    @subklass.wtf = "lol"
-    assert_equal "lol", @klass.wtf
-    assert_equal "lol", @subklass.wtf
-  end
-
-  test "instance_writer" do
-    obj = @klass.new
-
-    @klass.omg2 = "omg"
-    @klass.wtf2 = "wtf"
-
-    assert_equal "omg", obj.omg2
-    assert_equal "wtf", obj.wtf2
-
-    obj.omg2 = "lol"
-    obj.wtf2 = "lol"
-
-    assert_equal "lol", obj.omg2
-    assert_equal "lol", obj.wtf2
-    assert_equal "omg", @klass.omg2
-    assert_equal "lol", @klass.wtf2
-  end
-end