From 2a31691ee2c02af17471ffa0cdb267a8af633b50 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 22 Sep 2005 11:37:16 +0000
Subject: Fixed that auto_discovery_link_tag couldn't take a string as the URL

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2296 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG                                   | 2 ++
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 8 ++++----
 actionpack/test/template/asset_tag_helper_test.rb      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 09c51dbe01..e84b2e4613 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that auto_discovery_link_tag couldn't take a string as the URL
+
 * Fixed problem with send_file and WEBrick using stdout #1812
 
 * Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index efde8fa51b..b5f630aae0 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -18,13 +18,13 @@ module ActionView
       #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.curenthost.com/controller/feed" />
       #   auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"}) # =>
       #     <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.curenthost.com/controller/feed" />
-      def auto_discovery_link_tag(type = :rss, options = {}, tag_options = {})
+      def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {})
         tag(
           "link", 
-          "rel" => tag_options[:rel] || "alternate",
-          "type" => tag_options[:type] || "application/#{type}+xml",
+          "rel"   => tag_options[:rel] || "alternate",
+          "type"  => tag_options[:type] || "application/#{type}+xml",
           "title" => tag_options[:title] || type.to_s.upcase,
-          "href" => url_for(options.merge(:only_path => false))
+          "href"  => url_options.is_a?(Hash) ? url_for(url_options.merge(:only_path => false)) : url_options
         )
       end
 
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 35cc6dd9cc..6e9a2b52ff 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -31,6 +31,7 @@ class AssetTagHelperTest < Test::Unit::TestCase
     %(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(nil, {}, {:type => "text/html"})) => %(<link href="http://www.example.com" rel="alternate" title="" type="text/html" />),
-- 
cgit v1.2.3