1 files changed, 36 insertions, 30 deletions

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index a99dcad81d..0b6bd8ca40 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -15,42 +15,48 @@ module Sprockets
         end
       end
 
-      def javascript_include_tag(source, options = {})
+      def javascript_include_tag(*sources)
+        options = sources.extract_options!
         debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
         body  = options.key?(:body)  ? options.delete(:body)  : false
 
-        if debug && asset = asset_paths.asset_for(source, 'js')
-          asset.to_a.map { |dep|
-            javascript_include_tag(dep, :debug => false, :body => true)
-          }.join("\n").html_safe
-        else
-          options = {
-            'type' => "text/javascript",
-            'src'  => asset_path(source, 'js', body)
-          }.merge(options.stringify_keys)
-
-          content_tag 'script', "", options
-        end
+        sources.collect do |source|
+          if debug && asset = asset_paths.asset_for(source, 'js')
+            asset.to_a.map { |dep|
+              javascript_include_tag(dep, :debug => false, :body => true)
+            }.join("\n").html_safe
+          else
+            tag_options = {
+              'type' => "text/javascript",
+              'src'  => asset_path(source, 'js', body)
+            }.merge(options.stringify_keys)
+
+            content_tag 'script', "", tag_options
+          end
+        end.join("\n").html_safe
       end
 
-      def stylesheet_link_tag(source, options = {})
+      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
 
-        if debug && asset = asset_paths.asset_for(source, 'css')
-          asset.to_a.map { |dep|
-            stylesheet_link_tag(dep, :debug => false, :body => true)
-          }.join("\n").html_safe
-        else
-          options = {
-            'rel'   => "stylesheet",
-            'type'  => "text/css",
-            'media' => "screen",
-            'href'  => asset_path(source, 'css', body)
-          }.merge(options.stringify_keys)
-
-          tag 'link', options
-        end
+        sources.collect do |source|
+          if debug && asset = asset_paths.asset_for(source, 'css')
+            asset.to_a.map { |dep|
+              stylesheet_link_tag(dep, :debug => false, :body => true)
+            }.join("\n").html_safe
+          else
+            tag_options = {
+              'rel'   => "stylesheet",
+              'type'  => "text/css",
+              'media' => "screen",
+              'href'  => asset_path(source, 'css', body)
+            }.merge(options.stringify_keys)
+
+            tag 'link', tag_options
+          end
+        end.join("\n").html_safe
       end
 
     private
@@ -61,13 +67,13 @@ module Sprockets
 
       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, 'assets', default_ext, true)
+        path = asset_paths.compute_public_path(source, Rails.application.config.assets.prefix, default_ext, true)
         body ? "#{path}?body=1" : path
       end
 
       class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
         def compute_public_path(source, dir, ext=nil, include_host=true)
-          super(source, 'assets', ext, include_host)
+          super(source, Rails.application.config.assets.prefix, ext, include_host)
         end
 
         def asset_for(source, ext)