sass-embedded 1.63.3-x86_64-linux-gnu → 1.63.4-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aca352e8dc005bdd13446372af1851c78f799910d5845263d663c9bf4804f2a
-  data.tar.gz: 713dc20b1115d65bf22ccbae7b37542a03821521bf990571d310aaeef67c7116
+  metadata.gz: 3e718c51368a838cb1134b919d34254f237f7d6fa157fecc9a00090da1ee09ff
+  data.tar.gz: 92559b950c8f2425fcf7b8a9f5784905ac21fa0e447bb7d364f7134744c3f5a0
 SHA512:
-  metadata.gz: db52c3a8ce228c9fc525c4d05ae1f0128907e6d44cca69a3ed956c61101613a38f58c2df10e28c0c61d4ddd07f535c3dc8c4df931cacd9452cb68d6136a11a68
-  data.tar.gz: 974f7e433f5085f5402582cdf5404de8fa914fe177160b2ba7128d8de7ce32cfa266002b757909219b6661cc85be49c4c68edc9c3cfc6e65ae0a365095780f92
+  metadata.gz: 590d1d60d6852ea28218cf21b60c219a2700055848f7de3d67da2ed366523d88608ed04ad44e52e296b8c3768f8e4a02f093fe2df4b60d6ae7bb0b9d6fb43384
+  data.tar.gz: a7ed1b875dddeee95f6c4f662197fb790c71bb059c4db81e0a50336823873f1b67a2454d9d4ec87d03e52e9399d2c94e85d362602283247701d74d563d77b966

data/lib/sass/embedded/{compiler.rb → connection.rb}

@@ -4,10 +4,10 @@ require 'open3'
 
 module Sass
   class Embedded
-    # The {Compiler} class.
+    # The stdio based {Connection} between the {Dispatcher} and the compiler.
     #
-    # It runs the `sass --embedded` process.
-    class Compiler
+    # It runs the `sass --embedded` command.
+    class Connection
       def initialize
         @stdin, @stdout, @stderr, @wait_thread = begin
           Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
@@ -67,6 +67,6 @@ module Sass
       end
     end
 
-    private_constant :Compiler
+    private_constant :Connection
   end
 end

data/lib/sass/embedded/dispatcher.rb

@@ -4,12 +4,12 @@ module Sass
   class Embedded
     # The {Dispatcher} class.
     #
-    # It dispatches messages between mutliple instances of {Host} and a single {Compiler}.
+    # It dispatches messages between mutliple instances of {Host} and a single {Connection} to the compiler.
     class Dispatcher
       UINT_MAX = 0xffffffff
 
       def initialize
-        @compiler = Compiler.new
+        @connection = Connection.new
         @observers = {}
         @id = 1
         @mutex = Mutex.new
@@ -58,22 +58,26 @@ module Sass
         end
       end
 
+      def connect(host)
+        Channel.new(self, host)
+      end
+
       def close
-        @compiler.close
+        @connection.close
       end
 
       def closed?
-        @compiler.closed?
+        @connection.closed?
       end
 
       def send_proto(...)
-        @compiler.write(...)
+        @connection.write(...)
       end
 
       private
 
       def receive_proto
-        id, proto = @compiler.read
+        id, proto = @connection.read
         case id
         when 1...UINT_MAX
           @mutex.synchronize { @observers[id] }.receive_proto(proto)
@@ -91,6 +95,26 @@ module Sass
           raise Errno::EPROTO
         end
       end
+
+      # The {Channel} between {Dispatcher} and {Host}.
+      class Channel
+        attr_reader :id
+
+        def initialize(dispatcher, host)
+          @dispatcher = dispatcher
+          @id = @dispatcher.subscribe(host)
+        end
+
+        def disconnect
+          @dispatcher.unsubscribe(id)
+        end
+
+        def send_proto(...)
+          @dispatcher.send_proto(...)
+        end
+      end
+
+      private_constant :Channel
     end
 
     private_constant :Dispatcher

data/lib/sass/embedded/host.rb

@@ -11,8 +11,8 @@ module Sass
     #
     # It communicates with {Dispatcher} and handles the host logic.
     class Host
