Duplicate AS code no longer needed

railties/lib/rails/configuration.rb

@@ -1,5 +1,6 @@
 require 'rails/plugin/loader'
 require 'rails/plugin/locator'
+require 'active_support/ordered_options'
 
 module Rails
   class Configuration
@@ -23,9 +24,9 @@ module Rails
       @serve_static_assets          = true
 
       for framework in frameworks
-        self.send("#{framework}=", Rails::OrderedOptions.new)
+        self.send("#{framework}=", ActiveSupport::OrderedOptions.new)
       end
-      self.active_support = Rails::OrderedOptions.new
+      self.active_support = ActiveSupport::OrderedOptions.new
     end
 
     def after_initialize(&blk)
@@ -218,7 +219,7 @@ module Rails
 
     def i18n
       @i18n ||= begin
-        i18n = Rails::OrderedOptions.new
+        i18n = ActiveSupport::OrderedOptions.new
         i18n.load_path = []
 
         if File.exist?(File.join(root, 'config', 'locales'))

railties/lib/rails/core.rb

@@ -70,36 +70,4 @@ module Rails
       @@public_path = path
     end
   end
-
-  class OrderedOptions < Array #:nodoc:
-    def []=(key, value)
-      key = key.to_sym
-
-      if pair = find_pair(key)
-        pair.pop
-        pair << value
-      else
-        self << [key, value]
-      end
-    end
-
-    def [](key)
-      pair = find_pair(key.to_sym)
-      pair ? pair.last : nil
-    end
-
-    def method_missing(name, *args)
-      if name.to_s =~ /(.*)=$/
-        self[$1.to_sym] = args.first
-      else
-        self[name]
-      end
-    end
-
-  private
-    def find_pair(key)
-      self.each { |i| return i if i.first == key }
-      return false
-    end
-  end
 end