Merge pull request #26 from bolandrm/update_compression_scheme

Update compression scheme

Author: bolandrm

lib/sassc/rails.rb

@@ -4,4 +4,5 @@
 require_relative "rails/functions"
 require_relative "rails/importer"
 require_relative "rails/template"
+require_relative "rails/compressor"
 require_relative "rails/railtie"

lib/sassc/rails/compressor.rb

@@ -0,0 +1,21 @@
+require 'sprockets/sass_compressor'
+
+class Sprockets::SassCompressor
+  def call(*args)
+    input = if defined?(data)
+      data # sprockets 2.x
+    else
+      args[0][:data] #sprockets 3.x
+    end
+
+    SassC::Engine.new(
+      input,
+      {
+        style: :compressed
+      }
+    ).render
+  end
+
+  # sprockets 2.x
+  alias :evaluate :call
+end

lib/sassc/rails/railtie.rb

@@ -56,7 +56,7 @@ class Railtie < ::Rails::Railtie
       app.config.assets.css_compressor = nil
 
       if !Rails.env.development?
-        app.config.sass.style = :compressed
+        app.config.assets.css_compressor ||= :sass
       else
         # Use expanded output instead of the sass default of :nested unless specified
         app.config.sass.style ||= :expanded

sassc-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   # unfortunately we require sass for now, so that we can
   # reuse portions of the sprockets template
   spec.add_dependency 'sass'
-  spec.add_dependency "sassc", "~> 1.3"
+  spec.add_dependency "sassc", "~> 1.4"
 
   spec.add_dependency "tilt"
 

test/sassc_rails_test.rb

@@ -155,17 +155,12 @@ def test_style_config_item_is_defaulted_to_expanded_in_development_mode
     assert_equal :expanded, Rails.application.config.sass.style
   end
 
-  def test_style_config_item_is_honored_in_development_mode
+  def test_style_config_item_is_honored
     @app.config.sass.style = :nested
-    initialize_dev!
+    initialize!
     assert_equal :nested, Rails.application.config.sass.style
   end
 
-  def test_style_config_item_is_not_honored_if_environment_is_not_development
-    initialize_prod!
-    assert_equal :compressed, Rails.application.config.sass.style
-  end
-
   def test_context_is_being_passed_to_erb_render
     initialize!
 
@@ -178,15 +173,54 @@ def test_special_characters_compile
     css_output = render_asset("special_characters.scss")
   end
 
+  def css_compressor_config_item_is_not_honored_in_development_mode
+    @app.config.assets.css_compressor = :test
+    initialize_dev!
+    assert_equal nil, Rails.application.config.assets.css_compressor
+  end
+
+  def css_compressor_config_item_is_honored_if_not_development_mode
+    @app.config.assets.css_compressor = :test
+    initialize_prod!
+    assert_equal :test, Rails.application.config.assets.css_compressor
+  end
+
+  def css_compressor_is_defined_in_test_mode
+    initialize_test!
+    assert_equal :sass, Rails.application.config.assets.css_compressor
+  end
+
+  def css_compressor_is_defined_in_prod_mode
+    initialize_prod!
+    assert_equal :sass, Rails.application.config.assets.css_compressor
+  end
+
   def test_compression_works
     initialize_prod!
 
     asset = render_asset("application.scss")
     assert_equal <<-CSS, asset
-.hello{color:#fff}
+.hello{color:#FFF}
     CSS
   end
 
+  def test_compression_works
+    initialize_prod!
+
+    asset = render_asset("application.scss")
+    assert_equal <<-CSS, asset
+.hello{color:#FFF}
+    CSS
+  end
+
+  def test_sassc_compression_is_used
+    initialize_prod!
+
+    engine = stub(render: "")
+    SassC::Engine.expects(:new).returns(engine)
+    SassC::Engine.expects(:new).with("", {style: :compressed}).returns(engine)
+    render_asset("application.scss")
+  end
   #test 'sprockets require works correctly' do
   #  skip