Merge pull request #33 from jejacks0n/duplicate_assets

Ensure assets aren't duplicated for debug. #31

Author: guilleiguaran

lib/sprockets/rails/helper.rb

@@ -94,7 +94,7 @@ def javascript_include_tag(*sources)
             else
               super(source, options)
             end
-          }.join("\n").html_safe
+          }.flatten.uniq.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)
@@ -116,7 +116,7 @@ def stylesheet_link_tag(*sources)
             else
               super(source, options)
             end
-          }.join("\n").html_safe
+          }.flatten.uniq.join("\n").html_safe
         else
           sources.push(options)
           super(*sources)

test/fixtures/dependency.css

@@ -0,0 +1 @@
+/* dependency */

test/fixtures/dependency.js

@@ -0,0 +1 @@
+// dependency

test/fixtures/file1.css

@@ -0,0 +1,2 @@
+/*= require dependency
+ */

test/fixtures/file1.js

@@ -0,0 +1 @@
+//= require dependency

test/fixtures/file2.css

@@ -0,0 +1,2 @@
+/*= require dependency
+ */

test/fixtures/file2.js

@@ -0,0 +1 @@
+//= require dependency

test/test_helper.rb

@@ -296,6 +296,8 @@ def test_javascript_include_tag
       @view.javascript_include_tag(:foo)
     assert_equal %(<script src="/assets/foo.js?body=1"></script>\n<script src="/assets/bar.js?body=1"></script>),
       @view.javascript_include_tag(:bar)
+    assert_equal %(<script src="/assets/dependency.js?body=1"></script>\n<script src="/assets/file1.js?body=1"></script>\n<script src="/assets/file2.js?body=1"></script>),
+      @view.javascript_include_tag(:file1, :file2)
   end
 
   def test_stylesheet_link_tag
@@ -305,6 +307,8 @@ def test_stylesheet_link_tag
       @view.stylesheet_link_tag(:foo)
     assert_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.css?body=1" media="screen" rel="stylesheet" />),
       @view.stylesheet_link_tag(:bar)
+    assert_equal %(<link href="/assets/dependency.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.css?body=1" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag(:file1, :file2)
   end
 
   def test_javascript_path