Permalink
Browse files

Fixed that formatted_polymorphic_route should be able to take the :fo…

…rmat as part of a single hash or as the option hash (references #8741)
  • Loading branch information...
1 parent f46fd6f commit e89093aeb4b1f544cb54caf54a0374075250cc59 David Heinemeier Hansson committed Apr 11, 2008
@@ -73,7 +73,7 @@ def polymorphic_url(record_or_hash_or_array, options = {})
end
record = extract_record(record_or_hash_or_array)
- format = (options[:action].to_s == "formatted" and record_or_hash_or_array.pop)
+ format = extract_format(record_or_hash_or_array, options)
namespace = extract_namespace(record_or_hash_or_array)
args = case record_or_hash_or_array
@@ -152,6 +152,16 @@ def extract_record(record_or_hash_or_array)
end
end
+ def extract_format(record_or_hash_or_array, options)
+ if options[:action].to_s == "formatted" && record_or_hash_or_array.is_a?(Array)
+ record_or_hash_or_array.pop
+ elsif options[:format]
+ options[:format]
+ else
+ nil
+ end
+ end
+
def extract_namespace(record_or_hash_or_array)
returning "" do |namespace|
if record_or_hash_or_array.is_a?(Array)
@@ -65,13 +65,18 @@ def test_formatted_url_helper
formatted_polymorphic_url([@article, :pdf])
end
- # TODO: should this work?
- def xtest_format_option
+ def test_format_option
@article.save
- expects(:article_url).with(@article, :format => :pdf)
+ expects(:article_url).with(@article, :pdf)
polymorphic_url(@article, :format => :pdf)
end
+ def test_id_and_format_option
+ @article.save
+ expects(:article_url).with(:id => @article, :format => :pdf)
+ polymorphic_url(:id => @article, :format => :pdf)
+ end
+
def test_with_nested
@response.save
expects(:article_response_url).with(@article, @response)

0 comments on commit e89093a

Please sign in to comment.