sass-embedded 1.2.3 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3195026a16f9bd04832907250e362bcbfc05959275acfe8a28d432ec97eb4c9e
-  data.tar.gz: c2521f1aa1ba8c1b593ab6e3b8c268ccfca2c9e6e5ea4f62b6cbf8ce9f268911
+  metadata.gz: cf67d1d4e17eeb4d3968b3072b326a671e71854a8e4f676a21dab017318bcba8
+  data.tar.gz: 42cdfb746375c84ecb4010d10c92e44db8e745f094c342830aae868bf0256055
 SHA512:
-  metadata.gz: 7076f36abadb77d58ebf939aa966a711899ab0973b5991081934bdd67cfa527f735b70c5c84bc9a1d40338e779399a693580052e0cf32a482d6c4a1a19d7740c
-  data.tar.gz: 414d12d0fef0c9a054691170c889bddd0a0efb090090d85d6ef4beebd0127c15681a6039b1c10f45ffb1eb8a572d971464c67fbfa7171d915d6cbb67b1221f55
+  metadata.gz: 1c0c4c9ef537d355dc59dbd690f16c7b6db8668ca34f13eefdfeda9dcd0f508e8357c526dbeb541a65c4d20bb62894dc163d338469747a991ceb480dcb5a5f8f
+  data.tar.gz: 242adf57d77229bef1e0881116d849f00de46e0b9d64227792cb69f5de27ba467f90e6e2c7267f0f4095ffb0f119f8e332946e7a076b0262d65b4138db3d02c6

data/ext/sass/Rakefile

@@ -23,7 +23,7 @@ end
 
 file 'embedded.rb' => %w[sass_embedded] do |t|
   path = 'sass_embedded/dart-sass-embedded'
-  path = "#{path}#{(Gem.win_platform? ? ['.exe', '.bat'] : ['', '.sh']).find { |ext| File.exist? "#{path}#{ext}" }}"
+  path = "#{path}#{['.exe', '.bat'].find { |ext| File.exist? "#{path}#{ext}" }}" if Gem.win_platform?
 
   raise "#{path} not found" unless File.exist? path
 

data/lib/sass/embedded/dispatcher.rb

@@ -11,15 +11,19 @@ module Sass
       def initialize
         @compiler = Compiler.new
         @observers = {}
-        @id = 0
+        # TODO: Revert to `@id = 0` when upstream bug is fixed
+        # https://github.com/sass/dart-sass-embedded/pull/80
+        @id = 0xfffffffe
         @mutex = Mutex.new
 
         Thread.new do
           loop do
             receive_message EmbeddedProtocol::OutboundMessage.decode @compiler.read
           rescue IOError, Errno::EBADF => e
-            half_close
-            @observers.each_value do |observer|
+            @mutex.synchronize do
+              @id = PROTOCOL_ERROR_ID
+              @observers.values
+            end.each do |observer|
               observer.error e
             end
             break
@@ -29,7 +33,7 @@ module Sass
 
       def subscribe(observer)
         @mutex.synchronize do
-          raise EOFError if half_closed?
+          raise EOFError if @id == PROTOCOL_ERROR_ID
 
           id = @id
           @id = id.next
@@ -42,7 +46,7 @@ module Sass
         @mutex.synchronize do
           @observers.delete(id)
 
-          close if half_closed? && @observers.empty?
+          close if @id == PROTOCOL_ERROR_ID && @observers.empty?
         end
       end
 
@@ -60,33 +64,21 @@ module Sass
 
       private
 
-      def half_close
-        @mutex.synchronize do
-          @id = PROTOCOL_ERROR_ID
-        end
-      end
-
-      def half_closed?
-        @id == PROTOCOL_ERROR_ID
-      end
-
       def receive_message(outbound_message)
         oneof = outbound_message.message
         message = outbound_message.public_send(oneof)
         case oneof
         when :error
-          half_close
-          if message.id == PROTOCOL_ERROR_ID
-            @observers.each_value do |observer|
-              observer.public_send(oneof, message)
-            end
-          else
-            @observers[message.id].public_send(oneof, message)
+          @mutex.synchronize do
+            @id = PROTOCOL_ERROR_ID
+            message.id == PROTOCOL_ERROR_ID ? @observers.values : [@observers[message.id]]
+          end.each do |observer|
+            observer.public_send(oneof, message)
           end
         when :compile_response, :version_response
-          @observers[message.id].public_send(oneof, message)
+          @mutex.synchronize { @observers[message.id] }.public_send(oneof, message)
         when :log_event, :canonicalize_request, :import_request, :file_import_request, :function_call_request
-          Thread.new(@observers[message.compilation_id]) do |observer|
+          Thread.new(@mutex.synchronize { @observers[message.compilation_id] }) do |observer|
             observer.public_send(oneof, message)
           end
         else

data/lib/sass/embedded/host.rb

@@ -13,7 +13,6 @@ module Sass
     class Host
       def initialize(channel)
         @channel = channel
-        @mutex = Mutex.new
       end
 
       def id
@@ -126,16 +125,14 @@ module Sass
       private
 
       def await
-        @mutex.synchronize do
-          raise EOFError if defined? @async
-
-          @connection = @channel.connect(self)
-          @async = Async.new
-          yield
-          @async.await
-        ensure
-          @connection.disconnect
-        end
+        raise EOFError if defined? @async
+
+        @connection = @channel.connect(self)
+        @async = Async.new
+        yield
+        @async.await
+      ensure
+        @connection.disconnect
       end
     end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.2.3'
+    VERSION = '1.2.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.6
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -159,8 +159,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.2.3
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.2.3
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.2.6
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.2.6
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []