Merge pull request #4 from stbnrivas/master

add new helper for favicon link tag

README.md

@@ -6,6 +6,7 @@ Gem *sinatra-static-assets* implements the following helpers methods:
 * `stylesheet_link_tag`
 * `javascript_script_tag`
 * `link_to`
+* `link_favicon_tag`
 
 To install it, run:
 

lib/sinatra/static_assets.rb

@@ -38,6 +38,19 @@ def link_to(desc, url, options = {})
           desc
         end
       end
+
+      def link_favicon_tag(source = nil, options = {})
+        source = "favicon.ico" if source.nil? or source.empty?
+        unless settings.xhtml
+          # html5 style like <link rel="icon" href="http://example.com/myicon.ico" />
+          options[:rel] = options[:rel] || "icon"
+        else
+          # xhtml style like <link rel="shortcut icon" href="http://example.com/myicon.ico" />
+          options[:rel] = "shortcut icon"
+        end
+        options[:href] = url_for(source)
+        tag("link", options)
+      end
 
       private
 

test/sinatra_app.rb

@@ -47,3 +47,24 @@
 #{link_to "Tatry Mountains Rescue Team", "/topr"}
 EOD
 end
+
+get "/link_favicon_tag_empty" do
+  content_type "text/plain"
+  <<"EOD"
+#{link_favicon_tag}
+EOD
+end
+
+get "/link_favicon_tag_changing_filename" do
+  content_type "text/plain"
+  <<"EOD"
+#{link_favicon_tag 'favicon2.ico'}
+EOD
+end
+
+get "/link_favicon_tag_with_options" do
+  content_type "text/plain"
+  <<"EOD"
+#{link_favicon_tag 'favicon.ico', :rel => "apple-touch-icon" }
+EOD
+end

test/sinatra_baseapp.rb

@@ -18,5 +18,10 @@ class XHTML < Sinatra::Base
       content_type "text/plain"
       "#{stylesheet_link_tag("/stylesheets/winter.css")}"
     end
+
+    get '/link_favicon_tag' do
+      content_type "text/plain"
+      "#{link_favicon_tag("favicon.ico")}"
+    end
   end
 end

test/sinatra_static_assets_test.rb

@@ -66,4 +66,29 @@ def test_link_to_tag_returns_sub_uri
 EOD
   end
 
+
+  def test_link_tag_empty
+	get '/link_favicon_tag_empty', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<link href="/bar/favicon.ico" rel="icon">
+EOD
+  end
+
+  def test_link_favicon_changing_filename
+	get '/link_favicon_tag_changing_filename', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<link href="/bar/favicon2.ico" rel="icon">
+EOD
+  end
+
+  def test_link_favicon_tag_with_options
+	get '/link_favicon_tag_with_options', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<link href="/bar/favicon.ico" rel="apple-touch-icon">
+EOD
+  end
+
 end

test/sinatra_static_assets_xhtml_test.rb

@@ -23,4 +23,11 @@ def test_link_tag_closes
       "<link charset=\"utf-8\" href=\"/stylesheets/winter.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\"/>"
   end
 
+  def test_link_favicon_tag_closes
+	get '/link_favicon_tag', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body, 
+      '<link href="/bar/favicon.ico" rel="shortcut icon"/>'
+  end
+
 end