Merge pull request #289 from rails/test-sass-versions

Improve Sass version coverage

Author: rafaelfranca

.travis.yml

@@ -14,6 +14,10 @@ gemfile:
   - test/gemfiles/Gemfile-sprockets-2-12
   - test/gemfiles/Gemfile-sprockets-2-8
   - test/gemfiles/Gemfile-sprockets-3-0
+  - test/gemfiles/Gemfile-sass-3-1
+  - test/gemfiles/Gemfile-sass-3-2
+  - test/gemfiles/Gemfile-sass-3-3
+  - test/gemfiles/Gemfile-sass-3-4
   - Gemfile
 
 sudo: false

lib/sass/rails/importer.rb

@@ -72,44 +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)
-            full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-            if full_filename && File.readable?(full_filename)
-              return full_filename, syntax
+          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

sass-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license     = %q{MIT}
 
   s.add_dependency 'railties',        '>= 4.0.0', '< 5.0'
-  s.add_dependency 'sass',            '~> 3.2', '>= 3.2.2'
+  s.add_dependency 'sass',            '~> 3.1'
   s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0'
   s.add_dependency 'sprockets',       '>= 2.8', '< 4.0'
   s.add_dependency 'tilt',            '~> 1.1'

test/gemfiles/Gemfile-sass-3-1

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails"
+gem "sass", "~> 3.1.0"

test/gemfiles/Gemfile-sass-3-2

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails"
+gem "sass", "~> 3.2.0"

test/gemfiles/Gemfile-sass-3-3

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails"
+gem "sass", "~> 3.3.0"

test/gemfiles/Gemfile-sass-3-4

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails"
+gem "sass", "~> 3.4.0"