sass-embedded 1.69.3-arm64-darwin → 1.69.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc3542b8e071e80456498866fc0c2d7934d118c8bc3a5f7389b72fe67550797
-  data.tar.gz: 2506bac9ede291d422b15a4db068de417748611fd755093e44dbecd0547c15a6
+  metadata.gz: 82fcfc51fea927afe82c3d098cd09a1a8334a48f5783e5a2d48ae85fbfa972d6
+  data.tar.gz: 67c517ffc616a027ce508a4848617219d34ce6701b7563b8567a77e5e6c2fc5d
 SHA512:
-  metadata.gz: fd3a845cab5ecbbee535c0a0c73ba7877fa35f6f81241475f60efdc355662d8ad4783f070876195679b38450c1847fa64c50626f7164da4a5680b59a4161bcf6
-  data.tar.gz: c53725942a668d3f2f3b504e1722b5a887d9294f51b411d64e1981842bc6663ebda987dfb322c0f7cb6be5b3893f40b3390568124c956fed892623c09e6b7daf
+  metadata.gz: b3e4eb1ffc91bbd511824a83f0b91a6b6933d4ebcfd3517f646574e64b4a784e00ab95a254386eb9426e7061d1e14fb6596eccbf31f95cd5e87524c25198a5ff
+  data.tar.gz: 17a41fb3d2416efd27ccfabc6b8626905d79dea07abb99f1f6bbd05ae4d04acc539fb6135ee56ce7f984890a93d3c8eb3a75fb20b4bba087161acba2e5624be5

data/lib/sass/embedded/connection.rb

@@ -2,14 +2,16 @@
 
 require 'open3'
 
+require_relative '../../../ext/sass/cli'
+
 module Sass
   class Embedded
     # The stdio based {Connection} between the {Dispatcher} and the compiler.
     #
     # It runs the `sass --embedded` command.
     class Connection
-      def initialize
-        @stdin, @stdout, @stderr, @wait_thread = begin
+      def initialize(dispatcher)
+        @stdin, stdout, stderr, @wait_thread = begin
           Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
         rescue Errno::ENOENT
           require_relative '../elf'
@@ -18,51 +20,46 @@ module Sass
 
           Open3.popen3(ELF::INTERPRETER, *CLI::COMMAND, '--embedded', chdir: __dir__)
         end
-
         @stdin.binmode
-        @stdout.binmode
-        @stdin_mutex = Mutex.new
-        @stdout_mutex = Mutex.new
+
+        Thread.new do
+          stdout.binmode
+          loop do
+            length = Varint.read(stdout)
+            id = Varint.read(stdout)
+            proto = stdout.read(length - Varint.length(id))
+            dispatcher.receive_proto(id, proto)
+          rescue IOError, Errno::EBADF, Errno::EPROTO => e
+            dispatcher.error(e)
+            break
+          end
+          stdout.close
+        end
 
         Thread.new do
           loop do
-            warn(@stderr.readline, uplevel: 1)
+            warn(stderr.readline, uplevel: 1)
           rescue IOError, Errno::EBADF
             break
           end
+          stderr.close
         end
       end
 
       def close
-        @stdin_mutex.synchronize do
-          @stdin.close
-          @wait_thread.join
-          @stdout.close
-          @stderr.close
-        end
+        @stdin.close
+        @wait_thread.join
       end
 
       def closed?
-        @stdin_mutex.synchronize do
-          @stdin.closed?
-        end
+        @stdin.closed? && !@wait_thread.alive?
       end
 
       def write(id, proto)
-        @stdin_mutex.synchronize do
-          Varint.write(@stdin, Varint.length(id) + proto.length)
-          Varint.write(@stdin, id)
-          @stdin.write(proto)
-        end
-      end
-
-      def read
-        @stdout_mutex.synchronize do
-          length = Varint.read(@stdout)
-          id = Varint.read(@stdout)
-          proto = @stdout.read(length - Varint.length(id))
-          return id, proto
-        end
+        buffer = []
+        Varint.write(buffer, Varint.length(id) + proto.length)
+        Varint.write(buffer, id)
+        @stdin.write(buffer.pack('C*'), proto)
       end
     end
 

data/lib/sass/embedded/dispatcher.rb

@@ -6,33 +6,16 @@ module Sass
     #
     # It dispatches messages between mutliple instances of {Host} and a single {Connection} to the compiler.
     class Dispatcher
-      UINT_MAX = 0xffffffff
-
       def initialize
-        @connection = Connection.new
-        @observers = {}
         @id = 1
+        @observers = {}
         @mutex = Mutex.new
-
-        Thread.new do
-          loop do
-            receive_proto
-          rescue IOError, Errno::EBADF, Errno::EPROTO => e
-            values = @mutex.synchronize do
-              @id = UINT_MAX
-              @observers.values
-            end
-            values.each do |observer|
-              observer.error(e)
-            end
-            break
-          end
-        end
+        @connection = Connection.new(self)
       end
 
       def subscribe(observer)
         @mutex.synchronize do
-          raise Errno::EBUSY if @id == UINT_MAX
+          raise Errno::EBUSY if @id == 0xffffffff
 
           id = @id
           @id = id.next
@@ -47,7 +30,7 @@ module Sass
 
           return unless @observers.empty?
 
-          if @id == UINT_MAX
+          if @id == 0xffffffff
             Thread.new do
               close
             end
@@ -69,29 +52,31 @@ module Sass
         @connection.closed?
       end
 
-      def error
-        @mutex.synchronize do
-          @id = UINT_MAX
+      def error(error)
+        observers = @mutex.synchronize do
+          @id = 0xffffffff
+          @observers.values
         end
-      end
 
-      def send_proto(...)
-        @connection.write(...)
+        if observers.empty?
+          close
+        else
+          observers.each do |observer|
+            observer.error(error)
+          end
+        end
       end
 
-      private
-
-      def receive_proto
-        id, proto = @connection.read
+      def receive_proto(id, proto)
         case id
-        when 1...UINT_MAX
+        when 1...0xffffffff
           @mutex.synchronize { @observers[id] }.receive_proto(proto)
         when 0
           outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
           oneof = outbound_message.message
           message = outbound_message.public_send(oneof)
           @mutex.synchronize { @observers[message.id] }.public_send(oneof, message)
-        when UINT_MAX
+        when 0xffffffff
           outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
           oneof = outbound_message.message
           message = outbound_message.public_send(oneof)
@@ -101,6 +86,10 @@ module Sass
         end
       end
 
+      def send_proto(...)
+        @connection.write(...)
+      end
+
       # The {Channel} between {Dispatcher} and {Host}.
       class Channel
         attr_reader :id
@@ -114,6 +103,12 @@ module Sass
           @dispatcher.unsubscribe(id)
         end
 
+        def error(...)
+          Thread.new do
+            @dispatcher.error(...)
+          end
+        end
+
         def send_proto(...)
           @dispatcher.send_proto(...)
         end

data/lib/sass/embedded/host/protofier.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    class Host
+      # The {Protofier} module.
+      #
+      # It converts Pure Ruby types and Protobuf Ruby types.
+      module Protofier
+        module_function
+
+        def from_proto_canonicalize_context(canonicalize_request)
+          CanonicalizeContext.new(
+            canonicalize_request.containing_url == '' ? nil : canonicalize_request.containing_url,
+            canonicalize_request.from_import
+          )
+        end
+
+        def from_proto_compile_response(compile_response)
+          oneof = compile_response.result
+          result = compile_response.public_send(oneof)
+          case oneof
+          when :failure
+            raise CompileError.new(
+              result.message,
+              result.formatted == '' ? nil : result.formatted,
+              result.stack_trace == '' ? nil : result.stack_trace,
+              from_proto_source_span(result.span),
+              compile_response.loaded_urls
+            )
+          when :success
+            CompileResult.new(
+              result.css,
+              result.source_map == '' ? nil : result.source_map,
+              compile_response.loaded_urls
+            )
+          else
+            raise ArgumentError, "Unknown CompileResponse.result #{result}"
+          end
+        end
+
+        def from_proto_source_span(source_span)
+          return if source_span.nil?
+
+          Logger::SourceSpan.new(from_proto_source_location(source_span.start),
+                                 from_proto_source_location(source_span.end),
+                                 source_span.text,
+                                 source_span.url == '' ? nil : source_span.url,
+                                 source_span.context == '' ? nil : source_span.context)
+        end
+
+        def from_proto_source_location(source_location)
+          return if source_location.nil?
+
+          Logger::SourceLocation.new(source_location.offset,
+                                     source_location.line,
+                                     source_location.column)
+        end
+
+        def to_proto_syntax(syntax)
+          case syntax&.to_sym
+          when :scss
+            EmbeddedProtocol::Syntax::SCSS
+          when :indented
+            EmbeddedProtocol::Syntax::INDENTED
+          when :css
+            EmbeddedProtocol::Syntax::CSS
+          else
+            raise ArgumentError, 'syntax must be one of :scss, :indented, :css'
+          end
+        end
+
+        def to_proto_output_style(style)
+          case style&.to_sym
+          when :expanded
+            EmbeddedProtocol::OutputStyle::EXPANDED
+          when :compressed
+            EmbeddedProtocol::OutputStyle::COMPRESSED
+          else
+            raise ArgumentError, 'style must be one of :expanded, :compressed'
+          end
+        end
+      end
+
+      private_constant :Protofier
+    end
+  end
+end

data/lib/sass/embedded/host/structifier.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    class Host
+      # The {Structifier} module.
+      #
+      # It converts {::Hash} to {Struct}-like objects.
+      module Structifier
+        module_function
+
+        def to_struct(obj, *symbols)
+          return obj unless obj.is_a? Hash
+
+          struct = Object.new
+          symbols.each do |key|
+            next unless obj.key?(key)
+
+            value = obj[key]
+            if value.respond_to? :call
+              struct.define_singleton_method key do |*args, **kwargs|
+                value.call(*args, **kwargs)
+              end
+            else
+              struct.define_singleton_method key do
+                value
+              end
+            end
+          end
+          struct
+        end
+      end
+
+      private_constant :Structifier
+    end
+  end
+end

data/lib/sass/embedded/host.rb

@@ -3,6 +3,8 @@
 require_relative 'host/function_registry'
 require_relative 'host/importer_registry'
 require_relative 'host/logger_registry'
+require_relative 'host/protofier'
+require_relative 'host/structifier'
 require_relative 'host/value_protofier'
 
 module Sass
@@ -88,8 +90,8 @@ module Sass
       def error(message)
         case message
         when EmbeddedProtocol::ProtocolError
-          @dispatcher.error
           @error = Errno::EPROTO.new(message.message)
+          @channel.error(@error)
         else
           @error ||= message
         end

data/lib/sass/embedded/resilient_dispatcher.rb

@@ -33,10 +33,6 @@ module Sass
           @dispatcher.connect(...)
         end
       end
-
-      def error(...)
-        @dispatcher.error(...)
-      end
     end
 
     private_constant :ResilientDispatcher

data/lib/sass/embedded/varint.rb

@@ -26,13 +26,11 @@ module Sass
       end
 
       def write(writeable, value)
-        bytes = []
         until value < 0x80
-          bytes << ((value & 0x7f) | 0x80)
+          writeable << ((value & 0x7f) | 0x80)
           value >>= 7
         end
-        bytes << value
-        writeable.write bytes.pack('C*')
+        writeable << value
       end
     end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.69.3'
+    VERSION = '1.69.4'
   end
 end