-      def initialize(channel)
-        @channel = channel
+      def initialize(dispatcher)
+        @dispatcher = dispatcher
       end
 
       def compile_request(path:,
@@ -117,7 +117,7 @@ module Sass
       private
 
       def await0
-        @connection = @channel.connect(self)
+        @channel = @dispatcher.connect(self)
         @queue = Queue.new
 
         yield
@@ -128,11 +128,11 @@ module Sass
 
         @result
       ensure
-        @connection&.disconnect
+        @channel&.disconnect
       end
 
       def await
-        @connection = @channel.connect(self)
+        @channel = @dispatcher.connect(self)
         @queue = Queue.new
 
         yield
@@ -148,21 +148,21 @@ module Sass
 
         @result
       ensure
-        @connection&.disconnect
+        @channel&.disconnect
       end
 
       def id
-        @connection.id
+        @channel.id
       end
 
       def send_message0(...)
         inbound_message = EmbeddedProtocol::InboundMessage.new(...)
-        @connection.send_proto(0, inbound_message.to_proto)
+        @channel.send_proto(0, inbound_message.to_proto)
       end
 
       def send_message(...)
         inbound_message = EmbeddedProtocol::InboundMessage.new(...)
-        @connection.send_proto(id, inbound_message.to_proto)
+        @channel.send_proto(id, inbound_message.to_proto)
       end
     end
 

data/lib/sass/embedded/resilient_dispatcher.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # The {ResilientDispatcher} class.
+    #
+    # It recovers from failures and continues to function.
+    class ResilientDispatcher
+      def initialize
+        @dispatcher = Dispatcher.new
+        @mutex = Mutex.new
+      end
+
+      def close
+        @mutex.synchronize do
+          @dispatcher.close
+        end
+      end
+
+      def closed?
+        @mutex.synchronize do
+          @dispatcher.closed?
+        end
+      end
+
+      def connect(host)
+        @dispatcher.connect(host)
+      rescue Errno::EBUSY
+        @mutex.synchronize do
+          @dispatcher.connect(host)
+        rescue Errno::EBUSY
+          @dispatcher = Dispatcher.new
+          @dispatcher.connect(host)
+        end
+      end
+    end
+
+    private_constant :ResilientDispatcher
+  end
+end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.63.3'
+    VERSION = '1.63.4'
   end
 end

data/lib/sass/embedded.rb

@@ -4,11 +4,11 @@ require_relative '../../ext/sass/cli'
 require_relative '../../ext/sass/embedded_sass_pb'
 require_relative 'compile_error'
 require_relative 'compile_result'
-require_relative 'embedded/channel'
-require_relative 'embedded/compiler'
+require_relative 'embedded/connection'
 require_relative 'embedded/dispatcher'
 require_relative 'embedded/host'
 require_relative 'embedded/protofier'
+require_relative 'embedded/resilient_dispatcher'
 require_relative 'embedded/structifier'
 require_relative 'embedded/varint'
 require_relative 'embedded/version'
@@ -80,7 +80,7 @@ module Sass
   # rubocop:enable Layout/LineLength
 
   # The {Embedded} host for using dart-sass. Each instance creates its own
-  # communication {Channel} with a dedicated compiler process.
+  # communication {Dispatcher} with a dedicated compiler process.
   #
   # @example
   #   embedded = Sass::Embedded.new
@@ -89,7 +89,7 @@ module Sass
   #   embedded.close
   class Embedded
     def initialize
-      @channel = Channel.new
+      @dispatcher = ResilientDispatcher.new
     end
 
     # Compiles the Sass file at +path+ to CSS.
@@ -138,7 +138,7 @@ module Sass
                 verbose: false)
       raise ArgumentError, 'path must be set' if path.nil?
 
-      Host.new(@channel).compile_request(
+      Host.new(@dispatcher).compile_request(
         path: path,
         source: nil,
         importer: nil,
@@ -212,7 +212,7 @@ module Sass
                        verbose: false)
       raise ArgumentError, 'source must be set' if source.nil?
 
-      Host.new(@channel).compile_request(
+      Host.new(@dispatcher).compile_request(
         path: nil,
         source: source,
         importer: importer,
@@ -236,15 +236,15 @@ module Sass
     # @return [String] Information about the Sass implementation.
     # @see https://sass-lang.com/documentation/js-api/modules#info
     def info
-      @info ||= Host.new(@channel).version_request
+      @info ||= Host.new(@dispatcher).version_request
     end
 
     def close
-      @channel.close
+      @dispatcher.close
     end
 
     def closed?
-      @channel.closed?
+      @dispatcher.closed?
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.63.3
+  version: 1.63.4
 platform: x86_64-linux-gnu
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -47,8 +47,7 @@ files:
 - lib/sass/compile_result.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
-- lib/sass/embedded/channel.rb
-- lib/sass/embedded/compiler.rb
+- lib/sass/embedded/connection.rb
 - lib/sass/embedded/dispatcher.rb
 - lib/sass/embedded/host.rb
 - lib/sass/embedded/host/function_registry.rb
@@ -56,6 +55,7 @@ files:
 - lib/sass/embedded/host/logger_registry.rb
 - lib/sass/embedded/host/value_protofier.rb
 - lib/sass/embedded/protofier.rb
+- lib/sass/embedded/resilient_dispatcher.rb
 - lib/sass/embedded/structifier.rb
 - lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
@@ -79,8 +79,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.63.3
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.63.3
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.63.4
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.63.4
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/lib/sass/embedded/channel.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Channel} class.
-    #
-    # It establishes connection between {Host} and {Dispatcher}.
-    class Channel
-      def initialize
-        @dispatcher = Dispatcher.new
-        @mutex = Mutex.new
-      end
-
-      def close
-        @mutex.synchronize do
-          @dispatcher.close
-        end
-      end
-
-      def closed?
-        @mutex.synchronize do
-          @dispatcher.closed?
-        end
-      end
-
-      def connect(observer)
-        @mutex.synchronize do
-          begin
-            id = @dispatcher.subscribe(observer)
-          rescue Errno::EBUSY
-            @dispatcher = Dispatcher.new
-            id = @dispatcher.subscribe(observer)
-          end
-          Connection.new(@dispatcher, id)
-        end
-      end
-
-      # The {Connection} between {Host} to {Dispatcher}.
-      class Connection
-        attr_reader :id
-
-        def initialize(dispatcher, id)
-          @dispatcher = dispatcher
-          @id = id
-        end
-
-        def disconnect
-          @dispatcher.unsubscribe(id)
-        end
-
-        def send_proto(...)
-          @dispatcher.send_proto(...)
-        end
-      end
-
-      private_constant :Connection
-    end
-
-    private_constant :Channel
-  end
-end