Format extension cant be an engine

robholland · Jul 8, 2011 · e6160f0 · e6160f0
1 parent 559b49a
commit e6160f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/lib/sprockets/asset_attributes.rb b/lib/sprockets/asset_attributes.rb
@@ -59,7 +59,9 @@ def extensions
     #     # => ".js"
     #
     def format_extension
-      extensions.detect { |ext| @environment.mime_types(ext) }
+      extensions.detect { |ext|
+        @environment.mime_types(ext) && !@environment.engines(ext)
+      }
     end
 
     # Returns an `Array` of engine extensions.

diff --git a/test/test_asset_attributes.rb b/test/test_asset_attributes.rb
@@ -54,24 +54,29 @@ 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
+
+    env = Sprockets::Environment.new
+    env.register_engine '.ms', Class.new
+    assert_equal nil, env.attributes_for("foo.jst.ms").format_extension
   end
 
-  test "engine_extensions" do
+  test "engine extensions" do
     assert_equal [], pathname("empty").engine_extensions
     assert_equal [], pathname("gallery.js").engine_extensions
-    assert_equal [".coffee"],
+    assert_equal [".coffee"], pathname("application.js.coffee").engine_extensions
-      pathname("application.js.coffee").engine_extensions
+    assert_equal [".coffee", ".erb"], pathname("project.js.coffee.erb").engine_extensions
-    assert_equal [".coffee", ".erb"],
-      pathname("project.js.coffee.erb").engine_extensions
     assert_equal [".erb"], pathname("gallery.css.erb").engine_extensions
     assert_equal [".erb"], pathname("gallery.erb").engine_extensions
     assert_equal [], pathname("jquery.js").engine_extensions
     assert_equal [], pathname("jquery.min.js").engine_extensions
     assert_equal [], pathname("jquery.tmpl.min.js").engine_extensions
     assert_equal [".erb"], pathname("jquery.js.erb").engine_extensions
     assert_equal [".erb"], pathname("jquery.min.js.erb").engine_extensions
-    assert_equal [".coffee"],
+    assert_equal [".coffee"], pathname("jquery.min.coffee").engine_extensions
-      pathname("jquery.min.coffee").engine_extensions
+
+    env = Sprockets::Environment.new
+    env.register_engine '.ms', Class.new
+    assert_equal [".jst", ".ms"], env.attributes_for("foo.jst.ms").engine_extensions
   end
 
   test "content_type" do