提交 29096268 编写于 作者: M Marc-Andre Lafortune 提交者: Jeremy Kemper

Enumerable#sum now works will all enumerables, even if they don't respond to :size

[#2489 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>
上级 3b379850
...@@ -55,12 +55,10 @@ def group_by ...@@ -55,12 +55,10 @@ def group_by
# [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0) # [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
# #
def sum(identity = 0, &block) def sum(identity = 0, &block)
return identity unless size > 0
if block_given? if block_given?
map(&block).sum map(&block).sum(identity)
else else
inject { |sum, element| sum + element } inject { |sum, element| sum + element } || identity
end end
end end
......
...@@ -60,6 +60,10 @@ def test_empty_sums ...@@ -60,6 +60,10 @@ def test_empty_sums
assert_equal Payment.new(0), [].sum(Payment.new(0)) assert_equal Payment.new(0), [].sum(Payment.new(0))
end end
def test_enumerable_sums
assert_equal 10, (1..4).sum
end
def test_each_with_object def test_each_with_object
result = %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } result = %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
assert_equal({'foo' => 'FOO', 'bar' => 'BAR'}, result) assert_equal({'foo' => 'FOO', 'bar' => 'BAR'}, result)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册