From 664090348154ccbf1274a13bbc3d3c37ba35bc7d Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 17:18:01 -0800
Subject: Move InheritableOptions into ActiveSupport

---
 actionpack/lib/action_controller/metal.rb           | 8 --------
 activesupport/lib/active_support/ordered_options.rb | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index fbc8a9a15e..1f6bbeb7c5 100644
--- 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
index 596a7b757d..61ccb79211 100644
--- a/activesupport/lib/active_support/ordered_options.rb
+++ b/activesupport/lib/active_support/ordered_options.rb
@@ -18,4 +18,10 @@ module ActiveSupport #:nodoc:
       end
     end
   end
+
+  class InheritableOptions < OrderedOptions
+    def initialize(parent)
+      super() { |h,k| parent[k] }
+    end
+  end
 end
-- 
cgit v1.2.3