sassc-embedded 1.80.8 → 1.80.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b00967b3088cd97f97b51d7d0385a51bebc438d481808722bd8019eaa06fafb
-  data.tar.gz: ca1c07140d6393273f646e7df8acc7bc7dc40b136ad23702d73e0db37ed58c63
+  metadata.gz: ce2b5df08cbde379c1890a5b9407116c219ff7193e5556e05cab8dd5bf952cc0
+  data.tar.gz: 2d121c14fde27d64de95827bccec1230b4eebb4b2f438583db7f9014fbcd8f5c
 SHA512:
-  metadata.gz: 5464cf8007928398c6af6be568232c4e481c0403b89e4ff8a19f4284a17ba8bd8a246597b02b5ca417695730ca7bd7f131e5b63bcf6d8fdff58925968749e348
-  data.tar.gz: 32ba5bc913e46860e3e68786e476772f1f86ed7f591182f0029e1d5d7acb97222b027b93b2f441a214032979578ac1f000eb4f8622579fcaae8e55bded5f389b
+  metadata.gz: 656f84a31fe4df337792da0f387b86a2bf6eb3e5c9b4387990ec08a73709a093035afe60cb774644fe997847995eaef0c92ea28862c53fe8f6f38733a7af4766
+  data.tar.gz: 164477d5d55ecf7e207c6365ef5c4226fbe89f330691361defea69371b0b1ead70e7713b4b68d22743a4eaacbde476c4e036452c45ceb82228e7359ba1e5cac9

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.80.8'
+    VERSION = '1.80.9'
   end
 end

data/lib/sassc/embedded.rb

@@ -47,7 +47,7 @@ module SassC
         source_mapping_url = if source_map_embed?
                                "data:application/json;base64,#{[@source_map].pack('m0')}"
                              else
-                               Uri.file_urls_to_relative_url(source_map_file_url, file_url)
+                               Uri.decode_uri_component(Uri.relative(source_map_file_url, file_url))
                              end
         css << "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
@@ -58,8 +58,8 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       url = e.span&.url
-      path = (Uri.file_urls_to_relative_path(url, Uri.path_to_file_url("#{Dir.pwd}/")) if url&.start_with?('file:'))
-      raise SyntaxError.new(e.full_message, filename: path, line:)
+      filename = (Uri.decode_uri_component(Uri.relative(url, Uri.pwd)) if url&.start_with?('file:'))
+      raise SyntaxError.new(e.message, filename:, line:)
     end
 
     remove_method(:dependencies) if public_method_defined?(:dependencies, false)
@@ -68,7 +68,7 @@ module SassC
       raise NotRenderedError unless @loaded_urls
 
       Dependency.from_filenames(@loaded_urls.filter_map do |url|
-        Uri.file_url_to_path(url) if url.start_with?('file:') && !url.include?('?') && url != file_url
+        Uri.file_uri_to_path(url) if url.start_with?('file:') && !url.include?('?') && url != file_url
       end)
     end
 
@@ -77,11 +77,11 @@ module SassC
     def source_map
       raise NotRenderedError unless @source_map
 
-      url = Uri.parse(source_map_file_url || file_url)
+      url = source_map_file_url || file_url
       data = JSON.parse(@source_map)
       data['sources'].map! do |source|
         if source.start_with?('file:')
-          Uri.file_urls_to_relative_url(source, url)
+          Uri.relative(source, url)
         else
           source
         end
@@ -93,12 +93,12 @@ module SassC
     private
 
     def file_url
-      @file_url ||= Uri.path_to_file_url(File.absolute_path(filename || 'stdin'))
+      @file_url ||= Uri.path_to_file_uri(File.absolute_path(filename || 'stdin'))
     end
 
     def source_map_file_url
       @source_map_file_url ||= if source_map_file
-                                 Uri.path_to_file_url(File.absolute_path(source_map_file))
+                                 Uri.path_to_file_uri(File.absolute_path(source_map_file))
                                     .gsub('%3F', '?') # https://github.com/sass-contrib/sassc-embedded-shim-ruby/pull/69
                                end
     end
@@ -143,15 +143,11 @@ module SassC
       Script.custom_functions(functions:).each_with_object({}) do |custom_function, callbacks|
         callback = lambda do |native_argument_list|
           function_arguments = arguments_from_native_list(native_argument_list)
-          begin
-            result = functions_wrapper.send(custom_function, *function_arguments)
-          rescue StandardError
-            raise ::Sass::ScriptError, "Error: error in C function #{custom_function}"
-          end
+          result = functions_wrapper.send(custom_function, *function_arguments)
           to_native_value(result)
         rescue StandardError => e
-          warn "[SassC::FunctionsHandler] #{e.cause.message}"
-          raise e
+          error(e.message)
+          raise
         end
 
         callbacks[Script.formatted_function_name(custom_function, functions:)] = callback
@@ -173,6 +169,12 @@ module SassC
     def to_native_value(sass_value)
       Script::ValueConversion.to_native(sass_value)
     end
+
+    remove_method(:error) if private_method_defined?(:error, false)
+
+    def error(message)
+      warn "[SassC::FunctionsHandler] #{message}"
+    end
   end
 
   module NoopImporter
@@ -304,11 +306,11 @@ module SassC
         containing_url = context.containing_url
 
         path = Uri.decode_uri_component(url)
-        parent_path = Uri.file_url_to_path(containing_url)
+        parent_path = Uri.file_uri_to_path(containing_url)
         parent_dir = File.dirname(parent_path)
 
         if containing_url.include?('?')
