sass-embedded 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d392419747bbe1cffb4c3843a60a8de343a07fc938c1ad061ce8cde4519fd4a
-  data.tar.gz: 358c8083d14d6d27d84d6091cad64dd39e35c1076295e030b668386b4856098a
+  metadata.gz: c66e86f830cc084c0a5a24104a6b6bc9fc0c57bb8fe4e0e52ee15a5b320ecec6
+  data.tar.gz: 1439b6e65bd51f2f589e3dbc62670ea37dc36a365217f69b76e989bf286e62c2
 SHA512:
-  metadata.gz: 3a50de89e870d5d4fe054eb0702da7774fba5e445e65fba3efb9364d6ed140bbb07cb1dec2d06bee96d08cf79017c383a921def2487c78468c2a3fe2c3e6a54e
-  data.tar.gz: e746cc7db807ab73557e03d342d7a5f88d81b7c581a5969d2a63dec1a63699828bc49fcfa1fa4d80ac5edb8452495b15bc8c2e5163127d4985276490c3259e98
+  metadata.gz: 7bc51670f5c2cc7cd4edbea3d490d6182ef7d3eb9ebfb800e248dd7a2053828816722f2906c7e41c352821fd79a8ea462e3cf119e2bb6cd3daa05b7e4aa6f0f3
+  data.tar.gz: bb7724417e10a1b4642702cf4f5973647698121e3ea358a4bd3b86b4ea47c07527d4af7338040b75033223132a57e9502356781bd3022f0f0c5fc4f9e02fd26e

data/lib/sass/embedded/compile_context.rb

@@ -50,7 +50,11 @@ module Sass
 
         @alert_ascii = alert_ascii
         @alert_color = alert_color
-        @logger = logger
+
+        %i[debug warn].each do |sym|
+          instance_variable_set("@#{sym}".to_sym, get_method(logger, sym))
+        end
+
         @quiet_deps = quiet_deps
         @verbose = verbose
 
@@ -72,9 +76,7 @@ module Sass
         when EmbeddedProtocol::OutboundMessage::LogEvent
           return unless message.compilation_id == id
 
-          Thread.new do
-            log message
-          end
+          log message
         when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
           return unless message.compilation_id == id
 
@@ -111,24 +113,26 @@ module Sass
       def log(event)
         case event.type
         when :DEBUG
-          if @logger.respond_to? :debug
-            @logger.debug(event.message, span: Logger::SourceSpan.from_proto(event.span))
-          else
+          if @debug.nil?
             Kernel.warn(event.formatted)
+          else
+            @debug.call(event.message, span: Logger::SourceSpan.from_proto(event.span))
           end
         when :DEPRECATION_WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: true, span: Logger::SourceSpan.from_proto(event.span),
-                                        stack: event.stack_trace)
-          else
+          if @warn.nil?
             Kernel.warn(event.formatted)
+          else
+            @warn.call(event.message, deprecation: true,
+                                      span: Logger::SourceSpan.from_proto(event.span),
+                                      stack: event.stack_trace)
           end
         when :WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: false, span: Logger::SourceSpan.from_proto(event.span),
-                                        stack: event.stack_trace)
-          else
+          if @warn.nil?
             Kernel.warn(event.formatted)
+          else
+            @warn.call(event.message, deprecation: false,
+                                      span: Logger::SourceSpan.from_proto(event.span),
+                                      stack: event.stack_trace)
           end
         end
       end
@@ -155,7 +159,9 @@ module Sass
       end
 
       def canonicalize_response(canonicalize_request)
-        url = importer_with_id(canonicalize_request.importer_id).canonicalize canonicalize_request.url
+        importer = importer_with_id(canonicalize_request.importer_id)
+        url = get_method(importer, :canonicalize).call canonicalize_request.url,
+                                                       from_import: canonicalize_request.from_import
 
         EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
           id: canonicalize_request.id,
@@ -169,14 +175,15 @@ module Sass
       end
 
       def import_response(import_request)
-        importer_result = importer_with_id(import_request.importer_id).load import_request.url
+        importer = importer_with_id(import_request.importer_id)
+        importer_result = get_method(importer, :load).call import_request.url
 
         EmbeddedProtocol::InboundMessage::ImportResponse.new(
           id: import_request.id,
           success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            contents: importer_result.contents,
-            syntax: to_proto_syntax(importer_result.syntax),
-            source_map_url: importer_result.source_map_url
+            contents: get_attr(importer_result, :contents),
+            syntax: to_proto_syntax(get_attr(importer_result, :syntax)),
+            source_map_url: get_attr(importer_result, :source_map_url)
           )
         )
       rescue StandardError => e
@@ -188,8 +195,10 @@ module Sass
 
       def file_import_response(file_import_request)
         file_importer = importer_with_id(file_import_request.importer_id)
-        file_url = file_importer.find_file_url file_import_request.url,
-                                               from_import: file_import_request.from_import
+        file_url = get_method(file_importer, :find_file_url).call file_import_request.url,
+                                                                  from_import: file_import_request.from_import
+
+        raise "file_url must be a file: URL, was \"#{file_url}\"" if !file_url.nil? && !file_url.start_with?('file:')
 
         EmbeddedProtocol::InboundMessage::FileImportResponse.new(
           id: file_import_request.id,
@@ -237,16 +246,19 @@ module Sass
         when :compressed
           EmbeddedProtocol::OutputStyle::COMPRESSED
         else
-          raise ArgumentError, 'output_style must be one of :expanded, :compressed'
+          raise ArgumentError, 'style must be one of :expanded, :compressed'
         end
       end
 
       def to_proto_importer(importer, id)
-        if importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
+        is_importer = get_method(importer, :canonicalize) && get_method(importer, :load)
+        is_file_importer = get_method(importer, :find_file_url)
+
+        if is_importer && !is_file_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
             importer_id: id
           )
-        elsif importer.respond_to?(:find_file_url)
+        elsif is_file_importer && !is_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
             file_importer_id: id
           )
@@ -276,6 +288,32 @@ module Sass
           @importers[id]
         end
       end
+
+      def get_method(obj, sym)
+        sym = sym.to_sym
+        if obj.respond_to? sym
+          obj.method(sym)
+        elsif obj.respond_to? :[]
+          if obj[sym].respond_to? :call
+            obj[sym]
+          elsif obj[sym.to_s].respond_to? :call
+            obj[sym.to_s]
+          end
+        end
+      end
+
+      def get_attr(obj, sym)
+        sym = sym.to_sym
+        if obj.respond_to? sym
+          obj.method(sym).call
+        elsif obj.respond_to? :[]
+          if obj[sym]
+            obj[sym]
+          elsif obj[sym.to_s]
+            obj[sym.to_s]
+          end
+        end
+      end
     end
   end
 end

data/lib/sass/embedded/render.rb

@@ -317,7 +317,7 @@ module Sass
         @importer_results = {}
       end
 
-      def canonicalize(url)
+      def canonicalize(url, **_kwargs)
         path = Url.file_url_to_path(url)
         canonical_url = Url.path_to_file_url(File.absolute_path(path, (@file.nil? ? 'stdin' : @file)))
 

data/lib/sass/embedded/url.rb

@@ -6,24 +6,26 @@ module Sass
   class Embedded
     # The {Url} module.
     module Url
-      # The {::URI::Parser} that is in consistent with Dart Uri.
+      # The {::URI::Parser} that is in consistent with RFC 2396 (URI Generic Syntax) and dart:core library.
       URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
-      private_constant :URI_PARSER
+      FILE_SCHEME = 'file://'
+
+      private_constant :URI_PARSER, :FILE_SCHEME
 
       module_function
 
       def path_to_file_url(path)
         if File.absolute_path? path
-          "file://#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{URI_PARSER.escape(path)}"
+          URI_PARSER.escape "#{FILE_SCHEME}#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{path}"
         else
-          URI_PARSER.escape(path)
+          URI_PARSER.escape path
         end
       end
 
       def file_url_to_path(url)
-        if url.start_with? 'file://'
-          URI_PARSER.unescape url[(Platform::OS == 'windows' ? 8 : 7)..]
+        if url.start_with? FILE_SCHEME
+          URI_PARSER.unescape url[(FILE_SCHEME.length + (Platform::OS == 'windows' ? 1 : 0))..]
         else
           URI_PARSER.unescape url
         end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/lib/sass/logger.rb

@@ -3,18 +3,22 @@
 module Sass
   # The {Logger} module.
   module Logger
-    # The instance of a slient {Logger}.
-    def self.slient
-      @slient ||= Slient.new
+    module_function
+
+    # The instance of a silent {Logger}.
+    def silent
+      Silent
     end
 
-    # The slient {Logger}.
-    class Slient
+    # The silent {Logger}.
+    module Silent
+      module_function
+
       def warn(message, deprecation: false, span: nil, stack: nil); end
 
       def debug(message, span: nil); end
     end
 
-    private_constant :Slient
+    private_constant :Silent
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -164,8 +192,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.11.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.11.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.12.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.12.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []