roger_sassc 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60d9ab78717d99ca86d35f7b82b1ffc3449215f
-  data.tar.gz: ef6e144662222e549bcca649fb7283bb2cdbdce1
+  metadata.gz: a5a3a241d0b52af346178cb0c34a601b43447388
+  data.tar.gz: 42613afcc506b5d318759ddcca4f354be8cf516b
 SHA512:
-  metadata.gz: f6480795dc4bfc30e09e93ee3380b78379e8d99d67b2d4271d5574a3a741216dadca54fe7af9a8a92f74e17d40c5ea33a85ada8bc997ce18ef0429a174b092e7
-  data.tar.gz: a51940be9fc2a9ee8da59767d8dd3bcf10457d283a85ac98c2ed99c5904e25df7157dba4c1938f9768220e3d3c0f647b1bb110668755b9291077e2fbb1bca423
+  metadata.gz: 266f120b1e519b5858da86f0f3051abb2f6d50604d3b6fb764b67bdae6c29268447ab2fe2d31d93280f8b5af0d90aae8006b447b7f78375eb588a0b8fdaa8ce1
+  data.tar.gz: 2234ca0a4beac1472867d0939bd597743e1fdb09fc84b6ddb1bb1827ca5008ec35a59dd8a5be258dfa791dfcaee3c72c247cd817e6cd648f107fc8c063b0713b

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## Version 1.0.0
+* Update sassc
+* Add sourcemap support

data/lib/roger_sassc/middleware.rb

@@ -16,7 +16,9 @@ module RogerSassc
       @app = app
 
       defaults = {
-        load_paths: RogerSassc.load_paths
+        load_paths: RogerSassc.load_paths,
+        source_map: true,
+        source_map_embed: true
       }
 
       @options = defaults.update(options)
@@ -27,28 +29,34 @@ module RogerSassc
       @options[:roger_html_path] = @project.html_path
 
       url = ::Rack::Utils.unescape(env["PATH_INFO"].to_s).sub(%r{^/}, "")
+      unless url.end_with?(".css") || url.end_with?(".css.map")
+        return @app.call(env)
+      end
 
       # Convert the url to an absolute path,
       # which is used to retrieve compile the scss
-      if url.end_with?(".css") && scss_path = resolve_url(url)
-        env["rack.errors"].puts "Invoking ruby-sassc for #{scss_path}"
-
-        begin
-          css = compile_scss(scss_path)
-          respond(css)
-        rescue ::SassC::SyntaxError,
-               ::SassC::NotRenderedError,
-               ::SassC::InvalidStyleError => sassc_error
-          respond(debug_css(sassc_error))
-        end
-      else
-        @app.call(env)
+      scss_path = resolve_url(url)
+
+      return @app.call(env) unless scss_path
+
+      env["rack.errors"].puts "Invoking ruby-sassc for #{scss_path}"
+      engine = create_scss_engine(scss_path)
+
+      begin
+        respond(engine, url.end_with?(".css.map"))
+      rescue ::SassC::SyntaxError,
+             ::SassC::NotRenderedError,
+             ::SassC::InvalidStyleError => sassc_error
+        respond_with_error(sassc_error)
       end
     end
 
     private
 
     def resolve_url(url)
+      # Make sure we strip off .map
+      url = url.gsub(/.map\Z/, "")
+
       # A .css file is requested in the browser
       url = url[0..-4] + "scss"
 
@@ -57,11 +65,16 @@ module RogerSassc
       resolver.url_to_path url, exact_match: true
     end
 
-    def compile_scss(scss_path)
+    def create_scss_engine(scss_path)
       # Supply the filename for load path resolving
       @options[:filename] = scss_path.to_s
+      if @options[:source_map] || @options[:source_map_embed]
+        @options[:source_map_file] = scss_path.to_s + ".map"
+
+        @options[:source_map] = true
+      end
 
-      ::SassC::Engine.new(File.read(scss_path), @options).render
+      ::SassC::Engine.new(File.read(scss_path), @options)
     end
 
     def debug_css(sassc_error)
@@ -87,12 +100,24 @@ module RogerSassc
       @resolver ||= Roger::Resolver.new(@project.html_path)
     end
 
-    def respond(css)
+    def respond_with_error(err)
+      resp = ::Rack::Response.new do |res|
+        res.status = 200
+        res.headers["Content-Type"] = "text/css"
+        # last modified header
+        res.write debug_css(err)
+      end
+      resp.finish
+    end
+
+    def respond(engine, map = false)
+      css = engine.render
+
       resp = ::Rack::Response.new do |res|
         res.status = 200
         res.headers["Content-Type"] = "text/css"
         # last modified header
-        res.write css
+        res.write map ? engine.source_map : css
       end
       resp.finish
     end

data/lib/roger_sassc/sassc/asset_functions.rb

@@ -13,7 +13,7 @@ module RogerSassc
 
         if File.exist?(file)
           digest = Digest::SHA256.file(file).hexdigest
-          finger_printed_path = "#{path}?v=#{digest}"
+          finger_printed_path = "#{path.value}?v=#{digest}"
         else
           finger_printed_path = path.value
         end

