Merge pull request #154 from rails/erb_support

Add ERB support

Author: Francesco Rodríguez

lib/sass/rails/importer.rb

@@ -8,31 +8,32 @@ class SassImporter < Sass::Importers::Filesystem
 
     def extensions
       {
-        "css" => :scss,
-        "css.sass" => :sass,
-        "css.scss" => :scss
+        'css'          => :scss,
+        'css.scss'     => :scss,
+        'css.sass'     => :sass,
+        'css.erb'      => :scss,
+        'scss.erb'     => :scss,
+        'sass.erb'     => :sass,
+        'css.scss.erb' => :scss,
+        'css.sass.erb' => :sass
       }.merge!(super)
     end
 
-    def find_relative_with_glob(name, base, options)
+    def find_relative(name, base, options)
       if name =~ GLOB
         glob_imports(name, Pathname.new(base), options)
       else
-        find_relative_without_glob(name, base, options)
+        engine_from_path(name, File.dirname(base), options)
       end
     end
-    alias_method :find_relative_without_glob, :find_relative
-    alias_method :find_relative, :find_relative_with_glob
 
-    def find_with_glob(name, options)
+    def find(name, options)
       if name =~ GLOB
         nil # globs must be relative
       else
-        find_without_glob(name, options)
+        engine_from_path(name, root, options)
       end
     end
-    alias_method :find_without_glob, :find
-    alias_method :find, :find_with_glob
 
     def each_globbed_file(glob, base_pathname, options)
       Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
@@ -58,5 +59,31 @@ def glob_imports(glob, base_pathname, options)
         :syntax => :scss
       ))
     end
+
+    private
+
+      def engine_from_path(name, dir, options)
+        full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
+        return unless full_filename && File.readable?(full_filename)
+
+        engine = Sass::Engine.new(evaluate(full_filename), options.merge(
+          syntax: syntax,
+          filename: full_filename,
+          importer: self
+        ))
+
+        if engine && (filename = engine.options[:filename])
+          @context.depend_on(filename)
+        end
+
+        engine
+      end
+
+      def evaluate(filename)
+        processors = context.environment.attributes_for(filename).processors.reject { |processor|
+          processor.in? [Sprockets::ScssTemplate, Sprockets::SassTemplate]
+        }
+        context.evaluate(filename, processors: processors)
+      end
   end
 end

test/fixtures/scss_project/app/assets/stylesheets/application.css.scss

@@ -4,6 +4,11 @@
 @import "subfolder/plain";
 @import "subfolder/second_level";
 @import "partials/without_css_ext";
+@import "css_erb_handler";
+@import "scss_erb_handler";
+@import "sass_erb_handler";
+@import "css_scss_erb_handler";
+@import "css_sass_erb_handler";
 
 .main {
   color: yellow;

test/fixtures/scss_project/app/assets/stylesheets/css_erb_handler.css.erb

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

test/fixtures/scss_project/app/assets/stylesheets/css_sass_erb_handler.css.sass.erb

@@ -0,0 +1,2 @@
+.css-sass-erb-handler
+  margin: <%= 0 %>

test/fixtures/scss_project/app/assets/stylesheets/css_scss_erb_handler.css.scss.erb

@@ -0,0 +1,3 @@
+.css-scss-erb-handler {
+  margin: <%= 0 %>;
+}

test/fixtures/scss_project/app/assets/stylesheets/sass_erb_handler.sass.erb

@@ -0,0 +1,2 @@
+.sass-erb-handler
+  margin: <%= 0 %>

test/fixtures/scss_project/app/assets/stylesheets/scss_erb_handler.scss.erb

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

test/sass_rails_test.rb

@@ -81,6 +81,11 @@ class SassRailsTest < Sass::Rails::TestCase
     assert_match /plain-old-css/,            css_output
     assert_match /another-plain-old-css/,    css_output
     assert_match /without-css-ext/,          css_output
+    assert_match /css-erb-handler/,          css_output
+    assert_match /scss-erb-handler/,         css_output
+    assert_match /sass-erb-handler/,         css_output
+    assert_match /css-sass-erb-handler/,     css_output
+    assert_match /css-scss-erb-handler/,     css_output
   end
 
   test 'sass asset paths work' do