sassc-embedded 1.77.1 → 1.77.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4b63d6cb7265fce189ee1c9dd5a5e6c06a2ae5d0d0ccf2fe88bf9ea15a0b4f2
-  data.tar.gz: 9742024209ffbcd80ec482028500370fb12343af829e814b3e4daf9d15e3a7f0
+  metadata.gz: 99fa34d4fed8be371256e537011984fe140afc7fe9cf899c8cb7b1ca25450bf3
+  data.tar.gz: 134de014d12ee7c95f06e5516ccc237b6c801c0762fa77d8be2121c9cf1c2ccd
 SHA512:
-  metadata.gz: d332ab05fee496aa0bcd14aad0d623a4309ef9244cf30125f191fc5542bc79c7cf2effe8e0ec2069a59384c621467097977b70c030e465c798f5b46860159ecb
-  data.tar.gz: e14c9ffb2dc052809527cc30619fa28224457523780237fd44004f953de09e867fb0ea2b1933a23cece2cb6cb3c8cb8ce2264096848c8cb86acd8876d55cec7a
+  metadata.gz: 15062c8552ed3210199f951aebf8eb698105131d36616f708e34fb9382b43c573a16bc4536c64159ead42f957001f5dea930812233a6f0e198d329dab24fb037
+  data.tar.gz: a3a2439a7a69cfdd35d3b5377ea081d46c81e027bba3c6cf5502d896694ba9b0bd73fb933283494ce05ab97f2d6d47bb585809ebe257c248005b8ba3fc7b0db5

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.77.1'
+    VERSION = '1.77.3'
   end
 end

data/lib/sassc/embedded.rb

@@ -46,11 +46,10 @@ module SassC
       css = result.css
       css += "\n" unless css.empty?
       unless @source_map.nil? || omit_source_map_url?
-        url = Uri.parse(output_url || file_url)
         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, url)
+                               Uri.file_urls_to_relative_url(source_map_file_url, file_url)
                              end
         css += "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
@@ -78,7 +77,6 @@ module SassC
 
       url = Uri.parse(source_map_file_url || file_url)
       data = JSON.parse(@source_map)
-      data['file'] = Uri.file_urls_to_relative_url(output_url, url) if output_url
       data['sources'].map! do |source|
         if source.start_with?('file:')
           Uri.file_urls_to_relative_url(source, url)
@@ -96,24 +94,10 @@ module SassC
       @file_url ||= Uri.path_to_file_url(File.absolute_path(filename || 'stdin'))
     end
 
-    def output_path
-      @output_path ||= @options.fetch(:output_path) do
-        "#{filename.delete_suffix(File.extname(filename))}.css" if filename
-      end
-    end
-
-    def output_url
-      @output_url ||= (Uri.path_to_file_url(File.absolute_path(output_path)) if output_path)
-    end
-
     def source_map_file_url
       @source_map_file_url ||= if source_map_file
-                                 # https://github.com/sass-contrib/sassc-embedded-shim-ruby/pull/69
-                                 # SassC does not encode path as uri for sourceMappingURL, which is technically wrong.
-                                 # However, this behavior has been abused to append query string to sourceMappingURL.
-                                 components = source_map_file.split('?', 2)
-                                 components[0] = Uri.path_to_file_url(File.absolute_path(components[0]))
-                                 components.join('?')
+                                 Uri.path_to_file_url(File.absolute_path(source_map_file))
+                                    .gsub('%3F', '?') # https://github.com/sass-contrib/sassc-embedded-shim-ruby/pull/69
                                end
     end
 
@@ -568,32 +552,45 @@ module SassC
     module_function
 
     def parse(...)
-      ::URI.parse(...)
-    end
-
-    def encode_uri_path_component(str)
-      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/]}n) do |match|
-        format('%%%02X', match.unpack1('C'))
-      end.force_encoding(str.encoding)
-    end
-
-    def encode_uri_query_component(str)
-      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/?]}n) do |match|
-        format('%%%02X', match.unpack1('C'))
-      end.force_encoding(str.encoding)
+      ::URI::RFC3986_PARSER.parse(...)
     end
 
-    def encode_uri_component(str)
-      str.b.gsub(/[^0-9A-Za-z\-._~]/n) do |match|
-        format('%%%02X', match.unpack1('C'))
-      end.force_encoding(str.encoding)
-    end
+    {
+      encode_uri_path_component: "!$&'()*+,;=:/@",
+      encode_uri_query_component: "!$&'()*+,;=:/?@",
+      encode_uri_component: nil,
+      encode_uri: "!$&'()*+,;=:/?#[]@"
+    }
+      .each do |symbol, extra_unescaped|
+        regexp = Regexp.new("[^0-9A-Za-z#{Regexp.escape("-._~#{extra_unescaped}")}]", Regexp::NOENCODING)
+        define_method(symbol) do |str|
+          str.b.gsub(regexp) do |match|
+            "%#{match.unpack1('H2').upcase}"
+          end.force_encoding(str.encoding)
+        end
+      end
 
-    def decode_uri_component(str)
-      str.gsub(/%[0-9A-Fa-f]{2}/) do |match|
-        [match[1, 2]].pack('H2')
+    {
+      decode_uri_component: nil,
+      decode_uri: "!$&'()*+,;=:/?#[]@"
+    }
+      .each do |symbol, preserve_escaped|
+        regexp = /%[0-9A-Fa-f]{2}/o
+        if preserve_escaped.nil?
+          define_method(symbol) do |str|
+            str.gsub(regexp) do |match|
+              [match[1, 2]].pack('H2')
+            end.force_encoding(str.encoding)
+          end
+        else
+          define_method(symbol) do |str|
+            str.gsub(regexp) do |match|
+              decoded = [match[1, 2]].pack('H2')
+              preserve_escaped.include?(decoded) ? match : decoded
+            end.force_encoding(str.encoding)
+          end
+        end
       end
-    end
 
     def file_urls_to_relative_url(url, from_url)
       parse(url).route_from(from_url).to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.77.1
+  version: 1.77.3
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-embedded
@@ -79,7 +79,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.77.1
+  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.77.3
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: