Merge pull request #103 from aqeelvn/master

Fix the ordering so that more specialised files are correctly picked

Author: bolandrm

lib/sassc/rails/importer.rb

@@ -75,13 +75,13 @@ def import_for(full_path, parent_dir, options)
       EXTENSIONS = [
         CssScssExtension.new,
         CssSassExtension.new,
-        Extension.new(".scss"),
-        Extension.new(".sass"),
-        CSSExtension.new,
+        SassERBExtension.new,
         ERBExtension.new(".scss.erb"),
         ERBExtension.new(".css.erb"),
-        SassERBExtension.new
-      ]
+        Extension.new(".scss"),
+        Extension.new(".sass"),
+        CSSExtension.new
+      ].freeze
 
       PREFIXS = [ "", "_" ]
       GLOB = /(\A|\/)(\*|\*\*\/\*)\z/

test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss

@@ -0,0 +1 @@
+@import "globbed_multiple_extensions/**/*";

test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb

@@ -0,0 +1,3 @@
+.glob {
+  margin: <%= 0 %>;
+}

test/sassc_rails_test.rb

@@ -271,6 +271,16 @@ def test_allows_for_inclusion_of_inline_source_maps
   #  assert_match /\.import-css-application/, css_output
   #end
 
+  def test_globbed_imports_work_with_multiple_extensions
+    initialize!
+
+    asset = render_asset("glob_multiple_extensions_test.css")
+
+    assert_equal <<-CSS, asset
+.glob{margin:0}
+    CSS
+  end
+
   def test_globbed_imports_work_when_globbed_file_is_changed
     skip "This seems to work in practice, possible test setup problem"