sassc-embedded 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0678b3173a808bb49c1772c1188fa5401989602679332cda0b016d98252dfe
-  data.tar.gz: 280d458c11585dcdfe5915ad55a2079b323d6b520dd54c6b4f716fcddcfd8c3c
+  metadata.gz: 9fa48bc9c63a5d180324a991c7b8ceb33889b158d96a46260d7426c393406ecd
+  data.tar.gz: 66e8b53ea62239dbcc8ddfb00a41b332d9569384b0275df0f0e572d3c4bb091c
 SHA512:
-  metadata.gz: a636e215cd5db491aedf47b256b6f4111e14933a8ac299b74001a18a90e5d4f8b27f554a5667d419b28b7c5fa4288ef03ec4263dd0388b1aedc8698b357b5c4e
-  data.tar.gz: da72a50497341ff4a461e9d0f946a885eb516a18961b25a68176b2abf5e82116077bc92d0e57a34b7c6d33f6b0e7304b7d66333d7f21e7ac961b412062e19465
+  metadata.gz: 533e3f95958424301761fd4c599c59717c008307d0aea4fcdd2a12d89684369f590b8e003044ee967a8ac6aa21207eae530188802bd2c5c1a6a9c2efbf7e1289
+  data.tar.gz: a93ac934bd5229337a3a4daa2740624fd2d1e19c8b37764bc98cdb51f43ce964544487be3b184a962ca8c8f4c17061763d6bafb2f3daacd668c02af7e3e863ab

data/lib/sassc/embedded/version.rb

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

data/lib/sassc/embedded.rb

@@ -46,14 +46,17 @@ 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
-      @options[:output_path]
+      @output_path ||= @options.fetch(
+        :output_path,
+        ("#{File.basename(filename, File.extname(filename))}.css" if filename)
+      )
     end
 
     def file_url
@@ -93,11 +96,17 @@ module SassC
 
       data = JSON.parse(source_map)
 
-      data['file'] = URI::DEFAULT_PARSER.escape(output_path) if output_path
+      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
@@ -112,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
@@ -120,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
 
@@ -389,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
@@ -402,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: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - なつき
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.0
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.0
+  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: []