Revert "Yield only one argument instead of splatting."

This reverts commit f9cb645.

Conflicts:
	activerecord/CHANGELOG.md

Revert "Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks"

This reverts commit 9cc2bf6.

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb

Author: carlosantoniodasilva

activerecord/CHANGELOG.md

@@ -736,13 +736,6 @@
 
     *Marc-André Lafortune*
 
-*   Allow blocks for `count` with `ActiveRecord::Relation`, to work similar as
-    `Array#count`:
-
-        Person.where("age > 26").count { |person| person.gender == 'female' }
-
-    *Chris Finne & Carlos Antonio da Silva*
-
 *   Added support to `CollectionAssociation#delete` for passing `fixnum`
     or `string` values as record ids. This finds the records responding
     to the `id` and executes delete on them.

activerecord/lib/active_record/relation/calculations.rb

@@ -13,16 +13,9 @@ module Calculations
     #
     #   Person.count(:age, distinct: true)
     #   # => counts the number of different age values
-    #
-    #   Person.where("age > 26").count { |person| person.gender == 'female' }
-    #   # => queries people where "age > 26" then count the loaded results filtering by gender
     def count(column_name = nil, options = {})
-      if block_given?
-        self.to_a.count { |item| yield item }
-      else
-        column_name, options = nil, column_name if column_name.is_a?(Hash)
-        calculate(:count, column_name, options)
-      end
+      column_name, options = nil, column_name if column_name.is_a?(Hash)
+      calculate(:count, column_name, options)
     end
 
     # Calculates the average value on a given column. Returns +nil+ if there's
@@ -56,13 +49,9 @@ def maximum(column_name, options = {})
     # +calculate+ for examples with options.
     #
     #   Person.sum('age') # => 4562
-    #   # => returns the total sum of all people's age
-    #
-    #   Person.where('age > 100').sum { |person| person.age - 100 }
-    #   # queries people where "age > 100" then perform a sum calculation with the block returns
     def sum(*args)
       if block_given?
-        self.to_a.sum(*args) { |item| yield item }
+        self.to_a.sum(*args) {|*block_args| yield(*block_args)}
       else
         calculate(:sum, *args)
       end

activerecord/test/cases/calculations_test.rb

@@ -383,22 +383,6 @@ def test_count_with_from_option
         Company.where(:type => "Firm").from('companies').count(:type)
   end
 
-  def test_count_with_block_acts_as_array
-    accounts = Account.where('id > 0')
-    assert_equal Account.count, accounts.count { true }
-    assert_equal 0, accounts.count { false }
-    assert_equal Account.where('credit_limit > 50').size, accounts.count { |account| account.credit_limit > 50 }
-    assert_equal Account.count, Account.count { true }
-    assert_equal 0, Account.count { false }
-  end
-
-  def test_sum_with_block_acts_as_array
-    accounts = Account.where('id > 0')
-    assert_equal Account.sum(:credit_limit), accounts.sum { |account| account.credit_limit }
-    assert_equal Account.sum(:credit_limit) + Account.count, accounts.sum{ |account| account.credit_limit + 1 }
-    assert_equal 0, accounts.sum { |account| 0 }
-  end
-
   def test_sum_with_from_option
     assert_equal Account.sum(:credit_limit), Account.from('accounts').sum(:credit_limit)
     assert_equal Account.where("credit_limit > 50").sum(:credit_limit),