-          canonical_url = Uri.path_to_file_url(File.absolute_path(path, parent_dir))
+          canonical_url = Uri.path_to_file_uri(File.absolute_path(path, parent_dir))
           unless @importer_results.key?(canonical_url)
             @file_url = resolve_file_url(path, parent_dir, context.from_import)
             return
@@ -344,7 +346,7 @@ module SassC
 
       def resolve_file_url(path, parent_dir, from_import)
         resolved = FileSystemImporter.resolve_path(File.absolute_path(path, parent_dir), from_import)
-        Uri.path_to_file_url(resolved) unless resolved.nil?
+        Uri.path_to_file_uri(resolved) unless resolved.nil?
       end
 
       def syntax(path)
@@ -360,7 +362,7 @@ module SassC
 
       def import_to_native(import, parent_dir, from_import, canonicalize)
         if import.source
-          canonical_url = Uri.path_to_file_url(File.absolute_path(import.path, parent_dir))
+          canonical_url = Uri.path_to_file_uri(File.absolute_path(import.path, parent_dir))
           @importer_results[canonical_url] = if import.source.is_a?(Hash)
                                                {
                                                  contents: import.source[:contents],
@@ -572,71 +574,41 @@ module SassC
     end
   end
 
-  module Uri
-    module_function
+  class SyntaxError
+    def detailed_message(...)
+      return super unless cause.is_a?(::Sass::CompileError)
 
-    def parse(...)
-      ::URI::RFC3986_PARSER.parse(...)
+      cause.detailed_message(...).gsub(cause.class.name, self.class.name)
     end
 
-    encode_uri_hash = {}
-    decode_uri_hash = {}
-    256.times do |i|
-      c = -[i].pack('C')
-      h = c.unpack1('H')
-      l = c.unpack1('h')
-      pdd = -"%#{h}#{l}"
-      pdu = -"%#{h}#{l.upcase}"
-      pud = -"%#{h.upcase}#{l}"
-      puu = -pdd.upcase
-      encode_uri_hash[c] = puu
-      decode_uri_hash[pdd] = c
-      decode_uri_hash[pdu] = c
-      decode_uri_hash[pud] = c
-      decode_uri_hash[puu] = c
+    def full_message(...)
+      return super unless cause.is_a?(::Sass::CompileError)
+
+      cause.full_message(...).gsub(cause.class.name, self.class.name)
     end
-    encode_uri_hash.freeze
-    decode_uri_hash.freeze
-
-    {
-      uri_path_component: "!$&'()*+,;=:/@",
-      uri_query_component: "!$&'()*+,;=:/?@",
-      uri_component: nil,
-      uri: "!$&'()*+,;=:/?#[]@"
-    }
-      .each do |symbol, unescaped|
-        encode_regexp = Regexp.new("[^0-9A-Za-z#{Regexp.escape("-._~#{unescaped}")}]", Regexp::NOENCODING)
-
-        define_method(:"encode_#{symbol}") do |str|
-          str.b.gsub(encode_regexp, encode_uri_hash).force_encoding(str.encoding)
-        end
+  end
 
-        next if symbol.match?(/_.+_/o)
+  module Uri
+    module_function
 
-        decode_regexp = /%[0-9A-Fa-f]{2}/o
-        decode_uri_hash_with_preserve_escaped = if unescaped.nil? || unescaped.empty?
-                                                  decode_uri_hash
-                                                else
-                                                  decode_uri_hash.each_with_object({}) do |(key, value), hash|
-                                                    hash[key] = unescaped.include?(value) ? key : value
-                                                  end.freeze
-                                                end
+    def decode_uri_component(str)
+      str.b.gsub(/%\h\h/, ::URI::TBLDECWWWCOMP_).force_encoding(str.encoding)
+    end
 
-        define_method(:"decode_#{symbol}") do |str|
-          str.gsub(decode_regexp, decode_uri_hash_with_preserve_escaped).force_encoding(str.encoding)
-        end
-      end
+    def encode_uri_component(str)
+      str.b.gsub(/[^0-9A-Za-z\-._~]/n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
 
-    def file_urls_to_relative_url(url, from_url)
-      parse(url).route_from(from_url).to_s
+    def encode_uri_path_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
     end
 
-    def file_urls_to_relative_path(url, from_url)
-      decode_uri_component(file_urls_to_relative_url(url, from_url))
+    def encode_uri_query_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/?]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
     end
 
-    def file_url_to_path(url)
-      path = decode_uri_component(parse(url).path)
+    def file_uri_to_path(uri)
+      path = decode_uri_component(::URI::RFC3986_PARSER.parse(uri).path)
       if path.start_with?('/')
         windows_path = path[1..]
         path = windows_path if File.absolute_path?(windows_path)
@@ -644,11 +616,20 @@ module SassC
       path
     end
 
-    def path_to_file_url(path)
+    def path_to_file_uri(path)
       path = "/#{path}" unless path.start_with?('/')
-
       "file://#{encode_uri_path_component(path)}"
     end
+
+    def pwd
+      pwd = Dir.pwd
+      pwd += '/' unless pwd.end_with?('/')
+      path_to_file_uri(pwd)
+    end
+
+    def relative(to, from)
+      ::URI::RFC3986_PARSER.parse(to).route_from(from).to_s
+    end
   end
 
   private_constant :Uri

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.80.8
+  version: 1.80.9
 platform: ruby
 authors:
 - なつき
@@ -78,7 +78,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/issues
   documentation_uri: https://rubydoc.info/gems/sassc
-  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.80.8
+  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.80.9
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Use dart-sass with SassC!
 test_files: []