Merge remote branch 'mainstream/master'

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb

1 files changed, 35 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
new file mode 100644
index 0000000000..890f465ce1
--- /dev/null
+++ b/activesupport/lib/active_support/configurable.rb
@@ -0,0 +1,35 @@
+require "active_support/concern"
+
+module ActiveSupport
+  module Configurable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def get_config
+        module_parts = name.split("::")
+        modules = [Object]
+        module_parts.each {|name| modules.push modules.last.const_get(name) }
+        modules.reverse_each do |mod|
+          return mod.const_get(:DEFAULT_CONFIG) if const_defined?(:DEFAULT_CONFIG)
+        end
+        {}
+      end
+      
+      def config
+        self.config = get_config unless @config
+        @config
+      end
+
+      def config=(hash)
+        @config = ActiveSupport::OrderedOptions.new
+        hash.each do |key, value|
+          @config[key] = value
+        end
+      end
+    end
+
+    def config
+      self.class.config
+    end
+  end
+end
\ No newline at end of file