Skip to content
Browse files

A Cycle object should accept an array and cycle through it as it would

with a set of comma-separated objects.
  • Loading branch information...
1 parent 93c74e1 commit 1eaa521273399d789565af1933a0e6e4462511a4 @imkmf imkmf committed Nov 26, 2013
View
16 actionview/CHANGELOG.md
@@ -1,3 +1,19 @@
+* A Cycle object should accept an array and cycle through it as it would with a set of comma-separated objects.
+
+ arr = [1,2,3]
+ cycle(arr) # => '1'
+ cycle(arr) # => '2'
+ cycle(arr) # => '3'
+
+ Previously, it would return the array as a string, because it took the array as a single object:
+
+ arr = [1,2,3]
+ cycle(arr) # => '[1,2,3]'
+ cycle(arr) # => '[1,2,3]'
+ cycle(arr) # => '[1,2,3]'
+
+ *Kristian Freeman*
+
* Use `set_backtrace` instead of instance variable `@backtrace` in ActionView exceptions
*Shimpei Makimoto*
View
2 actionview/lib/action_view/helpers/text_helper.rb
@@ -314,7 +314,7 @@ def cycle(first_value, *values)
options = values.extract_options!
name = options.fetch(:name, 'default')
- values.unshift(first_value)
+ values.unshift(*first_value)
cycle = get_cycle(name)
unless cycle && cycle.values == values
View
7 actionview/test/template/text_helper_test.rb
@@ -381,6 +381,13 @@ def test_cycle
assert_equal("3", cycle("one", 2, "3"))
end
+ def test_cycle_with_array
+ array = [1, 2, 3]
+ assert_equal("1", cycle(array))
+ assert_equal("2", cycle(array))
+ assert_equal("3", cycle(array))
+ end
+
def test_cycle_with_no_arguments
assert_raise(ArgumentError) { cycle }
end

0 comments on commit 1eaa521

Please sign in to comment.
Something went wrong with that request. Please try again.