Skip to content

[close #381] Avoid Sprockets deprecations #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ gemfile:
- gemfiles/Gemfile-sprockets-2-12
- gemfiles/Gemfile-sprockets-2-8
- gemfiles/Gemfile-sprockets-3-0
- gemfiles/Gemfile-sprockets-4-0
- gemfiles/Gemfile-sprockets-rails-2-2
- gemfiles/Gemfile-sprockets-rails-master
- gemfiles/Gemfile-sass-3-1
Expand All @@ -36,6 +37,8 @@ matrix:
exclude:
- gemfile: gemfiles/Gemfile-sass-3-4
rvm: 1.9.3
- gemfile: gemfiles/Gemfile-sprockets-4-0
rvm: 1.9.3
- gemfile: gemfiles/Gemfile-rails-5-0
rvm: 1.9.3
- gemfile: gemfiles/Gemfile-rails-5-0
Expand Down
18 changes: 16 additions & 2 deletions lib/sass/rails/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,22 @@ class Railtie < ::Rails::Railtie
end

config.assets.configure do |env|
env.register_engine '.sass', Sass::Rails::SassTemplate
env.register_engine '.scss', Sass::Rails::ScssTemplate
if env.respond_to?(:register_engine)
args = ['.sass', Sass::Rails::SassTemplate]
args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
env.register_engine(*args)

args = ['.scss', Sass::Rails::ScssTemplate]
args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
env.register_engine(*args)
end

if env.respond_to?(:register_transformer)
env.register_transformer 'text/sass', 'text/css',
Sprockets::SassProcessor.new(importer: SassImporter, sass_config: app.config.sass)
env.register_transformer 'text/scss', 'text/css',
Sprockets::ScssProcessor.new(importer: SassImporter, sass_config: app.config.sass)
end

env.context_class.class_eval do
class_attribute :sass_config
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ./images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
2 changes: 1 addition & 1 deletion test/fixtures/engine_project/engine_project.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.version = EngineProject::VERSION
s.authors = ["Your name"]
s.email = ["Your email"]
s.homepage = "http://example.com"
s.homepage = ""
s.summary = "Summary of EngineProject."
s.description = "Description of EngineProject."

Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/sass_project/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ./images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
3 changes: 3 additions & 0 deletions test/fixtures/scss_project/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ./images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
26 changes: 23 additions & 3 deletions test/fixtures/scss_project/config/initializers/postprocessor.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
Rails.application.config.assets.configure do |env|
env.register_postprocessor 'text/css', :postprocessor do |context, css|
css.gsub /@import/, 'fail engine'

class SassRailsTestPostProcessor
def initialize(filename, &block)
@filename = filename
@source = block.call
end

def render(context, _)
self.class.run(@source)
end

def self.run(source)
source.gsub /@import/, 'fail engine'
end

def self.call(input)
source = input[:data]
result = run(source)
{ data: result }
end
end

Rails.application.config.assets.configure do |env|
env.register_postprocessor 'text/css', SassRailsTestPostProcessor
end
4 changes: 2 additions & 2 deletions test/sass_rails_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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)
Expand All @@ -161,7 +161,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)
Expand Down