Update to sassc 2.x

diff --git a/.travis.yml b/.travis.yml
index 8ce7f5f305b317e36df70fe404bd68a2a87e110a..3b56d2b4b666af3b77fb9df25838a6259b0def03 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
 sudo: false
 language: ruby
 rvm:

-  - 2.3.1
+  - 2.3.3

 cache: bundler
 addons:
   postgresql: 9.5
 cache: bundler
 addons:
   postgresql: 9.5

diff --git a/Gemfile b/Gemfile
index 9e86b5ec760bc930a583fee86508e8aded2edf55..d60f1ba947bde44a591a0036042a2e493c82be8a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "json"
 gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets
 gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets

-gem "sassc-rails", "~> 1.3"
+gem "sassc-rails"

 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"

diff --git a/Gemfile.lock b/Gemfile.lock
index 8589dc2bf65db52bbdcc6a947c24dc79f892bcf3..5ddadc3e067533df6f93cb04d9e707316f8fb450 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,8 @@ GEM
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)

-    rotp (4.0.0)
+    rotp (4.0.2)
+      addressable (~> 2.5)

     rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
     rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)


@@ -322,19 +323,13 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

-    sass (3.6.0)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (1.12.1)
+    sassc (2.0.0)

       ffi (~> 1.9.6)
       ffi (~> 1.9.6)

-      sass (>= 3.3.0)
-    sassc-rails (1.3.0)
+      rake
+    sassc-rails (2.0.0)

       railties (>= 4.0.0)
       railties (>= 4.0.0)

-      sass
-      sassc (~> 1.9)
-      sprockets (> 2.11)
+      sassc (>= 2.0)
+      sprockets (> 3.0)

       sprockets-rails
       tilt
     secure_headers (6.0.0)
       sprockets-rails
       tilt
     secure_headers (6.0.0)


@@ -443,7 +438,7 @@ DEPENDENCIES
   rotp
   rubocop
   sanitize
   rotp
   rubocop
   sanitize

-  sassc-rails (~> 1.3)
+  sassc-rails

   secure_headers
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   secure_headers
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)

diff --git a/config/initializers/r2.rb b/config/initializers/r2.rb
index 7fbb5c115002480f2f969303f7ca0b3fefbc9be5..4f951b30ce70b9dd8b49b0a2a083d31c47ebe405 100644 (file)
--- a/config/initializers/r2.rb
+++ b/config/initializers/r2.rb
@@ -1,6 +1,6 @@
 require "r2"
 
 require "r2"
 

-class R2ScssProcessor < Sprockets::ScssProcessor
+class R2ScssProcessor < SassC::Rails::ScssTemplate

   def self.call(input)
     output = super(input)
     data = R2.r2(output[:data])
   def self.call(input)
     output = super(input)
     data = R2.r2(output[:data])