Skip to content

Commit 1d9e0d5

Browse files
committed
Merge pull request #41 from rafaelfranca/sprockets-rails-3
Support sprockets-rails 3
2 parents b3f404c + ded334d commit 1d9e0d5

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ script: "bundle exec rake test"
77
gemfile:
88
- gemfiles/sprockets_2_12.gemfile
99
- gemfiles/sprockets_3_0.gemfile
10+
- gemfiles/sprockets-rails_3_0.gemfile
1011
- gemfiles/rails_4_2.gemfile
1112
- gemfiles/rails_4_1.gemfile
1213
- gemfiles/rails_4_0.gemfile

gemfiles/sprockets-rails_3_0.gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
gem "sprockets", "~> 3.0.0"
4+
gem "sprockets-rails", github: "rails/sprockets-rails"
5+
6+
# Specify your gem's dependencies in sassc-rails.gemspec
7+
gemspec path: "../"

lib/sassc/rails/railtie.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ class Railtie < ::Rails::Railtie
4444
# config.sass.full_exception = app.config.consider_all_requests_local
4545
# end
4646

47-
if app.assets
48-
app.assets.context_class.class_eval do
47+
app.config.assets.configure do |env|
48+
env.context_class.class_eval do
4949
class_attribute :sass_config
5050
self.sass_config = app.config.sass
5151
end
5252

53-
app.assets.register_engine '.sass', SassC::Rails::SassTemplate
54-
app.assets.register_engine '.scss', SassC::Rails::ScssTemplate
53+
env.register_engine '.sass', SassC::Rails::SassTemplate
54+
env.register_engine '.scss', SassC::Rails::ScssTemplate
5555
end
5656
end
5757

test/sassc_rails_test.rb

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def setup
2222
@app.config.sass.line_comments = false
2323

2424
# Add a fake compressor for testing purposes
25-
@app.assets.register_compressor "text/css", :test, TestCompressor
25+
@app.config.assets.configure do |env|
26+
env.register_compressor "text/css", :test, TestCompressor
27+
end
2628

2729
Rails.backtrace_cleaner.remove_silencers!
2830
end
@@ -230,11 +232,12 @@ def test_compression_works
230232
end
231233

232234
def test_sassc_compression_is_used
233-
initialize_prod!
234-
235235
engine = stub(render: "")
236236
SassC::Engine.expects(:new).returns(engine)
237237
SassC::Engine.expects(:new).with("", {style: :compressed}).returns(engine)
238+
239+
initialize_prod!
240+
238241
render_asset("application.scss")
239242
end
240243

@@ -322,5 +325,7 @@ def test_globbed_imports_work_when_globbed_file_is_added
322325
end
323326
end
324327

325-
class TestCompressor; end
328+
class TestCompressor
329+
def self.call(*); end
330+
end
326331
end

0 commit comments

Comments
 (0)