Wrap existing engine with erb

Author: josh

lib/sass/rails/importer.rb

@@ -72,48 +72,25 @@ def erb_extensions
           }
         end
 
-        def find_relative(name, base, options)
-          filename, syntax = find_filename(File.dirname(base), name, options)
-
-          if syntax = erb_extensions[syntax]
-            erb_engine(filename, syntax, options)
-          else
-            super
-          end
+        def find_relative(*args)
+          process_erb_engine(super)
         end
 
-        def find(name, options)
-          filename, syntax = find_filename(root, name, options)
-
-          if syntax = erb_extensions[syntax]
-            erb_engine(filename, syntax, options)
-          else
-            super
-          end
+        def find(*args)
+          process_erb_engine(super)
         end
 
         private
-          def find_filename(dir, name, options)
-            # Feature check additional options parameter that was added in 3.2.
-            result = method(:find_real_file).arity == 2 ?
-              find_real_file(dir, name) :
-              find_real_file(dir, name, options)
-
-            if result && File.readable?(result[0])
-              return result
+          def process_erb_engine(engine)
+            if engine && syntax = erb_extensions[engine.options[:syntax]]
+              template = Tilt::ERBTemplate.new(engine.options[:filename])
+              contents = template.render(context, {})
+
+              Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
+            else
+              engine
             end
           end
-
-          def erb_engine(filename, syntax, options)
-            options[:syntax]   = syntax
-            options[:filename] = filename
-            options[:importer] = self
-
-            template = Tilt::ERBTemplate.new(filename) { File.read(filename) }
-            contents = template.render(context, {})
-
-            Sass::Engine.new(contents, options)
-          end
       end
 
       include ERB