From 3d5cb007ad9b3a6ce1e59fa03d9b72c662395b67 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 2 Jul 2014 03:50:02 +0000
Subject: [PATCH] Merged r13115 and r13171 from trunk to 2.5-stable (#16194)

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13204 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/initializers/10-patches.rb      | 24 ++++++++++
 test/unit/initializers/patches_test.rb | 61 ++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 881206c9e..7247d52a1 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -203,6 +203,30 @@ module ActionController
   end
 end
 
+if Rails::VERSION::MAJOR < 4 && RUBY_VERSION >= "2.1"
+  module ActiveSupport
+    class HashWithIndifferentAccess
+      def select(*args, &block)
+        dup.tap { |hash| hash.select!(*args, &block) }
+      end
+
+      def reject(*args, &block)
+        dup.tap { |hash| hash.reject!(*args, &block) }
+      end
+    end
+
+    class OrderedHash
+      def select(*args, &block)
+        dup.tap { |hash| hash.select!(*args, &block) }
+      end
+
+      def reject(*args, &block)
+        dup.tap { |hash| hash.reject!(*args, &block) }
+      end
+    end
+  end
+end
+
 require 'awesome_nested_set/version'
 
 module CollectiveIdea
diff --git a/test/unit/initializers/patches_test.rb b/test/unit/initializers/patches_test.rb
index c2fc0777b..ac4b12b43 100644
--- a/test/unit/initializers/patches_test.rb
+++ b/test/unit/initializers/patches_test.rb
@@ -22,6 +22,16 @@ class PatchesTest < ActiveSupport::TestCase
 
   def setup
     Setting.default_language = 'en'
+    @symbols = { :a => 1, :b => 2 }
+    @keys = %w( blue green red pink orange )
+    @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
+    @hash = Hash.new
+    @ordered_hash = ActiveSupport::OrderedHash.new
+
+    @keys.each_with_index do |key, index|
+      @hash[key] = @values[index]
+      @ordered_hash[key] = @values[index]
+    end
   end
 
   test "ActiveRecord::Base.human_attribute_name should transform name to field_name" do
@@ -35,4 +45,55 @@ class PatchesTest < ActiveSupport::TestCase
   test "ActiveRecord::Base.human_attribute_name should default to humanized value if no translation has been found (useful for custom fields)" do
     assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
   end
+
+  # https://github.com/rails/rails/pull/14198/files
+  if RUBY_VERSION >= "1.9"
+    def test_indifferent_select
+      hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { |_ ,v| v == 1 }
+      assert_equal({ 'a' => 1 }, hash)
+      assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
+                            Hash : ActiveSupport::HashWithIndifferentAccess),
+                          hash
+    end
+
+    def test_indifferent_select_bang
+      indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+      indifferent_strings.select! { |_, v| v == 1 }
+      assert_equal({ 'a' => 1 }, indifferent_strings)
+      assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
+    end
+  end
+
+  def test_indifferent_reject
+    hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).reject { |_, v| v != 1 }
+    assert_equal({ 'a' => 1 }, hash)
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
+  end
+
+  def test_indifferent_reject_bang
+    indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+    indifferent_strings.reject! { |_, v| v != 1 }
+    assert_equal({ 'a' => 1 }, indifferent_strings)
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
+  end
+
+  if RUBY_VERSION >= "1.9"
+    def test_select
+      assert_equal @keys, @ordered_hash.select { true }.map(&:first)
+      new_ordered_hash = @ordered_hash.select { true }
+      assert_equal @keys, new_ordered_hash.map(&:first)
+      assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
+                            Hash : ActiveSupport::OrderedHash),
+                          new_ordered_hash
+    end
+  end
+
+  def test_reject
+    copy = @ordered_hash.dup
+    new_ordered_hash = @ordered_hash.reject { |k, _| k == 'pink' }
+    assert_equal copy, @ordered_hash
+    assert !new_ordered_hash.keys.include?('pink')
+    assert @ordered_hash.keys.include?('pink')
+    assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
+  end
 end
-- 
2.39.5