From 7a224356a88f104b6bf012e930721efb2274c2b1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 14 Dec 2007 18:02:04 +0000
Subject: Added that Array#to_param calls to_param on all it's elements (closes
#10473) [brandon]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8384 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
activesupport/lib/active_support/core_ext/array/conversions.rb | 4 ++--
activesupport/test/core_ext/array_ext_test.rb | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
(limited to 'activesupport')
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index c828e84112..7574dc13cd 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -24,9 +24,9 @@ module ActiveSupport #:nodoc:
end
end
- # When an array is given to url_for, it is converted to a slash separated string.
+ # Calls to_param on all its elements and joins the result with slashes. This is used by url_for in Action Pack.
def to_param
- join '/'
+ map(&:to_param).join '/'
end
# Converts an array into a string suitable for use as a URL query string, using the given <tt>key</tt> as the
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index d8ec45b62a..840a4c81d1 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -16,6 +16,12 @@ class ArrayExtAccessTests < Test::Unit::TestCase
end
class ArrayExtToParamTests < Test::Unit::TestCase
+ class ToParam < String
+ def to_param
+ "#{self}1"
+ end
+ end
+
def test_string_array
assert_equal '', %w().to_param
assert_equal 'hello/world', %w(hello world).to_param
@@ -25,6 +31,10 @@ class ArrayExtToParamTests < Test::Unit::TestCase
def test_number_array
assert_equal '10/20', [10, 20].to_param
end
+
+ def test_to_param_array
+ assert_equal 'custom1/param1', [ToParam.new('custom'), ToParam.new('param')].to_param
+ end
end
class ArrayExtToSentenceTests < Test::Unit::TestCase
--
cgit v1.2.3