Permalink
Browse files

Let polymorphic_path treat an array contains single name as without a…

…rray [#1386 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
  • Loading branch information...
1 parent f451f0e commit 291d199de1271c254c44b94766d13013b222a125 @hiroshi hiroshi committed with dhh Nov 16, 2008
View
1 actionpack/lib/action_controller/polymorphic_routes.rb
@@ -74,6 +74,7 @@ module PolymorphicRoutes
def polymorphic_url(record_or_hash_or_array, options = {})
if record_or_hash_or_array.kind_of?(Array)
record_or_hash_or_array = record_or_hash_or_array.compact
+ record_or_hash_or_array = record_or_hash_or_array[0] if record_or_hash_or_array.size == 1
end
record = extract_record(record_or_hash_or_array)
View
6 actionpack/test/controller/polymorphic_routes_test.rb
@@ -179,6 +179,12 @@ def test_with_array_containing_single_object
polymorphic_url([nil, @article])
end
+ def test_with_array_containing_single_name
+ @article.save
+ expects(:articles_url)
+ polymorphic_url([:articles])
+ end
+
# TODO: Needs to be updated to correctly know about whether the object is in a hash or not
def xtest_with_hash
expects(:article_url).with(@article)

0 comments on commit 291d199

Please sign in to comment.