Move InheritableOptions into ActiveSupport

rails · Mar 3, 2010 · 6640903 · 6640903
1 parent bf9913f
commit 6640903
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
@@ -1,14 +1,6 @@
 require 'active_support/core_ext/class/attribute'
 require 'active_support/ordered_options'
 
-module ActiveSupport
-  class InheritableOptions < OrderedOptions
-    def initialize(parent)
-      super() { |h,k| parent[k] }
-    end
-  end
-end
-
 module ActionController
   # ActionController::Metal provides a way to get a valid Rack application from a controller.
   #

diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
@@ -18,4 +18,10 @@ def method_missing(name, *args)
       end
     end
   end
+
+  class InheritableOptions < OrderedOptions
+    def initialize(parent)
+      super() { |h,k| parent[k] }
+    end
+  end
 end