sass-embedded 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d80ba547e32d13dc4a4b9f0760e8203df64c5481dea662564e1872bff6bec9
-  data.tar.gz: 363baff44d6a57b5ad5cd6e8963c915b582a147b2c360182e8218ce4ae7a7338
+  metadata.gz: 8a920bc1fd2f9767c87dcc604c8ad44266b285310a7b0e9e46cf65c7a610ba4d
+  data.tar.gz: 8041922c104b94fb0bc4634735444315692a0d9a37a50db3cf213a9914455bb0
 SHA512:
-  metadata.gz: 12f310e82141b47c7fe61b06a03df7abd00ec06cb9b268aa6c29bd28a523d7182014caaabdd314bebcaeeddad7c62517cb0fda180a81a4ca276862207f8f796b
-  data.tar.gz: 5d4a397ec28e27cedc67c3467a2ffa91b9d8fe0e3ae02b0939fb29fa05a61a0156a7a5a3a6c6eceb6a8049b23867136a94b3962e360db29dd8d3427032f2a52e
+  metadata.gz: 180d0212926afd166fafc991cf30e8af33adc843171ec69d53a4b42ad7d587857e77a224cf8c25f343af7bacd6b76eeb5f2b93fd7c9886d2fd83105de3d891cc
+  data.tar.gz: 3d91c28089e6157b815a63cdc5b93d8adc2bb81f56828d6e3554c633ed31d845c070361797f32b45ae3bfbc39e034866a2c8e17f80a2222b5c827f9a2669a985

data/lib/sass/embedded.rb

@@ -75,7 +75,7 @@ module Sass
           elsif message.failure.span.url == ''
             'stdin'
           else
-            Util.path(message.failure.span.url)
+            Util.path_from_file_uri(message.failure.span.url)
           end,
           message.failure.span ? message.failure.span.start.line + 1 : nil,
           message.failure.span ? message.failure.span.start.column + 1 : nil,
@@ -138,7 +138,7 @@ module Sass
       source_map_dir = File.dirname(source_map_path)
 
       if out_file
-        map_data['file'] = Util.relative(source_map_dir, out_file)
+        map_data['file'] = Util.relative_path(source_map_dir, out_file)
       elsif file
         ext = File.extname(file)
         map_data['file'] = "#{file[0..(ext.empty? ? -1 : -ext.length - 1)]}.css"
@@ -149,10 +149,10 @@ module Sass
       map_data['sourcesContent'] = [] if source_map_contents
 
       map_data['sources'].map! do |source|
-        if source.start_with? Util::FILE_PROTOCOL
-          path = Util.path(source)
+        if source.start_with? 'file://'
+          path = Util.path_from_file_uri(source)
           map_data['sourcesContent'].push(File.read(path)) if source_map_contents
-          Util.relative(source_map_dir, path)
+          Util.relative_path(source_map_dir, path)
         else
           map_data['sourcesContent'].push(nil) if source_map_contents
           source
@@ -184,7 +184,7 @@ module Sass
         url = if source_map_embed
                 "data:application/json;base64,#{Base64.strict_encode64(map)}"
               elsif out_file
-                Util.relative(File.dirname(out_file), source_map)
+                Util.relative_path(File.dirname(out_file), source_map)
               else
                 source_map
               end

data/lib/sass/render.rb

@@ -97,7 +97,7 @@ module Sass
     end
 
     def canonicalize_response(canonicalize_request)
-      url = Util.file_uri(File.absolute_path(canonicalize_request.url, (@file.nil? ? 'stdin' : @file)))
+      url = Util.file_uri_from_path(File.absolute_path(canonicalize_request.url, (@file.nil? ? 'stdin' : @file)))
 
       begin
         result = @importer[canonicalize_request.importer_id].call canonicalize_request.url, @file
@@ -123,7 +123,7 @@ module Sass
           url: url
         )
       elsif result&.key? :file
-        canonicalized_url = Util.file_uri(result[:file])
+        canonicalized_url = Util.file_uri_from_path(result[:file])
 
         # TODO: FileImportRequest is not supported yet.
         # Workaround by reading contents and return it when server asks
@@ -185,7 +185,7 @@ module Sass
     def url
       return if @file.nil?
 
-      Util.file_uri @file
+      Util.file_uri_from_path @file
     end
 
     def string

data/lib/sass/util.rb

@@ -1,39 +1,28 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require 'uri'
 
 module Sass
   # The {Util} module.
   module Util
     module_function
 
-    FILE_PROTOCOL = 'file://'
+    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
-    def file_uri(path)
+    def file_uri_from_path(path)
       absolute_path = File.absolute_path(path)
 
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = components[0][0].downcase
-        absolute_path = components.join File::SEPARATOR
-      end
+      absolute_path = File::SEPARATOR + absolute_path unless absolute_path.start_with? File::SEPARATOR
 
-      "#{FILE_PROTOCOL}#{absolute_path}"
+      URI_PARSER.escape("file://#{absolute_path}")
     end
 
-    def path(file_uri)
-      absolute_path = file_uri[FILE_PROTOCOL.length..]
-
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = "#{components[0].upcase}:"
-        absolute_path = components.join File::SEPARATOR
-      end
-
-      absolute_path
+    def path_from_file_uri(file_uri)
+      URI_PARSER.unescape(file_uri)[7..]
     end
 
-    def relative(from, to)
+    def relative_path(from, to)
       Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
     end
 

data/lib/sass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -165,7 +165,7 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.3
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.4
 post_install_message:
 rdoc_options: []
 require_paths: