sassc-embedded 1.76.0 → 1.77.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24ea775d0adc29dba8cf3b768bdf8971291a149b87268c6bd458f8f591c9d5a
-  data.tar.gz: 77a1ea85d8d417ae42df42b3cea656fef5f565656f36b9a083b08eebf9dde7ec
+  metadata.gz: 4a5084e30e04703dd21157b4dd3bf32abee7f789e939056a033bc4ddb4c2b1a2
+  data.tar.gz: eb1f8e6e1ce7ea90364fccbd4241fb5ccb677ae29a11ed385ec8c1bec068ae85
 SHA512:
-  metadata.gz: 54ab5857d5198e676d6467edd4c65973d0f29b80917f2c79b3a331b3e59551aa990b6b89f2b170576db644d86b3659f1abd98b9ce74dfe357d5738b4ca76e9ca
-  data.tar.gz: ab2d3db860f54f72c5aed4b5c5271183856ef3831542c13a57304b04ed052896c87c46e6e154b7cb7a521241e8d7eebb3e7a8f6fec1a373d368cca8b301cc54f
+  metadata.gz: 0a1bc6dc872c8cb0ebec80c1cc4d7550b62445515a3e6eca3d510094aadc0c48ce8d213ad5b31934501150b3f771efcdc931560befb87b8c827f74a0cb80fe4e
+  data.tar.gz: d9012320b9955c2aea7012bd11d0874dbf3b68ff807e6b7b5f395b22e7b8e4bbc75f48c38c9618fd2da669fd093193c61c257afd0eebc1507cba5a2ab792a0a4

data/lib/sassc/embedded/version.rb

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

data/lib/sassc/embedded.rb

@@ -10,6 +10,8 @@ require_relative 'embedded/version'
 
 module SassC
   class Engine
+    remove_method(:render) if public_method_defined?(:render, false)
+
     def render
       return @template.dup if @template.empty?
 
@@ -46,11 +48,10 @@ module SassC
       css = result.css
       css += "\n" unless css.empty?
       unless @source_map.nil? || omit_source_map_url?
-        url = URL.parse(output_url || file_url)
         source_mapping_url = if source_map_embed?
                                "data:application/json;base64,#{[@source_map].pack('m0')}"
                              else
-                               URL.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
@@ -61,29 +62,30 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       url = e.span&.url
-      path = if url&.start_with?(Protocol::FILE)
-               URL.file_urls_to_relative_path(url, URL.path_to_file_url("#{Dir.pwd}/"))
-             end
+      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:)
     end
 
+    remove_method(:dependencies) if public_method_defined?(:dependencies, false)
+
     def dependencies
       raise NotRenderedError unless @loaded_urls
 
       Dependency.from_filenames(@loaded_urls.filter_map do |url|
-        URL.file_url_to_path(url) if url.start_with?(Protocol::FILE) && url != file_url
+        Uri.file_url_to_path(url) if url.start_with?('file:') && !url.include?('?') && url != file_url
       end)
     end
 
+    remove_method(:source_map) if public_method_defined?(:source_map, false)
+
     def source_map
       raise NotRenderedError unless @source_map
 
-      url = URL.parse(source_map_file_url || file_url)
+      url = Uri.parse(source_map_file_url || file_url)
       data = JSON.parse(@source_map)
-      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.file_urls_to_relative_url(source, url)
+        if source.start_with?('file:')
+          Uri.file_urls_to_relative_url(source, url)
         else
           source
         end
@@ -95,35 +97,29 @@ module SassC
     private
 
     def file_url
-      @file_url ||= URL.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 ||= (URL.path_to_file_url(File.absolute_path(output_path)) if output_path)
+      @file_url ||= Uri.path_to_file_url(File.absolute_path(filename || 'stdin'))
     end
 
     def source_map_file_url
-      @source_map_file_url ||= (URL.path_to_file_url(File.absolute_path(source_map_file)) if source_map_file)
+      @source_map_file_url ||= if source_map_file
+                                 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
 
+    remove_method(:output_style) if private_method_defined?(:output_style, false)
+
     def output_style
       @output_style ||= begin
-        style = @options.fetch(:style, :sass_style_nested).to_s
-        style = "sass_style_#{style}" unless style.start_with?('sass_style_')
-        raise InvalidStyleError unless OUTPUT_STYLES.include?(style.to_sym)
+        style = @options.fetch(:style, :sass_style_nested).to_s.delete_prefix('sass_style_').to_sym
 
-        style = style.delete_prefix('sass_style_').to_sym
         case style
-        when :nested, :compact
+        when :nested, :compact, :expanded
           :expanded
+        when :compressed
+          :compressed
         else
-          style
+          raise InvalidStyleError
         end
       end
     end
@@ -134,12 +130,16 @@ module SassC
       syntax
     end
 
+    remove_method(:load_paths) if private_method_defined?(:load_paths, false)
+
     def load_paths
       @load_paths ||= (@options[:load_paths] || []) + SassC.load_paths
     end
   end
 
   class FunctionsHandler
+    remove_method(:setup) if public_method_defined?(:setup, false)
+
     def setup(_native_options, functions: Script::Functions)
       @callbacks = {}
 
@@ -172,6 +172,8 @@ module SassC
 
     private
 
+    remove_method(:arguments_from_native_list) if private_method_defined?(:arguments_from_native_list, false)
+
     def arguments_from_native_list(native_argument_list)
       native_argument_list.filter_map do |native_value|
         Script::ValueConversion.from_native(native_value, @options)
@@ -190,6 +192,8 @@ module SassC
   private_constant :NoopImporter
 
   class ImportHandler
+    remove_method(:setup) if public_method_defined?(:setup, false)
+
     def setup(_native_options)
       if @importer
         import_cache = ImportCache.new(@importer)
@@ -227,7 +231,7 @@ module SassC
 
     private_constant :FileImporter
 
-    class FileSystemImporter
+    module FileSystemImporter
       class << self
         def resolve_path(path, from_import)
           ext = File.extname(path)
@@ -304,48 +308,44 @@ module SassC
       def initialize(importer)
         @importer = importer
         @importer_results = {}
+        @importer_result = nil
         @file_url = nil
       end
 
       def canonicalize(url, context)
-        return if context.containing_url.nil?
+        return unless context.containing_url&.start_with?('file:')
 
-        containing_url = if context.containing_url.start_with?(Protocol::GLOB)
-                           URL.unescape(URL.parse(context.containing_url).fragment)
-                         else
-                           context.containing_url
-                         end
+        containing_url = context.containing_url
 
-        return unless containing_url.start_with?(Protocol::FILE)
-
-        path = URL.unescape(url)
-        parent_path = URL.file_url_to_path(containing_url)
+        path = Uri.decode_uri_component(url)
+        parent_path = Uri.file_url_to_path(containing_url)
         parent_dir = File.dirname(parent_path)
 
-        if containing_url == context.containing_url
+        if containing_url.include?('?')
+          canonical_url = Uri.path_to_file_url(File.absolute_path(path, parent_dir))
+          unless @importer_results.key?(canonical_url)
+            @file_url = resolve_file_url(path, parent_dir, context.from_import)
+            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, context.containing_url)
-          if @importer_results.key?(canonical_url)
-            canonical_url
-          else
+          canonical_url = imports_to_native(imports, parent_dir, context.from_import, url, containing_url)
+          unless @importer_results.key?(canonical_url)
             @file_url = canonical_url
-            nil
-          end
-        else
-          canonical_url = URL.path_to_file_url(File.absolute_path(path, parent_dir))
-          if @importer_results.key?(canonical_url)
-            canonical_url
-          else
-            @file_url = resolve_file_url(path, parent_dir, context.from_import)
-            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)
@@ -360,7 +360,7 @@ module SassC
 
       def resolve_file_url(path, parent_dir, from_import)
         resolved = FileSystemImporter.resolve_path(File.absolute_path(path, parent_dir), from_import)
-        URL.path_to_file_url(resolved) unless resolved.nil?
+        Uri.path_to_file_url(resolved) unless resolved.nil?
       end
 
       def syntax(path)
@@ -376,7 +376,7 @@ module SassC
 
       def import_to_native(import, parent_dir, from_import, canonicalize)
         if import.source
-          canonical_url = URL.path_to_file_url(File.absolute_path(import.path, parent_dir))
+          canonical_url = Uri.path_to_file_url(File.absolute_path(import.path, parent_dir))
           @importer_results[canonical_url] = if import.source.is_a?(Hash)
                                                {
                                                  contents: import.source[:contents],
@@ -395,13 +395,13 @@ module SassC
           return resolve_file_url(import.path, parent_dir, from_import)
         end
 
-        URL.escape(import.path)
+        Uri.encode_uri_path_component(import.path)
       end
 
       def imports_to_native(imports, parent_dir, from_import, url, containing_url)
         return import_to_native(imports.first, parent_dir, from_import, true) if imports.one?
 
-        canonical_url = "#{Protocol::GLOB}?#{URL.escape(url)}##{URL.escape(containing_url)}"
+        canonical_url = "#{containing_url}?url=#{Uri.encode_uri_query_component(url)}&from_import=#{from_import}"
         @importer_results[canonical_url] = {
           contents: imports.flat_map do |import|
             at_rule = from_import ? '@import' : '@forward'
@@ -419,6 +419,10 @@ module SassC
   end
 
   class Sass2Scss
+    class << self
+      remove_method(:convert) if public_method_defined?(:convert, false)
+    end
+
     def self.convert(sass)
       {
         contents: sass,
@@ -430,6 +434,10 @@ module SassC
   module Script
     class Value
       class String
+        class << self
+          remove_method(:quote) if public_method_defined?(:quote, false)
+        end
+
         # Returns the quoted string representation of `contents`.
         #
         # @options opts :quote [String]
@@ -442,6 +450,8 @@ module SassC
           opts[:sass] ? contents.gsub('#', '\#') : contents
         end
 
+        remove_method(:to_s) if public_method_defined?(:to_s, false)
+
         def to_s(opts = {})
           opts = { quote: :none }.merge!(opts) if @type == :identifier
           self.class.quote(@value, opts)
@@ -450,6 +460,10 @@ module SassC
     end
 
     module ValueConversion
+      class << self
+        remove_method(:from_native) if public_method_defined?(:from_native, false)
+      end
+
       def self.from_native(value, options)
         case value
         when ::Sass::Value::Null::NULL
@@ -505,6 +519,10 @@ module SassC
         end
       end
 
+      class << self
+        remove_method(:to_native) if public_method_defined?(:to_native, false)
+      end
+
       def self.to_native(value)
         case value
         when nil
@@ -565,59 +583,84 @@ module SassC
     end
   end
 
-  module Protocol
-    FILE = 'file:'
-    GLOB = 'sassc-embedded-glob:'
-  end
-
-  private_constant :Protocol
-
-  module URL
-    PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-
-    private_constant :PARSER
-
+  module Uri
     module_function
 
-    def join(...)
-      URI.join(...).to_s
+    def parse(...)
+      ::URI::RFC3986_PARSER.parse(...)
     end
 
-    def parse(str)
-      PARSER.parse(str)
-    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
+
+    {
+      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
 
-    def escape(str)
-      PARSER.escape(str)
-    end
+        next if symbol.match?(/_.+_/o)
 
-    def unescape(str)
-      PARSER.unescape(str)
-    end
+        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
 
     def file_urls_to_relative_url(url, from_url)
       parse(url).route_from(from_url).to_s
     end
 
     def file_urls_to_relative_path(url, from_url)
-      unescape(file_urls_to_relative_url(url, from_url))
+      decode_uri_component(file_urls_to_relative_url(url, from_url))
     end
 
     def file_url_to_path(url)
-      return if url.nil?
-
-      path = unescape(parse(url).path)
-      path = path[1..] if Gem.win_platform? && path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
+      path = decode_uri_component(parse(url).path)
+      if path.start_with?('/')
+        windows_path = path[1..]
+        path = windows_path if File.absolute_path?(windows_path)
+      end
       path
     end
 
     def path_to_file_url(path)
-      return if path.nil?
-
       path = "/#{path}" unless path.start_with?('/')
-      "file://#{escape(path)}"
+
+      "file://#{encode_uri_path_component(path)}"
     end
   end
 
-  private_constant :URL
+  private_constant :Uri
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.76.0
+  version: 1.77.7
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-embedded
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '1.77'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '1.77'
 description: An embedded sass shim for SassC.
 email:
 - i@ntk.me
@@ -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.76.0
+  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: 
@@ -91,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with SassC!