data/lib/roger_sassc/version.rb

@@ -1,4 +1,4 @@
 # Version number
 module RogerSassc
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

data/roger_sassc.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sassc", "~> 1.2.0"
+  spec.add_dependency "sassc", "~> 1.10.0"
   spec.add_dependency "roger", "~> 1.0"
   spec.add_dependency "rack"
 

data/test/fixtures/errors/syntax.css

@@ -1,8 +1,8 @@
 /*
-Error: invalid property name
+Error: Invalid CSS after "...ckground: #fff;": expected "}", was ""
         on line 2 of test/fixtures/errors/syntax.scss
 >>   background: #fff;
-   -------------------^
+   --------------------^
 
 
 Load paths:
@@ -12,4 +12,4 @@ Load paths:
 body:before {
   white-space: pre;
   font-family: monospace;
-  content: 'Error: invalid property name\A        on line 2 of test/fixtures/errors/syntax.scss\A>>   background: #fff;\A   -------------------^\A'; }
+  content: 'Error: Invalid CSS after "...ckground: #fff;": expected "}", was ""\A        on line 2 of test/fixtures/errors/syntax.scss\A>>   background: #fff;\A   --------------------^\A'; }

data/test/fixtures/output.css.map

@@ -0,0 +1,10 @@
+{
+	"version": 3,
+	"file": "general.css",
+	"sources": [
+		"general.scss",
+		"src/_variables.scss"
+	],
+	"mappings": "AAEA,AACE,SADO,CACP,cAAc,CAAC;EACb,KAAK,ECJD,IAAI,GDKT",
+	"names": []
+}

data/test/fixtures/output_with_map.css

@@ -0,0 +1,4 @@
+.selector .baby-selector {
+  color: #000; }
+
+/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZ2VuZXJhbC5jc3MiLAoJInNvdXJjZXMiOiBbCgkJImdlbmVyYWwuc2NzcyIsCgkJInNyYy9fdmFyaWFibGVzLnNjc3MiCgldLAoJIm1hcHBpbmdzIjogIkFBRUEsQUFDRSxTQURPLENBQ1AsY0FBYyxDQUFDO0VBQ2IsS0FBSyxFQ0pELElBQUksR0RLVCIsCgkibmFtZXMiOiBbXQp9 */

data/test/middleware_test.rb

@@ -10,8 +10,16 @@ module RogerSassc
     include FixtureHelper
 
     def setup
+      setup_app(source_map: false, source_map_embed: false)
+    end
+
+    def teardown
+      @middleware.project.destroy
+    end
+
+    def setup_app(options = {})
       @app =  proc { [200, {}, ["YAM"]] } # Yet another middleware
-      @middleware = Middleware.new @app
+      @middleware = Middleware.new @app, options
 
       # Inject mock project
       @middleware.project = Roger::Testing::MockProject.new
@@ -22,10 +30,6 @@ module RogerSassc
       @request = Rack::MockRequest.new(@middleware)
     end
 
-    def teardown
-      @middleware.project.destroy
-    end
-
     def test_middleware_can_be_called
       assert(@middleware.respond_to?(:call))
     end
@@ -43,7 +47,25 @@ module RogerSassc
       path = fixture_path "general.scss"
       expected_css = fixture "output.css"
       @middleware.resolver = mock_resolver("test/fixtures/general.scss", path)
-      assert_equal @request.get("/test/fixtures/general.css").body, expected_css
+      assert_equal expected_css, @request.get("/test/fixtures/general.css").body
+    end
+
+    def test_response_with_source_map
+      setup_app(source_map: true)
+
+      path = fixture_path "general.scss"
+      expected_css = fixture "output.css.map"
+      @middleware.resolver = mock_resolver("test/fixtures/general.scss", path)
+      assert_equal expected_css, @request.get("/test/fixtures/general.css.map").body
+    end
+
+    def test_inline_source_map
+      setup_app(source_map: true)
+
+      path = fixture_path "general.scss"
+      expected_css = fixture "output_with_map.css"
+      @middleware.resolver = mock_resolver("test/fixtures/general.scss", path)
+      assert_equal expected_css, @request.get("/test/fixtures/general.css").body
     end
 
     def test_debug_syntax_error

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: roger_sassc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Edwin van der Graaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: roger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
 description: 
@@ -129,10 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -154,6 +155,8 @@ files:
 - test/fixtures/general.scss
 - test/fixtures/images/logo.svg
 - test/fixtures/output.css
+- test/fixtures/output.css.map
+- test/fixtures/output_with_map.css
 - test/fixtures/raise.scss
 - test/fixtures/src/_variables.scss
 - test/helpers/fixture_helper.rb
@@ -171,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sass plugin for Roger based on libsass
@@ -197,6 +200,8 @@ test_files:
 - test/fixtures/general.scss
 - test/fixtures/images/logo.svg
 - test/fixtures/output.css
+- test/fixtures/output.css.map
+- test/fixtures/output_with_map.css
 - test/fixtures/raise.scss
 - test/fixtures/src/_variables.scss
 - test/helpers/fixture_helper.rb