1 files changed, 21 insertions, 10 deletions

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 9f1f0f3b68..63820cc76c 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -10,6 +10,12 @@ module Sprockets
         @asset_paths ||= begin
           config     = self.config if respond_to?(:config)
           controller = self.controller if respond_to?(:controller)
+          config ||= Rails.application.config
+          if config.action_controller.present?
+            config.action_controller.default_asset_host_protocol ||= :relative
+          else
+            config.default_asset_host_protocol ||= :relative
+          end
           RailsHelper::AssetPaths.new(config, controller)
         end
       end
@@ -50,7 +56,7 @@ module Sprockets
               'rel'   => "stylesheet",
               'type'  => "text/css",
               'media' => "screen",
-              'href'  => asset_path(source, 'css', body)
+              'href'  => asset_path(source, 'css', body, :request)
             }.merge(options.stringify_keys)
 
             tag 'link', tag_options
@@ -58,21 +64,26 @@ module Sprockets
         end.join("\n").html_safe
       end
 
+      def asset_path(source, default_ext = nil, body = false, protocol = nil)
+        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
+      end
+
     private
       def debug_assets?
         params[:debug_assets] == '1' ||
           params[:debug_assets] == 'true'
       end
 
-      def asset_path(source, default_ext = nil, body = false)
-        source = source.logical_path if source.respond_to?(:logical_path)
-        path = asset_paths.compute_public_path(source, Rails.application.config.assets.prefix, default_ext, true)
-        body ? "#{path}?body=1" : path
-      end
-
       class AssetPaths < ::ActionView::AssetPaths #:nodoc:
-        def compute_public_path(source, dir, ext=nil, include_host=true)
-          super(source, Rails.application.config.assets.prefix, ext, include_host)
+        def compute_public_path(source, dir, ext=nil, include_host=true, protocol = nil)
+          super(source, Rails.application.config.assets.prefix, ext, include_host, protocol)
+        end
+
+        # Return the filesystem path for the source
+        def compute_source_path(source, ext)
+          asset_for(source, ext)
         end
 
         def asset_for(source, ext)
@@ -104,7 +115,7 @@ module Sprockets
 
         # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
         def performing_caching?
-          @config ?  @config.perform_caching : Rails.application.config.action_controller.perform_caching
+          config.action_controller.present? ? config.action_controller.perform_caching : config.perform_caching
         end
       end
     end