Detect format extension from right to left

Fixes rails#226
lennart · Oct 17, 2011 · 07e1972 · 07e1972
1 parent 9f3474d
commit 07e1972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/sprockets/asset_attributes.rb b/lib/sprockets/asset_attributes.rb
@@ -69,7 +69,7 @@ def extensions
     #     # => ".js"
     #
     def format_extension
-      extensions.detect { |ext|
+      extensions.reverse.detect { |ext|
         @environment.mime_types(ext) && !@environment.engines(ext)
       }
     end

diff --git a/test/test_asset_attributes.rb b/test/test_asset_attributes.rb
@@ -58,6 +58,8 @@ class TestAssetAttributes < Sprockets::TestCase
     assert_equal ".js", pathname("jquery.min.js").format_extension
     assert_equal ".js", pathname("jquery.tmpl.js").format_extension
     assert_equal ".js", pathname("jquery.tmpl.min.js").format_extension
+    assert_equal ".js", pathname("jquery.csv.js").format_extension
+    assert_equal ".js", pathname("jquery.csv.min.js").format_extension
 
     env = Sprockets::Environment.new
     env.register_engine '.ms', Class.new
@@ -77,6 +79,8 @@ class TestAssetAttributes < Sprockets::TestCase
     assert_equal [".erb"], pathname("jquery.js.erb").engine_extensions
     assert_equal [".erb"], pathname("jquery.min.js.erb").engine_extensions
     assert_equal [".coffee"], pathname("jquery.min.coffee").engine_extensions
+    assert_equal [".erb"], pathname("jquery.csv.min.js.erb").engine_extensions
+    assert_equal [".coffee", ".erb"], pathname("jquery.csv.min.js.coffee.erb").engine_extensions
 
     env = Sprockets::Environment.new
     env.register_engine '.ms', Class.new