From ec8610cfdc32d0fe816fb22405e00ef1b6c90d73 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Wed, 7 Apr 2010 13:19:55 -0700
Subject: [PATCH] adds a default source to #apple_touch_icon_link_tag

---
 .../action_view/helpers/asset_tag_helper.rb    | 18 ++++++++++++------
 .../test/template/asset_tag_helper_test.rb     |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 1ca95b7dd1..47abf1e41c 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -518,24 +518,30 @@ module ActionView
       #   <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # The helper accepts an additional options hash where you can override "rel" and "type".
-      def favicon_link_tag(source=nil, options={})
+      def favicon_link_tag(source='/favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
           :type => 'image/vnd.microsoft.icon',
-          :href => image_path(source || '/favicon.ico')
+          :href => image_path(source)
         }.merge(options.symbolize_keys))
       end
 
       # Returns a link tag for an icon targetted at iPod Touch, iPhone, and iPad.
       #
-      #   <%= apple_touch_icon_link_tag 'my_site.png' %>
+      #   <%= apple_touch_icon_link_tag %>
       #
       # generates
       #
-      #   <link href="/images/my_site.png?4233872383" rel="apple-touch-icon" />
+      #   <link href="/apple-touch-icon.png?4233872383" rel="apple-touch-icon" />
       #
-      # The source argument is passed to +image_path+ as is.
-      def apple_touch_icon_link_tag(source)
+      # You can specify a different icon file:
+      #
+      #   <%= apple_touch_icon_link_tag "my_site.png" %>
+      #
+      # That's passed to +image_path+ as is, so the example above would render
+      #
+      #   <link href="/images/my_site.png?4233872383" rel="apple-touch-icon" />
+      def apple_touch_icon_link_tag(source='/apple-touch-icon.png')
         tag('link', :rel => 'apple-touch-icon', :href => image_path(source))
       end
 
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 71052fb22c..10ee9c7881 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -165,6 +165,7 @@ class AssetTagHelperTest < ActionView::TestCase
   }
 
   AppleTouchIconLinkToTag = {
+    %(apple_touch_icon_link_tag) => %(<link href="/apple-touch-icon.png" rel="apple-touch-icon" />),
     %(apple_touch_icon_link_tag 'my_site.png') => %(<link href="/images/my_site.png" rel="apple-touch-icon" />)
   }