Merge pull request #292 from simplybusiness/fix_importer

Allow Importer to be serialized

Author: Rafael Mendonça França

lib/sass/rails/importer.rb

@@ -28,7 +28,8 @@ def find(name, options)
         private
           def glob_imports(base, glob, options)
             contents = ""
-            each_globbed_file(base, glob) do |filename|
+            context = options[:sprockets][:context]
+            each_globbed_file(base, glob, context) do |filename|
               next if filename == options[:filename]
               contents << "@import #{filename.inspect};\n"
             end
@@ -39,7 +40,7 @@ def glob_imports(base, glob, options)
             ))
           end
 
-          def each_globbed_file(base, glob)
+          def each_globbed_file(base, glob, context)
             raise ArgumentError unless glob == "*" || glob == "**/*"
 
             exts = extensions.keys.map { |ext| Regexp.escape(".#{ext}") }.join("|")
@@ -85,7 +86,7 @@ def find(*args)
           def process_erb_engine(engine)
             if engine && syntax = erb_extensions[engine.options[:syntax]]
               template = Tilt::ERBTemplate.new(engine.options[:filename])
-              contents = template.render(context, {})
+              contents = template.render(engine.options[:sprockets][:context], {})
 
               Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
             else
@@ -136,13 +137,6 @@ def deprecate_extra_css_extension(engine)
       include ERB
       include Globbing
 
-      attr_reader :context
-
-      def initialize(context, *args)
-        @context = context
-        super(*args)
-      end
-
       # Allow .css files to be @import'd
       def extensions
         { 'css' => :scss }.merge(super)

lib/sass/rails/template.rb

@@ -33,8 +33,8 @@ def evaluate(context, locals, &block)
           :line => line,
           :syntax => syntax,
           :cache_store => cache_store,
-          :importer => importer_class.new(context, context.pathname.to_s),
-          :load_paths => context.environment.paths.map { |path| importer_class.new(context, path.to_s) },
+          :importer => importer_class.new(context.pathname.to_s),
+          :load_paths => context.environment.paths.map { |path| importer_class.new(path.to_s) },
           :sprockets => {
             :context => context,
             :environment => context.environment