data/lib/sass/embedded.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../ext/sass/cli'
 require_relative 'canonicalize_context'
 require_relative 'compile_error'
 require_relative 'compile_result'
 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'
 require_relative 'embedded_protocol'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.69.3
+  version: 1.69.4
 platform: arm64-darwin
 authors:
 - なつき
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -56,10 +56,10 @@ files:
 - lib/sass/embedded/host/function_registry.rb
 - lib/sass/embedded/host/importer_registry.rb
 - lib/sass/embedded/host/logger_registry.rb
+- lib/sass/embedded/host/protofier.rb
+- lib/sass/embedded/host/structifier.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
 - lib/sass/embedded_protocol.rb
@@ -85,8 +85,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.3
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.69.3
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.4
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.69.4
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message:
 rdoc_options: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/lib/sass/embedded/protofier.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Protofier} module.
-    #
-    # It converts Pure Ruby types and Protobuf Ruby types.
-    module Protofier
-      module_function
-
-      def from_proto_canonicalize_context(canonicalize_request)
-        CanonicalizeContext.new(
-          canonicalize_request.containing_url == '' ? nil : canonicalize_request.containing_url,
-          canonicalize_request.from_import
-        )
-      end
-
-      def from_proto_compile_response(compile_response)
-        oneof = compile_response.result
-        result = compile_response.public_send(oneof)
-        case oneof
-        when :failure
-          raise CompileError.new(
-            result.message,
-            result.formatted == '' ? nil : result.formatted,
-            result.stack_trace == '' ? nil : result.stack_trace,
-            from_proto_source_span(result.span),
-            compile_response.loaded_urls
-          )
-        when :success
-          CompileResult.new(
-            result.css,
-            result.source_map == '' ? nil : result.source_map,
-            compile_response.loaded_urls
-          )
-        else
-          raise ArgumentError, "Unknown CompileResponse.result #{result}"
-        end
-      end
-
-      def from_proto_source_span(source_span)
-        return if source_span.nil?
-
-        Logger::SourceSpan.new(from_proto_source_location(source_span.start),
-                               from_proto_source_location(source_span.end),
-                               source_span.text,
-                               source_span.url == '' ? nil : source_span.url,
-                               source_span.context == '' ? nil : source_span.context)
-      end
-
-      def from_proto_source_location(source_location)
-        return if source_location.nil?
-
-        Logger::SourceLocation.new(source_location.offset,
-                                   source_location.line,
-                                   source_location.column)
-      end
-
-      def to_proto_syntax(syntax)
-        case syntax&.to_sym
-        when :scss
-          EmbeddedProtocol::Syntax::SCSS
-        when :indented
-          EmbeddedProtocol::Syntax::INDENTED
-        when :css
-          EmbeddedProtocol::Syntax::CSS
-        else
-          raise ArgumentError, 'syntax must be one of :scss, :indented, :css'
-        end
-      end
-
-      def to_proto_output_style(style)
-        case style&.to_sym
-        when :expanded
-          EmbeddedProtocol::OutputStyle::EXPANDED
-        when :compressed
-          EmbeddedProtocol::OutputStyle::COMPRESSED
-        else
-          raise ArgumentError, 'style must be one of :expanded, :compressed'
-        end
-      end
-    end
-
-    private_constant :Protofier
-  end
-end

data/lib/sass/embedded/structifier.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Structifier} module.
-    #
-    # It converts {::Hash} to {Struct}-like objects.
-    module Structifier
-      module_function
-
-      def to_struct(obj, *symbols)
-        return obj unless obj.is_a? Hash
-
-        struct = Object.new
-        symbols.each do |key|
-          next unless obj.key?(key)
-
-          value = obj[key]
-          if value.respond_to? :call
-            struct.define_singleton_method key do |*args, **kwargs|
-              value.call(*args, **kwargs)
-            end
-          else
-            struct.define_singleton_method key do
-              value
-            end
-          end
-        end
-        struct
-      end
-    end
-
-    private_constant :Structifier
-  end
-end