kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove deprecated Array#uniq_by and Array#uniq_by!

Browse source 
Use native Array#uniq and Array#uniq! instead.
This commit is contained in:
Carlos Antonio da Silva 2013-07-01 22:33:42 -03:00
parent cad3a13086
commit 1c06bd17a9
4 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activesupport/CHANGELOG.md
View file

@ -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. * Remove deprecated `ActiveSupport::BasicObject`, use `ActiveSupport::ProxyObject` instead.
*Carlos Antonio da Silva* *Carlos Antonio da Silva*

1
activesupport/lib/active_support/core_ext/array.rb
View file

@ -1,6 +1,5 @@
require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/array/access' 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/conversions'
require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/array/extract_options'
require 'active_support/core_ext/array/grouping' require 'active_support/core_ext/array/grouping'

19
activesupport/lib/active_support/core_ext/array/uniq_by.rb
View file

@ -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

30
activesupport/test/core_ext/array_ext_test.rb
View file

@ -359,36 +359,6 @@ class ArrayExtractOptionsTests < ActiveSupport::TestCase
end end
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 ArrayWrapperTests < ActiveSupport::TestCase
class FakeCollection class FakeCollection
def to_ary def to_ary