Sourcemaps support, refs #25

Appraisals

@@ -12,6 +12,7 @@ end
 
 appraise "sprockets-4" do
   gem "sprockets", "~>4.0.0.beta2"
+  gem 'sass', '>=3.3'
 end
 
 appraise "rails-4" do

gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    csso-rails (0.4.0)
+    csso-rails (0.4.1)
       execjs (>= 1)
 
 GEM
@@ -115,4 +115,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

gemfiles/sprockets_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    csso-rails (0.4.0)
+    csso-rails (0.4.1)
       execjs (>= 1)
 
 GEM

gemfiles/sprockets_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    csso-rails (0.4.0)
+    csso-rails (0.4.1)
       execjs (>= 1)
 
 GEM

gemfiles/sprockets_4.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "sprockets", "~>4.0.0.beta2"
+gem "sass", ">=3.3"
 
 gemspec :path => "../"

gemfiles/sprockets_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    csso-rails (0.4.0)
+    csso-rails (0.4.1)
       execjs (>= 1)
 
 GEM
@@ -16,6 +16,7 @@ GEM
     minitest (5.8.4)
     rack (1.6.4)
     rake (11.1.0)
+    sass (3.4.21)
     sprockets (4.0.0.beta2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -29,7 +30,8 @@ DEPENDENCIES
   csso-rails!
   minitest
   rake
+  sass (>= 3.3)
   sprockets (~> 4.0.0.beta2)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

gemfiles/therubyracer.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    csso-rails (0.4.0)
+    csso-rails (0.4.1)
       execjs (>= 1)
 
 GEM

lib/csso.rb

@@ -36,6 +36,12 @@ def self.optimize(css, maniac_mode=false, structural_optimization=true)
     end
   end
 
+  def self.optimize_with_sourcemap css, filename, structural_optimization=true
+    return nil unless css.is_a?(String)
+    return css if css.size <= 3
+    Csso.js_api.compress_with_sourcemap(css, filename, structural_optimization)
+  end
+
 
   class Optimizer
     def optimize(css, structural_optimization=true)

lib/csso/compressor.rb

@@ -3,10 +3,20 @@ class Compressor
     def self.call(input)
       require 'csso'
       #TODO: settings?
-      #TODO: handle metadata somehow?
-      {
-        data: Csso.optimize(input[:data], true)
-      }
+      if input[:metadata] && input[:metadata][:map]
+        css, map = Csso.optimize_with_sourcemap(input[:data],
+          # Sprockets::PathUtils.split_subpath(input[:load_path], input[:filename])
+          # sprockets seems to ignore filenames here, so we may save some mem:
+          'uri'
+        )
+        map = Sprockets::SourceMapUtils.combine_source_maps(
+          input[:metadata][:map],
+          Sprockets::SourceMapUtils.decode_json_source_map(map)["mappings"]
+        )
+        { data: css, map: map }
+      else
+        { data: Csso.optimize(input[:data], true) }
+      end
     end
 
     # sprockets 2:

lib/csso/csso.js.erb

@@ -30,3 +30,12 @@ do_compression = function(css, disable_structural){
         restructure: !disable_structural
     });
 };
+
+do_compression_with_map = function(css, filename, structural){
+   var result = csso.minify(css, {
+        restructure: structural,
+        filename: filename,
+        sourceMap: true
+    });
+  return [result.css, result.map.toString()];
+};

lib/csso/js_lib.rb

@@ -15,7 +15,11 @@ def initialize
     end
 
     def compress css, structural_optimization=true
-      @csso.call("do_compression", css, !structural_optimization)
+      @csso.call("do_compression", css, structural_optimization)
+    end
+
+    def compress_with_sourcemap css, filename, structural_optimization=true
+      @csso.call("do_compression_with_map", css, filename, structural_optimization)
     end
 
   end

spec/csso/sprockets_integration_spec.rb

@@ -9,10 +9,16 @@
 describe Csso do
 
   subject { Csso }
-  let(:sprockets_env){
+  let(:sprockets_env_without_csso){
+    begin
+      require 'sprockets'
+    rescue LoadError
+      skip "Skipping sprockets integration, as there's no sprockets in this env"
+    end
     e = Sprockets::Environment.new(File.expand_path('../', File.dirname(__FILE__)))
     e.append_path 'fixtures'
     e.config = e.config.merge(gzip_enabled: false).freeze if e.respond_to? :config
+    # e.logger = Logger.new STDOUT
     e
   }
   let(:result_dir){
@@ -24,17 +30,15 @@
     File.expand_path('manifest.json', result_dir)
   }
   let(:manifest){
+    sprockets_env
     Sprockets::Manifest.new(sprockets_env, result_dir, manifest_file)
   }
+  let(:sprockets_env){
+    subject.install(sprockets_env_without_csso)
+    sprockets_env_without_csso
+  }
 
   it "installs" do
-    begin
-      require 'sprockets'
-    rescue LoadError
-      skip "Skipping sprockets integration, as there's no sprockets in this env"
-    end
-
-    subject.install(sprockets_env)
     sprockets_env.css_compressor.must_equal Csso::Compressor
     manifest.environment.must_equal(sprockets_env)
     manifest.clobber
@@ -46,6 +50,23 @@
     manifest.clobber
   end
 
+  it "compiles with sourcemap" do
+    manifest.clobber
+    begin
+      require 'sass'
+    rescue LoadError
+      skip 'No sass in this env, skipping'
+    end
+    manifest.compile('test2.css')
+    manifest.compile('test2.css.map')
+    json = JSON.load File.read(manifest_file)
+    json["assets"]["test2.css"].must_match /\.css$/
+    sprockets_env['test2.css'].source.must_equal '.class,.class .other_class{color:red}.something{color:#000}.test2{color:#00f}'
+    map = JSON.load(sprockets_env['test2.css.map'].source)
+    map["sources"].size.must_equal 4
+    manifest.clobber
+  end
+
   it "loads into rails" do
     begin
       require "rails"

spec/fixtures/test2.css

@@ -0,0 +1,7 @@
+/* LaLaLa */
+//= require ./test.css
+//= require ./test4.css
+
+.test2{
+  color: #0000ff;
+}

spec/fixtures/test3.scss

@@ -0,0 +1,3 @@
+.something{
+  color: #000000;
+}

spec/fixtures/test4.scss

@@ -0,0 +1,10 @@
+@import 'test3';
+
+$color: #ff0000;
+
+.class {
+  .other_class{
+    // comment blablabla
+    color: $color;
+  }
+}