From 15822c208ac8979a524d1df863b51112c629bf65 Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Fri, 31 Jan 2014 15:49:15 +0000 Subject: [PATCH 1/5] Added sassc as a dependency --- sass-rails.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/sass-rails.gemspec b/sass-rails.gemspec index e6f9e44..e857bd6 100644 --- a/sass-rails.gemspec +++ b/sass-rails.gemspec @@ -16,6 +16,7 @@ Gem::Specification.new do |s| s.rubyforge_project = "sass-rails" s.add_dependency 'sass', '~> 3.2' + s.add_dependency 'sassc' s.add_dependency 'railties', '>= 4.0.0', '< 5.0' s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0' s.add_dependency 'sprockets', '~> 2.12' From 3664278c3625db8e05d05d290a1a775fad9a93cf Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Fri, 31 Jan 2014 15:49:36 +0000 Subject: [PATCH 2/5] Use the SassC engine for compiling sass --- lib/sass/rails/importer.rb | 2 +- lib/sass/rails/template.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sass/rails/importer.rb b/lib/sass/rails/importer.rb index 699b7a1..4ef357e 100644 --- a/lib/sass/rails/importer.rb +++ b/lib/sass/rails/importer.rb @@ -74,7 +74,7 @@ def engine_from_path(name, dir, options) return unless full_filename && File.readable?(full_filename) context.depend_on full_filename - engine = Sass::Engine.new(evaluate(full_filename), options.merge( + engine = SassC::Engine.new(evaluate(full_filename), options.merge( syntax: syntax, filename: full_filename, importer: self diff --git a/lib/sass/rails/template.rb b/lib/sass/rails/template.rb index d319905..fc1eefd 100644 --- a/lib/sass/rails/template.rb +++ b/lib/sass/rails/template.rb @@ -22,7 +22,7 @@ def evaluate(context, locals, &block) sass_config = context.environment.context_class.sass_config.merge(options) - ::Sass::Engine.new(data, sass_config).render + ::SassC::Engine.new(data, sass_config).render rescue ::Sass::SyntaxError => e context.__LINE__ = e.sass_backtrace.first[:line] raise e From f2e2e52a497cf49d389d1fb97a3a1b32c8c68c13 Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Sat, 25 Oct 2014 07:55:12 +0100 Subject: [PATCH 3/5] One more SassC override --- lib/sass/rails/importer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sass/rails/importer.rb b/lib/sass/rails/importer.rb index 4ef357e..60633c2 100644 --- a/lib/sass/rails/importer.rb +++ b/lib/sass/rails/importer.rb @@ -61,7 +61,7 @@ def glob_imports(glob, base_pathname, options) contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n" end return nil if contents.empty? - Sass::Engine.new(contents, options.merge( + SassC::Engine.new(contents, options.merge( :filename => base_pathname.to_s, :importer => self, :syntax => :scss From 5c181b76274be5bc818cbb445b18b9c60107c9c1 Mon Sep 17 00:00:00 2001 From: Mike King Date: Mon, 12 Jan 2015 15:30:15 -1000 Subject: [PATCH 4/5] Update sass-rails.gemspec --- sass-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass-rails.gemspec b/sass-rails.gemspec index e857bd6..7e28345 100644 --- a/sass-rails.gemspec +++ b/sass-rails.gemspec @@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__) require "sass/rails/version" Gem::Specification.new do |s| - s.name = "sass-rails" + s.name = "sassc-rails" s.version = Sass::Rails::VERSION s.platform = Gem::Platform::RUBY s.authors = ["wycats", "chriseppstein"] From 065fbbe873877653fb66ef365ff3c07904fb3b02 Mon Sep 17 00:00:00 2001 From: Mike King Date: Mon, 12 Jan 2015 15:30:40 -1000 Subject: [PATCH 5/5] Update sass-rails.gemspec.erb --- sass-rails.gemspec.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass-rails.gemspec.erb b/sass-rails.gemspec.erb index 3761809..25e595d 100644 --- a/sass-rails.gemspec.erb +++ b/sass-rails.gemspec.erb @@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__) require "sass/rails/version" Gem::Specification.new do |s| - s.name = "sass-rails" + s.name = "sassc-rails" s.version = Sass::Rails::VERSION s.platform = Gem::Platform::RUBY s.authors = ["wycats", "chriseppstein"]