sassc-embedded 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4aac10a3cd54af31dbc864abbb46373e7d3e60b70b8de8d29acbf4e3f012c9
-  data.tar.gz: 4df26b873c9019d0abb12b20c8d2b2c90ad3684cc3748faba6e17518240c8848
+  metadata.gz: 94ea23724cbde018da55c68a8fa49ad4ea401b03e3b0e8ffe18ecddbc358845d
+  data.tar.gz: b6242dfa84029675f4484704227a881a31f0c6be6f8146c944b0a6100b420b9c
 SHA512:
-  metadata.gz: 8bc1d6a6eac3282c5e95e01411a76c639f49e7cf91cb970f33e2a4a5456a924bf3ccb9daba21ec8d2a42cdd04737f773ec1dacb571f23214c6ac64d20bfca778
-  data.tar.gz: b1a6d3d4c5d8a1a18d75aa0ae451ed900a8f9da0f22edfc4aec2ffe836f9307d4b3e7426744efa6ee73799d347e3e7cb8505305e84cef3906a75cd6b4cd4182d
+  metadata.gz: b2d72e3155a69dafeb1967969a1d44aa971f1fda65c00cc221283ed4c6637ebd8e5ec5854622ca01df96bdf2a6e72b901ae664de967e53cf73ffa55e3586cf87
+  data.tar.gz: 8c710e8dd44938506fef282b5266af5cfaafd2c8a06f750b2296538102c0e88cf7dfc7dae4a08f01c230a9e638a6a546413adf306ddc2f21360ee241da8c84f9

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.5'
+    VERSION = '1.1.1'
   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
@@ -163,8 +163,8 @@ module SassC
     private
 
     def arguments_from_native_list(native_argument_list)
-      native_argument_list.map do |embedded_value|
-        Script::ValueConversion.from_native embedded_value, @options
+      native_argument_list.map do |native_value|
+        Script::ValueConversion.from_native(native_value, @options)
       end.compact
     end
 
@@ -175,7 +175,7 @@ module SassC
         raise ::Sass::ScriptError
       end
     rescue StandardError => e
-      unless e.full_message.include? e.cause.full_message
+      unless e.full_message.include?(e.cause.full_message)
         ::Sass::ScriptError.class_eval do
           def full_message(*args, **kwargs)
             full_message = super(*args, **kwargs)
@@ -200,7 +200,7 @@ module SassC
     end
 
     class FileImporter
-      def find_file_url(url, **_kwargs)
+      def find_file_url(url, **)
         return url if url.start_with?('file:')
       end
     end
@@ -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?
@@ -225,8 +229,8 @@ module SassC
 
         canonical_url = "sassc-embedded:#{canonical_url}"
 
-        imports = @importer.imports path, @importer.options[:filename]
-        unless imports.is_a? Array
+        imports = @importer.imports(path, @importer.options[:filename])
+        unless imports.is_a?(Array)
           return if imports.path == path
 
           imports = [imports]
@@ -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
@@ -408,8 +422,8 @@ module SassC
       return if path.nil?
 
       path = File.absolute_path(path)
-      path = "/#{path}" unless path.start_with? '/'
-      URI::File.build([nil, URI_PARSER.escape(path)]).to_s
+      path = "/#{path}" unless path.start_with?('/')
+      URI::File.build([nil, escape(path)]).to_s
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -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.5
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.5
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.1.1
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.1.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []