From 1c06bd17a9faf0ad05bf0336eea4d219c0960bbc Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Mon, 1 Jul 2013 22:33:42 -0300
Subject: [PATCH] Remove deprecated Array#uniq_by and Array#uniq_by!

Use native Array#uniq and Array#uniq! instead.
---
 activesupport/CHANGELOG.md                    |  5 ++++
 .../lib/active_support/core_ext/array.rb      |  1 -
 .../active_support/core_ext/array/uniq_by.rb  | 19 ------------
 activesupport/test/core_ext/array_ext_test.rb | 30 -------------------
 4 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/array/uniq_by.rb

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index cce0582a0b..bd3d20d0f9 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Remove deprecated `Array#uniq_by` and `Array#uniq_by!`, use native
+    `Array#uniq` and `Array#uniq!` instead.
+
+    *Carlos Antonio da Silva*
+
 *   Remove deprecated `ActiveSupport::BasicObject`, use `ActiveSupport::ProxyObject` instead.
 
     *Carlos Antonio da Silva*
diff --git a/activesupport/lib/active_support/core_ext/array.rb b/activesupport/lib/active_support/core_ext/array.rb
index 79ba79192a..7d0c1e4c8d 100644
--- a/activesupport/lib/active_support/core_ext/array.rb
+++ b/activesupport/lib/active_support/core_ext/array.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/array/access'
-require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/grouping'
diff --git a/activesupport/lib/active_support/core_ext/array/uniq_by.rb b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
deleted file mode 100644
index 23573c97de..0000000000
--- a/activesupport/lib/active_support/core_ext/array/uniq_by.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Array
-  # *DEPRECATED*: Use <tt>Array#uniq</tt> instead.
-  #
-  # Returns a unique array based on the criteria in the block.
-  #
-  #   [1, 2, 3, 4].uniq_by { |i| i.odd? } # => [1, 2]
-  def uniq_by(&block)
-    ActiveSupport::Deprecation.warn 'uniq_by is deprecated. Use Array#uniq instead'
-    uniq(&block)
-  end
-
-  # *DEPRECATED*: Use <tt>Array#uniq!</tt> instead.
-  #
-  # Same as +uniq_by+, but modifies +self+.
-  def uniq_by!(&block)
-    ActiveSupport::Deprecation.warn 'uniq_by! is deprecated. Use Array#uniq! instead'
-    uniq!(&block)
-  end
-end
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 384064d81f..6cd0eb39b7 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -359,36 +359,6 @@ class ArrayExtractOptionsTests < ActiveSupport::TestCase
   end
 end
 
-class ArrayUniqByTests < ActiveSupport::TestCase
-  def test_uniq_by
-    ActiveSupport::Deprecation.silence do
-      assert_equal [1,2], [1,2,3,4].uniq_by { |i| i.odd? }
-      assert_equal [1,2], [1,2,3,4].uniq_by(&:even?)
-      assert_equal((-5..0).to_a, (-5..5).to_a.uniq_by{ |i| i**2 })
-    end
-  end
-
-  def test_uniq_by!
-    a = [1,2,3,4]
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i.odd? }
-    end
-    assert_equal [1,2], a
-
-    a = [1,2,3,4]
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i.even? }
-    end
-    assert_equal [1,2], a
-
-    a = (-5..5).to_a
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i**2 }
-    end
-    assert_equal((-5..0).to_a, a)
-  end
-end
-
 class ArrayWrapperTests < ActiveSupport::TestCase
   class FakeCollection
     def to_ary