sassc-embedded 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e2addfbb017852dd21ee5479229563bdefe9cc16e09bc24f869be9a373de0e5
-  data.tar.gz: 3440bfd0846119ea58c412e87898d2e195764e81fd443bf29b61eff452702d49
+  metadata.gz: 70c90e46b79aadd3b3ba316365eb9d45a854e75be4634a008f4e7e54cec17dd0
+  data.tar.gz: 1991dc737c3739f2c9b497e904b5dda5dd734cdb55fdba6dd3e65fcacc81086e
 SHA512:
-  metadata.gz: 9072fe76ae2e6574cc15428e7d270883d8914d3d7c55ab63caa100750755095d3f0b06cf461db20190feb5c82012b5559b8a9fa50dab99e582a423edb0567264
-  data.tar.gz: 1dfe21ca7f48a5e1a8d1a5391cf62ea35dc3ff6bf5eb69673ae20daa549453a2e74d7c7371a744a59ec636f4608281797492bb3f307780e836a33e5c7a48debe
+  metadata.gz: '09c1017da2a0fd5b1bbb35e9b60514b2f687de9a745f5540317582336c34c7b8a43e201cf5f2efe8a1fdb2e18f0123537690902db504576923a5df96b898ff7f'
+  data.tar.gz: cb1e8fef114385a5e8cc622e88e1e42ea3763c3a378108067b341865de63f8add6103a7e0b7874ddd6b2981e78dc53ada984df1809056cc65621382ac8865957

data/README.md

@@ -51,6 +51,6 @@ See [rubydoc.info/gems/sassc](https://rubydoc.info/gems/sassc) for full API docu
 
 4. Option `:line_comments` is ignored.
 
-5. In `Importer#imports(path, parent_path)`, argument `path` is set to absolute path, and argument `parent_path` is set to value of option `:filename`.
+5. Argument `parent_path` in `Importer#imports(path, parent_path)` is set to value of option `:filename`.
 
 See [the dart-sass documentation](https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass) for other differences.

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.0.4'
+    VERSION = '1.1.0'
   end
 end

data/lib/sassc/embedded.rb

@@ -38,14 +38,14 @@ module SassC
 
       @dependencies = result.loaded_urls
                             .filter { |url| url.start_with?('file:') && url != file_url }
-                            .map { |url| Util.file_url_to_path(url) }
+                            .map { |url| URL.file_url_to_path(url) }
       @source_map = post_process_source_map(result.source_map)
 
       return post_process_css(result.css) unless quiet?
     rescue ::Sass::CompileError => e
       line = e.span&.start&.line
       line += 1 unless line.nil?
-      path = Util.file_url_to_path(e.span&.url)
+      path = URL.file_url_to_path(e.span&.url)
       path = relative_path(Dir.pwd, path) unless path.nil?
       raise SyntaxError.new(e.message, filename: path, line: line)
     end
@@ -60,7 +60,7 @@ module SassC
     end
 
     def file_url
-      @file_url ||= Util.path_to_file_url(filename || 'stdin')
+      @file_url ||= URL.path_to_file_url(filename || 'stdin')
     end
 
     def syntax
@@ -98,11 +98,11 @@ module SassC
 
       source_map_dir = File.dirname(source_map_file || '')
 
-      data['file'] = Util::URI_PARSER.escape(relative_path(source_map_dir, output_path)) if output_path
+      data['file'] = URL.escape(relative_path(source_map_dir, output_path)) if output_path
 
       data['sources'].map! do |source|
-        if source.start_with? 'file:'
-          relative_path(source_map_dir, Util.file_url_to_path(source))
+        if source.start_with?('file:')
+          relative_path(source_map_dir, URL.file_url_to_path(source))
         else
           source
         end
@@ -117,7 +117,7 @@ module SassC
         url = if source_map_embed?
                 "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
               else
-                Util::URI_PARSER.escape(relative_path(File.dirname(output_path || ''), source_map_file))
+                URL.escape(relative_path(File.dirname(output_path || ''), source_map_file))
               end
         css += "\n/*# sourceMappingURL=#{url} */"
       end
@@ -165,7 +165,7 @@ module SassC
     def arguments_from_native_list(native_argument_list)
       native_argument_list.map do |embedded_value|
         Script::ValueConversion.from_native embedded_value, @options
-      end
+      end.compact
     end
 
     begin
@@ -214,8 +214,12 @@ module SassC
       end
 
       def canonicalize(url, **)
-        path = Util.file_url_to_path(url)
-        canonical_url = Util.path_to_file_url(File.absolute_path(path))
+        path = if url.start_with?('file:')
+                 URL.file_url_to_path(url)
+               else
+                 URL.unescape(url)
+               end
+        canonical_url = URL.path_to_file_url(File.absolute_path(path))
 
         if @importer_results.key?(canonical_url)
           return if @importer_results[canonical_url].nil?
@@ -234,7 +238,7 @@ module SassC
 
         dirname = File.dirname(@importer.options.fetch(:filename, 'stdin'))
         contents = imports.map do |import|
-          import_url = Util.path_to_file_url(File.absolute_path(import.path, dirname))
+          import_url = URL.path_to_file_url(File.absolute_path(import.path, dirname))
           @importer_results[import_url] = if import.source
                                             {
                                               contents: import.source,
@@ -247,7 +251,7 @@ module SassC
                                                         :scss
                                                       end,
                                               source_map_url: if import.source_map_path
-                                                                Util.path_to_file_url(
+                                                                URL.path_to_file_url(
                                                                   File.absolute_path(
                                                                     import.source_map_path, dirname
                                                                   )
@@ -391,15 +395,25 @@ module SassC
     end
   end
 
-  module Util
+  module URL
+    PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+
+    private_constant :PARSER
+
     module_function
 
-    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+    def escape(str)
+      PARSER.escape(str)
+    end
+
+    def unescape(str)
+      PARSER.unescape(str)
+    end
 
     def file_url_to_path(url)
       return if url.nil?
 
-      path = URI_PARSER.unescape(URI.parse(url).path)
+      path = unescape(URI.parse(url).path)
       path = path[1..] if Gem.win_platform? && path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
       path
     end
@@ -409,7 +423,7 @@ module SassC
 
       path = File.absolute_path(path)
       path = "/#{path}" unless path.start_with? '/'
-      URI::File.build([nil, URI_PARSER.escape(path)]).to_s
+      URI::File.build([nil, escape(path)]).to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - なつき
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.4
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.4
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.1.0
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.1.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []