sassc-embedded 1.77.5 → 1.77.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f893a88e7993e70cec58055829a076f43869ac843f4b30741ac0377b7a358ab
-  data.tar.gz: 5a431b6429c3d6e0d1f2d010efc517d926bfebfb2d9ed454087c312b661f028d
+  metadata.gz: 4a5084e30e04703dd21157b4dd3bf32abee7f789e939056a033bc4ddb4c2b1a2
+  data.tar.gz: eb1f8e6e1ce7ea90364fccbd4241fb5ccb677ae29a11ed385ec8c1bec068ae85
 SHA512:
-  metadata.gz: 0e49489a1079584157456035a5c1bcf932c53a320e371fdb78c3b2cfc3eb74f7369330df925504943237ccf734cd5e4d8801b1ad37179a1a414595e3b32e5565
-  data.tar.gz: 1107e84ae76c86f032feb15d9162aef04423daef1726e381e6e515e982e02b69178900fd6e07ce1e82efc95d7fa5859caa07bb60d754e15f6cd335ba69a85647
+  metadata.gz: 0a1bc6dc872c8cb0ebec80c1cc4d7550b62445515a3e6eca3d510094aadc0c48ce8d213ad5b31934501150b3f771efcdc931560befb87b8c827f74a0cb80fe4e
+  data.tar.gz: d9012320b9955c2aea7012bd11d0874dbf3b68ff807e6b7b5f395b22e7b8e4bbc75f48c38c9618fd2da669fd093193c61c257afd0eebc1507cba5a2ab792a0a4

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.77.5'
+    VERSION = '1.77.7'
   end
 end

data/lib/sassc/embedded.rb

@@ -231,7 +231,7 @@ module SassC
 
     private_constant :FileImporter
 
-    class FileSystemImporter
+    module FileSystemImporter
       class << self
         def resolve_path(path, from_import)
           ext = File.extname(path)
@@ -308,6 +308,7 @@ module SassC
       def initialize(importer)
         @importer = importer
         @importer_results = {}
+        @importer_result = nil
         @file_url = nil
       end
 
@@ -322,28 +323,29 @@ module SassC
 
         if containing_url.include?('?')
           canonical_url = Uri.path_to_file_url(File.absolute_path(path, parent_dir))
-          if @importer_results.key?(canonical_url)
-            canonical_url
-          else
+          unless @importer_results.key?(canonical_url)
             @file_url = resolve_file_url(path, parent_dir, context.from_import)
-            nil
+            return
           end
         else
           imports = @importer.imports(path, parent_path)
           imports = [SassC::Importer::Import.new(path)] if imports.nil?
           imports = [imports] unless imports.is_a?(Array)
           canonical_url = imports_to_native(imports, parent_dir, context.from_import, url, containing_url)
-          if @importer_results.key?(canonical_url)
-            canonical_url
-          else
+          unless @importer_results.key?(canonical_url)
             @file_url = canonical_url
-            nil
+            return
           end
         end
+
+        @importer_result = @importer_results.delete(canonical_url)
+        canonical_url
       end
 
-      def load(canonical_url)
-        @importer_results.delete(canonical_url)
+      def load(_canonical_url)
+        importer_result = @importer_result
+        @importer_result = nil
+        importer_result
       end
 
       def find_file_url(_url, context)
@@ -588,40 +590,51 @@ module SassC
       ::URI::RFC3986_PARSER.parse(...)
     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
+    end.freeze
+    encode_uri_hash.freeze
+    decode_uri_hash.freeze
+
     {
-      encode_uri_path_component: "!$&'()*+,;=:/@",
-      encode_uri_query_component: "!$&'()*+,;=:/?@",
-      encode_uri_component: nil,
-      encode_uri: "!$&'()*+,;=:/?#[]@"
+      uri_path_component: "!$&'()*+,;=:/@",
+      uri_query_component: "!$&'()*+,;=:/?@",
+      uri_component: nil,
+      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)
+      .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
 
-    {
-      decode_uri_component: nil,
-      decode_uri: "!$&'()*+,;=:/?#[]@"
-    }
-      .each do |symbol, preserve_escaped|
-        regexp = /%[0-9A-Fa-f]{2}/o
-        if preserve_escaped.nil? || preserve_escaped.empty?
-          define_method(symbol) do |str|
-            str.gsub(regexp) do |match|
-              [match.reverse!].pack('h2')
-            end.force_encoding(str.encoding)
-          end
-        else
-          define_method(symbol) do |str|
-            str.gsub(regexp) do |match|
-              decoded = [match.reverse].pack('h2')
-              preserve_escaped.include?(decoded) ? match : decoded
-            end.force_encoding(str.encoding)
-          end
+        next if symbol.match?(/_.+_/o)
+
+        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.to_h do |key, value|
+                                                    [key, unescaped.include?(value) ? key : value]
+                                                  end.freeze
+                                                end
+
+        define_method(:"decode_#{symbol}") do |str|
+          str.gsub(decode_regexp, decode_uri_hash_with_preserve_escaped).force_encoding(str.encoding)
         end
       end
 

metadata

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