padrino-helpers 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -82,8 +82,9 @@ module Padrino
       # Returns the javascript_path appending the default javascripts path if necessary
       def javascript_path(source)
         return source if source =~ /^http/
+        source.gsub!(/\.js$/, '')
         result_path = "#{source}.js" if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path("javascripts", "#{File.basename(source, '.js')}.js")
+        result_path ||= uri_root_path("javascripts", "#{source}.js")
         stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
         "#{result_path}?#{stamp}"
       end
@@ -91,8 +92,9 @@ module Padrino
       # Returns the stylesheet_path appending the default stylesheets path if necessary
       def stylesheet_path(source)
         return source if source =~ /^http/
+        source.gsub!(/\.css$/, '')
         result_path = "#{source}.css" if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path("stylesheets", "#{File.basename(source, '.css')}.css")
+        result_path ||= uri_root_path("stylesheets", "#{source}.css")
         stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
         "#{result_path}?#{stamp}"
       end

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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{2009-11-18}
+  s.date = %q{2009-11-20}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [

data/test/test_asset_tag_helpers.rb

@@ -103,6 +103,12 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
       assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { stylesheet_link_tag('style') }
     end
+    should "display stylesheet link item for long relative path" do
+      time = stop_time_for_test
+      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      actual_html = stylesheet_link_tag('example/demo/style')
+      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}")) { actual_html }
+    end
     should "display stylesheet link item with absolute path" do
       time = stop_time_for_test
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
@@ -132,6 +138,11 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
+    should "display javascript item for long relative path" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag('example/demo/application')
+      assert_has_tag('script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+    end
     should "display javascript item with absolute path" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency