sassc-embedded 1.68.1 → 1.68.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1bae171b142e9c93398da7fd657e968c0804ce760bd7c05e04dc59a1d6c408
-  data.tar.gz: e45f9276e88a116aa2f83f592187b3705a6b2989b7837e90ca6917fbc418a51e
+  metadata.gz: e9bc5cac9cd760e5a3763752ed7972d9071daac5c73a4470ef51674222dea3d4
+  data.tar.gz: 5ee33293cc9ea0911f557812d5e6fd8d9f13c9da96427f0cb1e60f1ac806fe9b
 SHA512:
-  metadata.gz: 5f36c1fd78fbebbb9af4bf20126b0024aa0ca15a1900ed258390c449d1de36294c96160c0e9c76777d1a2ff053564b650b0b048038ceb03f7a2c64f3c9f8d88f
-  data.tar.gz: fc2bf82ab1c39773ea130bea388028c649dab02e71e35c9f31a2cbbb4f9a30be4718a535b628f5dbeef5fac1b43009e6c3776765c3d10b2399d0aba8019bd9ab
+  metadata.gz: 17245ae4b95349b96a89991ba2b9a6486a71e37dc146230f433416c224cd51f243983907415beb3464f5ef301c343406b197a3e85396dbc327e9de34d9d193fd
+  data.tar.gz: b2d86f258395f846fe809da335efc70e3be4e9527dd4e85c9744da0f4dc858e0860e6020f4a0fd6f72ce04b391c84f7d524061a2aad362492530f6c12766105e

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.68.1'
+    VERSION = '1.68.2'
   end
 end

data/lib/sassc/embedded.rb

@@ -49,7 +49,7 @@ module SassC
         source_mapping_url = if source_map_embed?
                                "data:application/json;base64,#{[@source_map].pack('m0')}"
                              else
-                               URL.unescape(URL.parse(source_map_file_url).route_from(url).to_s)
+                               URL.file_urls_to_relative_url(source_map_file_url, url)
                              end
         css += "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
@@ -61,7 +61,7 @@ module SassC
       line += 1 unless line.nil?
       url = e.span&.url
       path = if url&.start_with?(Protocol::FILE)
-               URL.unescape(URL.parse(url).route_from(URL.path_to_file_url("#{Dir.pwd}/")).to_s)
+               URL.file_urls_to_relative_path(url, URL.path_to_file_url("#{Dir.pwd}/"))
              end
       raise SyntaxError.new(e.full_message, filename: path, line: line)
     end
@@ -79,10 +79,10 @@ module SassC
 
       url = URL.parse(source_map_file_url || file_url)
       data = JSON.parse(@source_map)
-      data['file'] = URL.unescape(URL.parse(output_url).route_from(url).to_s) if output_url
+      data['file'] = URL.file_urls_to_relative_url(output_url, url) if output_url
       data['sources'].map! do |source|
         if source.start_with?(Protocol::FILE)
-          URL.unescape(URL.parse(source).route_from(url).to_s)
+          URL.file_urls_to_relative_url(source, url)
         else
           source
         end
@@ -309,7 +309,7 @@ module SassC
           @parent_urls.push(canonical_url)
           canonical_url
         elsif url.start_with?(Protocol::FILE)
-          path = URL.unescape(URL.parse(url).route_from(@parent_urls.last).to_s)
+          path = URL.file_urls_to_relative_path(url, @parent_urls.last)
           parent_path = URL.file_url_to_path(@parent_urls.last)
 
           imports = @importer.imports(path, parent_path)
@@ -354,7 +354,7 @@ module SassC
       end
 
       def resolve_file_url(url, parent_url, from_import)
-        path = URL.unescape(URL.parse(url).route_from(parent_url).to_s)
+        path = URL.file_urls_to_relative_path(url, parent_url)
         parent_path = URL.file_url_to_path(parent_url)
         [File.dirname(parent_path)].concat(load_paths).each do |load_path|
           resolved = FileImporter.resolve_path(File.absolute_path(path, load_path), from_import)
@@ -568,6 +568,14 @@ module SassC
       PARSER.unescape(str)
     end
 
+    def file_urls_to_relative_url(url, from_url)
+      URL.parse(url).route_from(from_url).to_s
+    end
+
+    def file_urls_to_relative_path(url, from_url)
+      URL.unescape(file_urls_to_relative_url(url, from_url))
+    end
+
     def file_url_to_path(url)
       return if url.nil?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.68.1
+  version: 1.68.2
 platform: ruby
 authors:
 - なつき
@@ -78,7 +78,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://rubydoc.info/gems/sassc
-  source_code_uri: https://github.com/ntkme/sassc-embedded-shim-ruby/tree/v1.68.1
+  source_code_uri: https://github.com/ntkme/sassc-embedded-shim-ruby/tree/v1.68.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []