Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make Array#in_groups_of just return the grouped collection if a block…

… isn't given. [Marcel Molina Jr.]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4345 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 36d1a2f302817815e0e70334733d2daf1a14a4f5 1 parent ff96498
Marcel Molina authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make Array#in_groups_of just return the grouped collection if a block isn't given. [Marcel Molina Jr.]
+
* Don't destroy a HashWithIndifferentAccess if symbolize_keys! or stringify_keys! is called on it. Closes #5076. [Marcel Molina Jr., guy.naor@famundo.com]
* Document Module::delegate. #5002 [pergesu@gmail.com]
View
6 activesupport/lib/active_support/core_ext/array.rb
@@ -16,7 +16,11 @@ def in_groups_of(number, fill_with = nil, &block)
require 'enumerator'
collection = dup
collection << fill_with until collection.size.modulo(number).zero?
- collection.each_slice(number, &block)
+ grouped_collection = [] unless block_given?
+ collection.each_slice(number) do |group|
+ block_given? ? yield(group) : grouped_collection << group
+ end
+ grouped_collection unless block_given?
end
# Divide the array into one or more subarrays based on a delimiting +value+
View
3  activesupport/test/core_ext/array_ext_test.rb
@@ -47,6 +47,7 @@ def test_group_by_with_perfect_fit
end
assert_equal [%w(a b c), %w(d e f), %w(g h i)], groups
+ assert_equal [%w(a b c), %w(d e f), %w(g h i)], ('a'..'i').to_a.in_groups_of(3)
end
def test_group_by_with_padding
@@ -122,4 +123,4 @@ def test_to_xml_with_options
assert xml.include?(%(<street-address>Evergreen</street-address>))
assert xml.include?(%(<name>Jason</name>))
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.