sinatra-static-assets 1.0.3 → 1.0.4

data/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:
 

data/lib/sinatra/static_assets.rb

@@ -38,6 +38,19 @@ module Sinatra
           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
 

data/sinatra-static-assets.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sinatra-static-assets"
-  s.version     = "1.0.3"
+  s.version     = "1.0.4"
   s.authors     = ["Włodek Bzyl"]
   s.email       = ["matwb@ug.edu.pl"]
   s.homepage    = ""

data/test/sinatra_app.rb

@@ -47,3 +47,24 @@ get "/link_to_tag" do
 #{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

data/test/sinatra_baseapp.rb

@@ -18,5 +18,10 @@ module Sinatra
       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

data/test/sinatra_static_assets_test.rb

@@ -66,4 +66,29 @@ EOD
 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

data/test/sinatra_static_assets_xhtml_test.rb

@@ -23,4 +23,11 @@ class SintraStaticAssetsXHTMLTest < Test::Unit::TestCase
       "<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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-static-assets
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16409220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16409220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &16408580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16408580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &16407840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16407840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "This Sinatra extensions provides following helper methods:\n    -
   image_tag\n    - stylesheet_link_tag\n    - javascript_script_tag"
 email:
@@ -123,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sinatra-static-assets
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Sinatra extension.