padrino-helpers 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -207,17 +207,18 @@ module Padrino
       end
       
       ##
-      # Generates a favicon link.
+      # Generates a favicon link. looks inside images folder
       # 
       # ==== Examples
       # 
-      #   favicon_tag 'images/favicon.png'
+      #   favicon_tag 'favicon.png'
+      #   favicon_tag 'icons/favicon.png'
       #   # or override some options
-      #   favicon_tag 'images/favicon.png', :type => 'image/ico'
+      #   favicon_tag 'favicon.png', :type => 'image/ico'
       # 
       def favicon_tag(source,options={})
         type = File.extname(source).gsub('.','')
-        options = options.dup.reverse_merge!(:href => source, :rel => 'icon', :type => "image/#{type}")
+        options = options.dup.reverse_merge!(:href => image_path(source), :rel => 'icon', :type => "image/#{type}")
         tag(:link, options)
       end
 

data/lib/padrino-helpers/format_helpers.rb

@@ -244,7 +244,7 @@ module Padrino
       #   js_escape_html("<h1>Hey</h1>")
       # 
       def js_escape_html(html_content)
-        "\"#{escape_javascript(html_content)}\""
+        %Q["#{escape_javascript(html_content)}"]
       end
     end # FormatHelpers
   end # Helpers

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-15}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -84,14 +84,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.5"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.6"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/helper.rb

@@ -6,9 +6,9 @@ require 'rack/test'
 require 'webrat'
 
 # We try to load the vendored padrino-core if exist
-%w(core).each do |gem|
-  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
-    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+%w(core).each do |lib|
+  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{lib}/lib")
+    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{lib}/lib"
   end
 end
 
@@ -27,6 +27,10 @@ class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
+  
+  def setup
+    Padrino.stubs(:root).returns("/tmp/sample")
+  end
 
   Webrat.configure do |config|
     config.mode = :rack

data/test/test_asset_tag_helpers.rb

@@ -206,18 +206,18 @@ class TestAssetTagHelpers < Test::Unit::TestCase
   context "for #favicon_tag method" do
     should "display favicon" do
       time = stop_time_for_test
-      actual_html = favicon_tag('images/favicon.png')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => 'images/favicon.png') { actual_html }
+      actual_html = favicon_tag('icons/favicon.png')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => '/images/icons/favicon.png') { actual_html }
     end
     should "match type with file ext" do
       time = stop_time_for_test
-      actual_html = favicon_tag('images/favicon.ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => 'images/favicon.ico') { actual_html }
+      actual_html = favicon_tag('favicon.ico')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => '/images/favicon.ico') { actual_html }
     end
     should "allow option overrides" do
       time = stop_time_for_test
-      actual_html = favicon_tag('images/favicon.png', :type => 'image/ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => 'images/favicon.png') { actual_html }
+      actual_html = favicon_tag('favicon.png', :type => 'image/ico')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => '/images/favicon.png') { actual_html }
     end
     
   end

data/test/test_format_helpers.rb

@@ -176,7 +176,7 @@ class TestFormatHelpers < Test::Unit::TestCase
 
   context 'for #js_escape_html method' do
     should "escape double quotes" do
-      assert_equal "\"hello\"", js_escape_html('"hello"')
+      assert_equal %Q{"hello"}, js_escape_html('"hello"')
     end
     should "escape single quotes" do
       assert_equal "\"hello\"", js_escape_html("'hello'")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +01:00
+date: 2010-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 5
-        version: 0.9.5
+        - 6
+        version: 0.9.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency