sassc-embedded 1.77.0 → 1.77.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d513301805669f2944f1dcc4f6ee8775554122531c7d41abca281c05acbb8351
-  data.tar.gz: 4a1576efa981b9c3e9b56a201793675d4764bb66b03cae8ea3f369eba9ed9f3f
+  metadata.gz: 5f6d451aad32416a320f1c23c4f312633e058955744c0da5a5e19ac967c2677d
+  data.tar.gz: 4d21e4f1aa6a0d79d697237e1825a4b770d4b85472c7dc2e762dcbcf3c842b51
 SHA512:
-  metadata.gz: 10bf726fb6e87dabcdb0003c8dd104675233fc56800bac7b27b13ce936e568bf0c24ec7638325aa30bba01320b5e8b2f0bb95d93a69126fdd60df515382edf65
-  data.tar.gz: 4998fcb9dd6b735b93802d32ea5067834e75dedcfd2ba6ee32debc3ec24bbe8dc6f6cb0347a265596f2ae0b3f00b78e436282f264f144bd9ee7e401f1fed3395
+  metadata.gz: 2dfd35f4e9053a3a51c89197c0079a877b20d8ee9f76cde280f20a40382452220e4afe735777c4fa99b7fd65e1d50c2aeef2aa05bba05734ff771c3c13b9c898
+  data.tar.gz: 8cde54ce2caca35192fcfd38c1f6244823c299924150418779e21e18635b7f3c70b1baef7a3cb8528d62ac598cfebd6388a51579a099aee1998351119e4c7ccd

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.77.0'
+    VERSION = '1.77.2'
   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
@@ -61,7 +60,7 @@ 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:'))
+      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
 
@@ -69,19 +68,18 @@ 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_url_to_path(url) if url.start_with?('file:') && !url.include?('?') && url != file_url
       end)
     end
 
     def source_map
       raise NotRenderedError unless @source_map
 
-      url = URI.parse(source_map_file_url || file_url)
+      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)
+          Uri.file_urls_to_relative_url(source, url)
         else
           source
         end
@@ -93,27 +91,13 @@ module SassC
     private
 
     def file_url
-      @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)
+      @file_url ||= Uri.path_to_file_url(File.absolute_path(filename || 'stdin'))
     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
 
@@ -317,12 +301,12 @@ module SassC
 
         containing_url = context.containing_url
 
-        path = URI.decode_uri_component(url)
-        parent_path = URI.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.include?('?')
-          canonical_url = URI.path_to_file_url(File.absolute_path(path, parent_dir))
+          canonical_url = Uri.path_to_file_url(File.absolute_path(path, parent_dir))
           if @importer_results.key?(canonical_url)
             canonical_url
           else
@@ -359,7 +343,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_url(resolved) unless resolved.nil?
       end
 
       def syntax(path)
@@ -375,7 +359,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_url(File.absolute_path(import.path, parent_dir))
           @importer_results[canonical_url] = if import.source.is_a?(Hash)
                                                {
                                                  contents: import.source[:contents],
@@ -394,13 +378,13 @@ module SassC
           return resolve_file_url(import.path, parent_dir, from_import)
         end
 
-        URI.encode_uri_path_component(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 = "#{containing_url}?url=#{URI.encode_uri_query_component(url)}&from_import=#{from_import}"
+        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'
@@ -564,15 +548,11 @@ module SassC
     end
   end
 
-  module URI
+  module Uri
     module_function
 
-    def join(...)
-      ::URI.join(...).to_s
-    end
-
-    def parse(str)
-      ::URI.parse(str)
+    def parse(...)
+      ::URI.parse(...)
     end
 
     def encode_uri_path_component(str)
@@ -623,5 +603,5 @@ module SassC
     end
   end
 
-  private_constant :URI
+  private_constant :Uri
 end

metadata

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