Merge pull request #339 from Andreis13/sprockets-4

Sass-rails on Sprockets 4.

Author: rafaelfranca

.travis.yml

@@ -1,24 +1,13 @@
 language: ruby
 
 rvm:
- - 1.9.3
  - 2.0.0
  - 2.1
  - 2.2
  - rbx-2
 
 gemfile:
-  - gemfiles/Gemfile-rails-4-0
-  - gemfiles/Gemfile-rails-4-1
   - gemfiles/Gemfile-rails-4-2
-  - gemfiles/Gemfile-sprockets-2-11
-  - gemfiles/Gemfile-sprockets-2-12
-  - gemfiles/Gemfile-sprockets-2-8
-  - gemfiles/Gemfile-sprockets-3-0
-  - gemfiles/Gemfile-sprockets-rails-2-2
-  - gemfiles/Gemfile-sprockets-rails-master
-  - gemfiles/Gemfile-sass-3-1
-  - gemfiles/Gemfile-sass-3-2
   - gemfiles/Gemfile-sass-3-3
   - gemfiles/Gemfile-sass-3-4
 

Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "rails", github: "rails/rails"
 gem "arel", github: "rails/arel"
+gem "sprockets", github: "rails/sprockets", branch: "master"
+gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"

gemfiles/Gemfile-rails-4-0

@@ -4,3 +4,5 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rails", "~> 4.2.0"
+gem "sprockets", github: "rails/sprockets", branch: "master"
+gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"

gemfiles/Gemfile-rails-4-1

@@ -5,3 +5,5 @@ gemspec path: ".."
 
 gem "rails"
 gem "sass", "~> 3.3.0"
+gem "sprockets", github: "rails/sprockets", branch: "master"
+gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"

gemfiles/Gemfile-rails-4-2

@@ -5,3 +5,5 @@ gemspec path: ".."
 
 gem "rails"
 gem "sass", "~> 3.4.0"
+gem "sprockets", github: "rails/sprockets", branch: "master"
+gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"

gemfiles/Gemfile-sass-3-1

@@ -5,7 +5,5 @@ module Rails
 end
 
 require 'sass/rails/version'
-require 'sass/rails/helpers'
 require 'sass/rails/importer'
-require 'sass/rails/template'
 require 'sass/rails/railtie'

gemfiles/Gemfile-sass-3-2

@@ -1,11 +1,10 @@
 require 'active_support/deprecation/reporting'
-require 'sass'
 require 'sprockets/sass_importer'
 require 'tilt'
 
 module Sass
   module Rails
-    class SassImporter < Sass::Importers::Filesystem
+    class SassImporter < Sprockets::SassImporter
       module Globbing
         GLOB = /(\A|\/)(\*|\*\*\/\*)\z/
 

gemfiles/Gemfile-sass-3-3

@@ -1,6 +1,7 @@
 require 'sass'
 require 'active_support/core_ext/class/attribute'
 require 'sprockets/railtie'
+require 'sprockets/sass_processor'
 
 module Sass::Rails
   class Railtie < ::Rails::Railtie
@@ -54,8 +55,11 @@ class Railtie < ::Rails::Railtie
       end
 
       config.assets.configure do |env|
-        env.register_engine '.sass', Sass::Rails::SassTemplate
-        env.register_engine '.scss', Sass::Rails::ScssTemplate
+
+        env.register_transformer 'text/sass', 'text/css',
+          Sprockets::SassProcessor.new(importer: SassImporter)
+        env.register_transformer 'text/scss', 'text/css',
+          Sprockets::ScssProcessor.new(importer: SassImporter)
 
         env.context_class.class_eval do
           class_attribute :sass_config

gemfiles/Gemfile-sass-3-4

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "5.0.3"
+    VERSION = "6.0.0"
   end
 end

gemfiles/Gemfile-sprockets-2-11

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.license     = %q{MIT}
 
   s.add_dependency 'railties',        '>= 4.0.0', '< 5.0'
-  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 'sass',            '~> 3.3'
+  s.add_dependency 'sprockets-rails', '>= 3.0', '< 4.0'
+  s.add_dependency 'sprockets',       '>= 4.0'
   s.add_dependency 'tilt',            '>= 1.1', '< 3'
 
   s.add_development_dependency 'sqlite3'

gemfiles/Gemfile-sprockets-2-12

@@ -1,5 +1,5 @@
 Rails.application.config.assets.configure do |env|
-  env.register_postprocessor 'text/css', :postprocessor do |context, css|
-    css.gsub /@import/, 'fail engine'
+  env.register_postprocessor 'text/css' do |input|
+    input[:data].gsub /@import/, 'fail engine'
   end
 end

gemfiles/Gemfile-sprockets-2-8

@@ -134,7 +134,7 @@ class SassRailsTest < Sass::Rails::TestCase
 
   test 'globbed imports work when new file is added' do
     project = 'scss_project'
-    filename = 'application.scss'
+    filename = 'application.css'
 
     within_rails_app(project) do |tmpdir|
       asset_output(filename)
@@ -151,7 +151,7 @@ class SassRailsTest < Sass::Rails::TestCase
 
   test 'globbed imports work when globbed file is changed' do
     project = 'scss_project'
-    filename = 'application.scss'
+    filename = 'application.css'
 
     within_rails_app(project) do |tmpdir|
       asset_output(filename)