sass-embedded 0.19.0 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573a157ee6e0c3fa51cefec5c011649717718133d934e031a339d32a84838a13
-  data.tar.gz: ef27dd3177b8f58f3dd19180340686901597e9ac05efa77e2f9cc12b7784dbbb
+  metadata.gz: 5bd880f5e8c75f6b6a49d2359b96df7f11b49cad5273f81d08a46eeac5c105f1
+  data.tar.gz: ac523992c522ae01aac03727690d35c67f00d1d24d3d73d36400917b29968616
 SHA512:
-  metadata.gz: 538de1728de2da841ce66648d669acec38a4a3c3f15357e5d33e1d5dac773f246b43f29d244ec39076fc3d18504f6935374f9a5277baac7a1c400548b44aef5b
-  data.tar.gz: 26db551dd98592327a0c7e4fc9ee39c5917b1aff92431bfc7cdac6eea3c79899439c976512c7bed393493f564fd00e0ccafe735fe8cd8a514827d7a42b689d58
+  metadata.gz: 586635d023e843dbcc27e48669b5421f9e1488d90770f062a55e02328cec114753c5e8c94ba8b2afcb1d8ddace38eff746ffb3357bfdf27efd999d9c33edc388
+  data.tar.gz: 3aca765800907870df8a5fe377ab7211be5293f244c7b140ed6ca6de7f0588589b4f76e8e8258fc1da8b8e8d136126de6f873579ae91136c5c60178d2951e416

data/ext/sass/extconf.rb

@@ -215,9 +215,11 @@ module Sass
       def default_sass_embedded_protocol
         repo = 'sass/embedded-protocol'
 
-        tag_name = IO.popen([Compiler::PATH, '--version']) do |file|
-          JSON.parse(file.read)['protocolVersion']
-        end
+        stdout, stderr, status = Open3.capture3(Compiler::PATH, '--version')
+
+        raise stderr unless status.success?
+
+        tag_name = JSON.parse(stdout)['protocolVersion']
 
         "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
       end

data/lib/sass/embedded/dispatcher.rb

@@ -33,7 +33,7 @@ module Sass
 
           id = @id
           @id = id.next
-          @observers.store(id, observer)
+          @observers[id] = observer
           id
         end
       end
@@ -76,9 +76,11 @@ module Sass
           half_close
           @observers[message.id]&.send(outbound_message.message, message)
         when :compile_response, :version_response
-          @observers[message.id]&.send(outbound_message.message, message)
+          @observers[message.id].send(outbound_message.message, message)
         when :log_event, :canonicalize_request, :import_request, :file_import_request, :function_call_request
-          @observers[message.compilation_id]&.send(outbound_message.message, message)
+          Thread.new(@observers[message.compilation_id]) do |observer|
+            observer.send(outbound_message.message, message)
+          end
         else
           raise ArgumentError, "Unknown OutboundMessage.message #{message}"
         end

data/lib/sass/embedded/host.rb

@@ -35,7 +35,7 @@ module Sass
                           logger:,
                           quiet_deps:,
                           verbose:)
-        async do
+        await do
           @function_registry = FunctionRegistry.new(functions, alert_color: alert_color)
           @importer_registry = ImporterRegistry.new(importers, load_paths, alert_color: alert_color)
           @logger_registry = LoggerRegistry.new(logger)
@@ -67,7 +67,7 @@ module Sass
       end
 
       def version_request
-        async do
+        await do
           send_message EmbeddedProtocol::InboundMessage.new(
             version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
               id: id
@@ -118,7 +118,7 @@ module Sass
 
       private
 
-      def async
+      def await
         @mutex.synchronize do
           @connection = @channel.connect(self)
           @async = Async.new

data/lib/sass/embedded/legacy.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
-require 'json'
-require 'pathname'
-require 'uri'
-
 # The Sass module.
 #
 # This communicates with Embedded Dart Sass using the Embedded Sass protocol.
@@ -87,10 +82,13 @@ module Sass
                source_map_root: '',
                functions: {},
                importer: [])
-      start = now
-
       raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
 
+      require 'pathname'
+      require 'uri'
+
+      start = now
+
       indent_type = parse_indent_type(indent_type)
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
@@ -217,6 +215,9 @@ module Sass
                          source_map_root:)
       return if map.nil? || map.empty?
 
+      require 'base64'
+      require 'json'
+
       map_data = JSON.parse(map)
 
       map_data['sourceRoot'] = source_map_root
@@ -371,30 +372,33 @@ module Sass
     # @deprecated
     # The {Url} module.
     module Url
-      # The {::URI::Parser} that is in consistent with RFC 2396 (URI Generic Syntax) and dart:core library.
-      URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-
       FILE_SCHEME = 'file://'
 
-      private_constant :URI_PARSER, :FILE_SCHEME
+      private_constant :FILE_SCHEME
 
       module_function
 
       def path_to_file_url(path)
         if File.absolute_path? path
-          URI_PARSER.escape "#{FILE_SCHEME}#{Gem.win_platform? ? '/' : ''}#{path}"
+          uri_parser.escape "#{FILE_SCHEME}#{Gem.win_platform? ? '/' : ''}#{path}"
         else
-          URI_PARSER.escape path
+          uri_parser.escape path
         end
       end
 
       def file_url_to_path(url)
         if url.start_with? FILE_SCHEME
-          URI_PARSER.unescape url[(FILE_SCHEME.length + (Gem.win_platform? ? 1 : 0))..]
+          uri_parser.unescape url[(FILE_SCHEME.length + (Gem.win_platform? ? 1 : 0))..]
         else
-          URI_PARSER.unescape url
+          uri_parser.unescape url
         end
       end
+
+      private
+
+      def uri_parser
+        @uri_parser ||= URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+      end
     end
 
     private_constant :LegacyImporter

data/lib/sass/embedded/protofier.rb

@@ -9,20 +9,24 @@ module Sass
       module_function
 
       def from_proto_compile_response(compile_response)
-        if compile_response.result == :failure
+        result = compile_response.send(compile_response.result)
+        case compile_response.result
+        when :failure
           raise CompileError.new(
-            compile_response.failure.message,
-            compile_response.failure.formatted,
-            compile_response.failure.stack_trace,
-            from_proto_source_span(compile_response.failure.span)
+            result.message,
+            result.formatted,
+            result.stack_trace,
+            from_proto_source_span(result.span)
           )
+        when :success
+          CompileResult.new(
+            result.css,
+            result.source_map,
+            result.loaded_urls
+          )
+        else
+          raise ArgumentError, "Unknown CompileResponse.result #{result}"
         end
-
-        CompileResult.new(
-          compile_response.success.css,
-          compile_response.success.source_map,
-          compile_response.success.loaded_urls
-        )
       end
 
       def from_proto_source_span(source_span)

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.19.0'
+    VERSION = '0.19.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.3
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -163,8 +163,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.19.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.19.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.19.3
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.19.3
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []