From 2bcb2443a9e2140e29799229d6c63a046e149597 Mon Sep 17 00:00:00 2001
From: Douglas F Shearer <dougal.s@gmail.com>
Date: Thu, 7 May 2009 23:58:07 +0100
Subject: [PATCH] ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash
 instead of a Hash.

[#2615 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/ordered_hash.rb | 10 ++++++++++
 activesupport/test/ordered_hash_test.rb          |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 33fd2a29b928..8d1c0f51601e 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -10,6 +10,16 @@ def initialize(*args, &block)
         @keys = []
       end
 
+      def self.[](*args)
+        ordered_hash = new
+        args.each_with_index { |val,ind|
+          # Only every second value is a key.
+          next if ind % 2 != 0
+          ordered_hash[val] = args[ind + 1]
+        }
+        ordered_hash
+      end
+
       def initialize_copy(other)
         super
         # make a deep copy of keys
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 6fccbbdc4136..647938dd87ae 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -162,4 +162,10 @@ def test_keys
   def test_inspect
     assert @ordered_hash.inspect.include?(@hash.inspect)
   end
+
+  def test_alternate_initialization
+    alternate = ActiveSupport::OrderedHash[1,2,3,4]
+    assert_kind_of ActiveSupport::OrderedHash, alternate
+    assert_equal [1, 3], alternate.keys
+  end
 end