padrino-helpers 0.10.6.b → 0.10.6.c

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -338,27 +338,24 @@ module Padrino
       # @api semipublic
       def asset_path(kind, source)
         return source if source =~ /^http/
-        asset_folder  = case kind
-          when :css then 'stylesheets'
-          when :js  then 'javascripts'
-          else kind.to_s
-        end
+        is_absolute  = source =~ %r{^/}
+        asset_folder = asset_folder_name(kind)
         source = source.to_s.gsub(/\s/, '%20')
-        ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
+        ignore_extension = (asset_folder.to_s == kind.to_s) # don't append an extension
         source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
-        result_path   = source if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path(asset_folder, source)
-        timestamp = asset_timestamp(result_path)
+        result_path = is_absolute ? source : uri_root_path(asset_folder, source)
+        timestamp = asset_timestamp(result_path, is_absolute)
         "#{result_path}#{timestamp}"
       end
 
       private
 
         ##
-        # Returns the uri root of the application.
+        # Returns the uri root of the application with optional paths appended.
         #
         # @example
-        #   uri_root_path("/some/path") => "/base/some/path"
+        #   uri_root_path("/some/path") => "/root/some/path"
+        #   uri_root_path("javascripts", "test.js") => "/uri/root/javascripts/test.js"
         #
         def uri_root_path(*paths)
           root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
@@ -370,13 +367,30 @@ module Padrino
         #
         # @example
         #   asset_timestamp("some/path/to/file.png") => "?154543678"
+        #   asset_timestamp("/some/absolute/path.png", true) => nil
         #
-        def asset_timestamp(file_path)
+        def asset_timestamp(file_path, absolute=false)
           return nil if file_path =~ /\?/ || (self.class.respond_to?(:asset_stamp) && !self.class.asset_stamp)
-          public_path = Padrino.root("public", file_path) if Padrino.respond_to?(:root)
-          stamp = Time.now.to_i unless public_path && File.exist?(public_path)
-          stamp ||= File.mtime(public_path).to_i
-          "?#{stamp}"
+          public_file_path = Padrino.root("public", file_path) if Padrino.respond_to?(:root)
+          stamp = File.mtime(public_file_path).to_i if public_file_path && File.exist?(public_file_path)
+          stamp ||= Time.now.to_i unless absolute
+          "?#{stamp}" if stamp
+        end
+
+        ###
+        # Returns the asset folder given a kind.
+        #
+        # @example
+        #   asset_folder_name(:css) => 'stylesheets'
+        #   asset_folder_name(:js)  => 'javascripts'
+        #   asset_folder_name(:images) => 'images'
+        #
+        def asset_folder_name(kind)
+          case kind
+          when :css then 'stylesheets'
+          when :js  then 'javascripts'
+          else kind.to_s
+          end
         end
 
         ##

data/lib/padrino-helpers/format_helpers.rb

@@ -375,7 +375,7 @@ module Padrino
         javascript_mapping = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
         html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { javascript_mapping[$1] }
       end
-
+      alias :escape_javascript :js_escape_html
     end # FormatHelpers
   end # Helpers
 end # Padrino

data/test/test_asset_tag_helpers.rb

@@ -146,10 +146,10 @@ describe "AssetTagHelpers" do
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
       time = stop_time_for_test
-      assert_has_tag('img', :src => "/absolute/pic.gif?#{time.to_i}") { image_tag('/absolute/pic.gif') }
+      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
 
-    should "display image tag absolute link with specified uri root" do
+    should "display image tag relative link with specified uri root" do
       time = stop_time_for_test
       self.class.stubs(:uri_root).returns("/blog")
       assert_has_tag('img', :src => "/blog/images/relative/pic.gif?#{time.to_i}") { image_tag('relative/pic.gif') }
@@ -196,7 +196,7 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('/css/style')
-      assert_has_tag('link', expected_options.merge(:href => "/css/style.css?#{time.to_i}")) { actual_html }
+      assert_has_tag('link', expected_options.merge(:href => "/css/style.css")) { actual_html }
     end
 
     should "display stylesheet link item with uri root" do
@@ -252,7 +252,7 @@ describe "AssetTagHelpers" do
     should "display javascript item with absolute path" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')
-      assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_has_tag('script', :src => "/js/application.js", :type => "text/javascript") { actual_html }
     end
 
     should "display javascript item with uri root" do

data/test/test_form_builder.rb

@@ -738,7 +738,7 @@ describe "FormBuilder" do
 
     should "display correct image submit button html" do
       actual_html = standard_builder.image_submit('/system/ok.png', :class => 'large')
-      assert_has_tag('input.large[type=image]', :src => "/system/ok.png?#{@stamp}") { actual_html }
+      assert_has_tag('input.large[type=image]', :src => "/system/ok.png") { actual_html }
     end
 
     should "display correct image submit button in haml" do

data/test/test_form_helpers.rb

@@ -749,7 +749,7 @@ describe "FormHelpers" do
 
     should "display image submit tag in ruby with absolute path" do
       actual_html = image_submit_tag('/system/ok.png', :class => 'success')
-      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/system/ok.png?#{@stamp}") { actual_html }
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/system/ok.png") { actual_html }
     end
 
     should "display image submit tag in erb" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 96
   prerelease: 7
   segments: 
   - 0
   - 10
   - 6
-  - b
-  version: 0.10.6.b
+  - c
+  version: 0.10.6.c
 platform: ruby
 authors: 
 - Padrino Team
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 -08:00
+date: 2012-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,13 +30,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 99
+        hash: 96
         segments: 
         - 0
         - 10
         - 6
-        - b
-        version: 0.10.6.b
+        - c
+        version: 0.10.6.c
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency