sassc-embedded 0.1.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe03b54e8132123c3163daf289d2a5c5159048f6fb11fe5ca4e1dd07ce863085
-  data.tar.gz: 1bf0ac9a65e8754b49fc33475806fc04da1e96c22c082d878291db7fedcb5a1e
+  metadata.gz: 9fa48bc9c63a5d180324a991c7b8ceb33889b158d96a46260d7426c393406ecd
+  data.tar.gz: 66e8b53ea62239dbcc8ddfb00a41b332d9569384b0275df0f0e572d3c4bb091c
 SHA512:
-  metadata.gz: c766e3c592a2624689cd5d6f5d9e2865c3b2bd866711cd8fc22b7e62ea6b0e9baea17d693e756e204360d0b3f6564180161f8ea99759821dde111e5f280f10f1
-  data.tar.gz: dd6c13854965b5826cbc64406c8c81a09024c584b24efdb87e131dc7b30753233085121bfa5080a8100ce5f975ee928d2b9b6e365d979e110e3acae9ceb8f463
+  metadata.gz: 533e3f95958424301761fd4c599c59717c008307d0aea4fcdd2a12d89684369f590b8e003044ee967a8ac6aa21207eae530188802bd2c5c1a6a9c2efbf7e1289
+  data.tar.gz: a93ac934bd5229337a3a4daa2740624fd2d1e19c8b37764bc98cdb51f43ce964544487be3b184a962ca8c8f4c17061763d6bafb2f3daacd668c02af7e3e863ab

data/README.md

@@ -19,7 +19,7 @@ gem install sassc-embedded
 This polyfill utilizes `sass-embedded` to allow you to compile SCSS or SASS syntax to CSS. To compile, use a `SassC::Engine`, e.g.:
 
 ``` ruby
-require 'sassc/embedded'
+require 'sassc-embedded'
 
 SassC::Engine.new(sass, style: :compressed).render
 ```

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '0.1.2'
+    VERSION = '1.0.1'
   end
 end

data/lib/sassc/embedded.rb

@@ -22,7 +22,7 @@ module SassC
         syntax: syntax,
         url: file_url,
 
-        source_map: !source_map_file.nil?,
+        source_map: source_map_embed? || !source_map_file.nil?,
         source_map_include_sources: source_map_contents?,
         style: output_style,
 
@@ -46,12 +46,19 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       path = Util.file_url_to_path(e.span&.url)
-      path = relative_path(Dir.pwd, path)
+      path = relative_path(Dir.pwd, path) unless path.nil?
       raise SyntaxError.new(e.message, filename: path, line: line)
     end
 
     private
 
+    def output_path
+      @output_path ||= @options.fetch(
+        :output_path,
+        ("#{File.basename(filename, File.extname(filename))}.css" if filename)
+      )
+    end
+
     def file_url
       @file_url ||= Util.path_to_file_url(filename || 'stdin')
     end
@@ -89,9 +96,17 @@ module SassC
 
       data = JSON.parse(source_map)
 
+      source_map_dir = File.dirname(source_map_file || '')
+
+      if output_path
+        data['file'] = Util::URI_PARSER.escape(
+          relative_path(source_map_dir, output_path)
+        )
+      end
+
       data['sources'].map! do |source|
         if source.start_with? 'file:'
-          relative_path(Dir.pwd, Util.file_url_to_path(source))
+          relative_path(source_map_dir, Util.file_url_to_path(source))
         else
           source
         end
@@ -106,7 +121,9 @@ module SassC
         url = if source_map_embed?
                 "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
               else
-                URI::DEFAULT_PARSER.escape(source_map_file)
+                Util::URI_PARSER.escape(
+                  relative_path(File.dirname(output_path || ''), source_map_file)
+                )
               end
         css += "\n/*# sourceMappingURL=#{url} */"
       end
@@ -114,7 +131,7 @@ module SassC
     end
 
     def relative_path(from, to)
-      Pathname.new(to).relative_path_from(Pathname.new(from)).to_s
+      Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
     end
   end
 
@@ -383,10 +400,12 @@ module SassC
   module Util
     module_function
 
+    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+
     def file_url_to_path(url)
       return if url.nil?
 
-      path = URI::DEFAULT_PARSER.unescape(URI.parse(url).path)
+      path = URI_PARSER.unescape(URI.parse(url).path)
       path = path[1..] if Gem.win_platform? && path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
       path
     end
@@ -396,7 +415,7 @@ module SassC
 
       path = File.absolute_path(path)
       path = "/#{path}" unless path.start_with? '/'
-      URI::File.build([nil, URI::DEFAULT_PARSER.escape(path)]).to_s
+      URI::File.build([nil, URI_PARSER.escape(path)]).to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.1
 platform: ruby
 authors:
 - なつき
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/0.1.2
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v0.1.2
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.1
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []