1 files changed, 33 insertions, 23 deletions

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 2dde2e9cc9..e1d8fccf04 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -13,7 +13,6 @@ module Sprockets
           controller = self.controller if respond_to?(:controller)
           paths = RailsHelper::AssetPaths.new(config, controller)
           paths.asset_environment = asset_environment
-          paths.asset_prefix      = asset_prefix
           paths.asset_digests     = asset_digests
           paths.compile_assets    = compile_assets?
           paths.digest_assets     = digest_assets?
@@ -25,47 +24,62 @@ module Sprockets
         options = sources.extract_options!
         debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
         body  = options.key?(:body)  ? options.delete(:body)  : false
+        digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
 
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'js')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :src => asset_path(dep, 'js', true) }.merge!(options))
+              super(dep.to_s, { :src => asset_path(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
             }
           else
-            super(source.to_s, { :src => asset_path(source, 'js', body) }.merge!(options))
+            super(source.to_s, { :src => asset_path(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
           end
         end.join("\n").html_safe
       end
 
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!
-        debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
-        body  = options.key?(:body)  ? options.delete(:body)  : false
+        debug   = options.key?(:debug) ? options.delete(:debug) : debug_assets?
+        body    = options.key?(:body)  ? options.delete(:body)  : false
+        digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
 
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'css')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :href => asset_path(dep, 'css', true, :request) }.merge!(options))
+              super(dep.to_s, { :href => asset_path(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
             }
           else
-            super(source.to_s, { :href => asset_path(source, 'css', body, :request) }.merge!(options))
+            super(source.to_s, { :href => asset_path(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
           end
         end.join("\n").html_safe
       end
 
-      def asset_path(source, default_ext = nil, body = false, protocol = nil)
+      def asset_path(source, options = {})
         source = source.logical_path if source.respond_to?(:logical_path)
-        path = asset_paths.compute_public_path(source, 'assets', default_ext, true, protocol)
-        body ? "#{path}?body=1" : path
+        path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
+        options[:body] ? "#{path}?body=1" : path
+      end
+
+      def image_path(source)
+        asset_path(source)
+      end
+      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
+
+      def javascript_path(source)
+        asset_path(source)
       end
+      alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
+
+      def stylesheet_path(source)
+        asset_path(source)
+      end
+      alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
 
     private
       def debug_assets?
-        begin
-          compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
-        rescue NoMethodError
-          false
-        end
+        compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
+      rescue NoMethodError
+        false
       end
 
       # Override to specify an alternative prefix for asset path generation.
@@ -102,10 +116,6 @@ module Sprockets
 
         class AssetNotPrecompiledError < StandardError; end
 
-        def compute_public_path(source, dir, ext=nil, include_host=true, protocol=nil)
-          super(source, asset_prefix, ext, include_host, protocol)
-        end
-
         # Return the filesystem path for the source
         def compute_source_path(source, ext)
           asset_for(source, ext)
@@ -119,12 +129,12 @@ module Sprockets
         end
 
         def digest_for(logical_path)
-          if asset_digests && (digest = asset_digests[logical_path])
+          if digest_assets && asset_digests && (digest = asset_digests[logical_path])
             return digest
           end
 
           if compile_assets
-            if asset = asset_environment[logical_path]
+            if digest_assets && asset = asset_environment[logical_path]
               return asset.digest_path
             end
             return logical_path
@@ -133,11 +143,11 @@ module Sprockets
           end
         end
 
-        def rewrite_asset_path(source, dir)
+        def rewrite_asset_path(source, dir, options = {})
           if source[0] == ?/
             source
           else
-            source = digest_for(source) if digest_assets
+            source = digest_for(source) unless options[:digest] == false
             source = File.join(dir, source)
             source = "/#{source}" unless source =~ /^\//
             source