lib/sprockets/helpers/rails_helper.rb in actionpack-3.1.0.rc2 vs lib/sprockets/helpers/rails_helper.rb in actionpack-3.1.0.rc3

@@ -13,45 +13,51 @@
           controller = self.controller if respond_to?(:controller)
           RailsHelper::AssetPaths.new(config, controller)
         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)
+        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', "", options
-        end
+            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)
+        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', options
-        end
+            tag 'link', tag_options
+          end
+        end.join("\n").html_safe
       end
 
     private
       def debug_assets?
         params[:debug_assets] == '1' ||