Migrate to sassc gem

jekyll · Jul 21, 2018 · 46a91b1 · 46a91b1
1 parent 5f7ca51
commit 46a91b1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/jekyll-sass-converter.gemspec b/jekyll-sass-converter.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_runtime_dependency "sass", "~> 3.4"
+  spec.add_runtime_dependency "sassc", "~> 1.12"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "jekyll", "~> 3.0"

diff --git a/lib/jekyll-sass-converter/version.rb b/lib/jekyll-sass-converter/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllSassConverter
-  VERSION = "1.5.2"
+  VERSION = "2.0.0"
 end
diff --git a/lib/jekyll/converters/sass.rb b/lib/jekyll/converters/sass.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sass"
+require "sassc"
 require "jekyll/utils"
 require "jekyll/converters/scss"
 

diff --git a/lib/jekyll/converters/scss.rb b/lib/jekyll/converters/scss.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sass"
+require "sassc"
 require "jekyll/utils"
 
 module Jekyll
@@ -116,11 +116,12 @@ def sass_configs
       end
 
       def convert(content)
-        output = ::Sass.compile(content, sass_configs)
+        output = ::SassC::Engine.new(content.dup, sass_configs).render
         replacement = add_charset? ? '@charset "UTF-8";' : ""
         output.sub(BYTE_ORDER_MARK, replacement)
-      rescue ::Sass::SyntaxError => e
-        raise SyntaxError, "#{e} on line #{e.sass_line}"
+      rescue ::SassC::SyntaxError => e
+        line = e.instance_variable_get(:@line)
+        raise SyntaxError, "#{e} on line #{line}"
       end
 
       private

diff --git a/spec/sass_converter_spec.rb b/spec/sass_converter_spec.rb
@@ -50,7 +50,7 @@ def converter(overrides = {})
     end
 
     it "includes the syntax error line in the syntax error message" do
-      error_message = "Invalid CSS after \"$font-stack\": expected expression (e.g. 1px, bold), was \";\" on line 1"
+      error_message = %r!\AInvalid CSS after "f": expected 1 selector or at-rule. was "font-family: \$font-"\s+on line 1 of stdin!
       expect do
         converter.convert(invalid_content)
       end.to raise_error(Jekyll::Converters::Scss::SyntaxError, error_message)

diff --git a/spec/scss_converter_spec.rb b/spec/scss_converter_spec.rb
@@ -119,7 +119,7 @@ def converter(overrides = {})
     end
 
     it "includes the syntax error line in the syntax error message" do
-      error_message = 'Invalid CSS after "body ": expected selector or at-rule, was "{" on line 2'
+      error_message = %r!\AError: Invalid CSS after "body": expected 1 selector or at-rule, was "{"\s+on line 2!
       expect do
         converter.convert(invalid_content)
       end.to raise_error(Jekyll::Converters::Scss::SyntaxError, error_message)