sass-embedded 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a036051c7abed208ad60c033464cc8ebba1c7b16e0aaf4d32e7e88e7480dbe
-  data.tar.gz: d90c2b2f3c0a66c1de05cdb30fa66bb0b42b8d29ecaa84be53a36dc42fc886b2
+  metadata.gz: c5bcaee2299b4f0b9d4d1d23b25773fdad87d1a294a4a34eeec0028d1f89a25c
+  data.tar.gz: 75ce2615300b0d59e73f715ae43007baf09a9818ea56d80b8be4d54b1f561c69
 SHA512:
-  metadata.gz: 9ea57f9e2d75135b81cc2dcdc7dd37cf1db7b185512f90b2e40a5c03d05994409d85023b61feccdc0a346443863fac2c4439c439d975adfd2404319747d1f8fc
-  data.tar.gz: 90d91290a68af79837a17dd4cd73645524e4d9e377b5e30f232df2c2a2dde1dba4f4c2a7520b66fda1e225f409804abc3b2de0df8c8998be094827982114472c
+  metadata.gz: 93cf20b2df8d4c363797df90e459f52c6dedf5e540cb5b6eb1cd110dded76477adf82f6c0bc0652f1b5201f535265053f7838654952a4bcc7f338bcc69c9464a
+  data.tar.gz: c4190c8fc8e60a37fa834dfdac6fe1842e66d39ac8d0ad9bc1c15ea5c18c16766f19e194be746fc963a5604c740f438c6371aa59c10dd59d452a526fea6cbf0d

data/ext/sass/extconf.rb

@@ -5,7 +5,8 @@ require 'fileutils'
 require 'json'
 require 'mkmf'
 require 'open-uri'
-require_relative '../../lib/sass/embedded/compiler'
+require_relative '../../lib/sass/embedded/compiler/path'
+require_relative '../../lib/sass/embedded/compiler/requirements'
 require_relative '../../lib/sass/embedded/platform'
 
 module Sass
@@ -210,7 +211,7 @@ module Sass
       def default_sass_embedded_protocol
         repo = 'sass/embedded-protocol'
 
-        tag_name = IO.popen([Compiler::DART_SASS_EMBEDDED, '--version']) do |file|
+        tag_name = IO.popen([Compiler::PATH, '--version']) do |file|
           JSON.parse(file.read)['protocolVersion']
         end
 

data/lib/sass/embedded/channel.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative 'compiler'
+
+module Sass
+  class Embedded
+    # The {Channel} for {Compiler} calls. Each instance creates its own
+    # {Compiler}. A new {Compiler} is automatically created when the existing
+    # {Compiler} runs out of unique request id.
+    class Channel
+      def initialize
+        @mutex = Mutex.new
+        @compiler = Compiler.new
+      end
+
+      def close
+        @mutex.synchronize do
+          @compiler.close
+        end
+      end
+
+      def closed?
+        @mutex.synchronize do
+          @compiler.closed?
+        end
+      end
+
+      def subscribe(observer)
+        @mutex.synchronize do
+          begin
+            id = @compiler.add_observer(observer)
+          rescue IOError
+            @compiler = Compiler.new
+            id = @compiler.add_observer(observer)
+          end
+          Subscription.new @compiler, observer, id
+        end
+      end
+
+      # The {Subscription} between {Compiler} and {Observer}.
+      class Subscription
+        attr_reader :id
+
+        def initialize(compiler, observer, id)
+          @compiler = compiler
+          @observer = observer
+          @id = id
+        end
+
+        def unsubscribe
+          @compiler.delete_observer(@observer)
+        end
+
+        def send_message(*args)
+          @compiler.send_message(*args)
+        end
+      end
+
+      private_constant :Subscription
+    end
+  end
+end

data/lib/sass/embedded/{compile.rb → compile_context.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../embedded_protocol'
 require_relative 'observer'
-require_relative 'protocol'
 require_relative 'util'
 
 module Sass
@@ -10,7 +10,7 @@ module Sass
     class CompileContext
       include Observer
 
-      def initialize(transport, id,
+      def initialize(channel,
                      data:,
                      file:,
                      indented_syntax:,
@@ -22,7 +22,6 @@ module Sass
                      importer:)
         raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
 
-        @id = id
         @data = data
         @file = file
         @indented_syntax = indented_syntax
@@ -37,7 +36,7 @@ module Sass
         @importer = importer
         @import_responses = {}
 
-        super(transport)
+        super(channel)
 
         send_message compile_request
       end
@@ -47,23 +46,23 @@ module Sass
 
         case message
         when EmbeddedProtocol::OutboundMessage::CompileResponse
-          return unless message.id == @id
+          return unless message.id == id
 
           Thread.new do
             super(nil, message)
           end
         when EmbeddedProtocol::OutboundMessage::LogEvent
-          return unless message.compilation_id == @id && $stderr.tty?
+          return unless message.compilation_id == id && $stderr.tty?
 
           warn message.formatted
         when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
-          return unless message.compilation_id == @id
+          return unless message.compilation_id == id
 
           Thread.new do
             send_message canonicalize_response message
           end
         when EmbeddedProtocol::OutboundMessage::ImportRequest
-          return unless message.compilation_id == @id
+          return unless message.compilation_id == id
 
           Thread.new do
             send_message import_response message
@@ -71,7 +70,7 @@ module Sass
         when EmbeddedProtocol::OutboundMessage::FileImportRequest
           raise NotImplementedError, 'FileImportRequest is not implemented'
         when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
-          return unless message.compilation_id == @id
+          return unless message.compilation_id == id
 
           Thread.new do
             send_message function_call_response message
@@ -87,7 +86,7 @@ module Sass
 
       def compile_request
         EmbeddedProtocol::InboundMessage::CompileRequest.new(
-          id: @id,
+          id: id,
           string: string,
           path: path,
           style: style,

data/lib/sass/embedded/compiler/path.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative '../platform'
+
+module Sass
+  class Embedded
+    class Compiler
+      PATH = File.absolute_path(
+        "../../../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
+      )
+    end
+  end
+end

data/lib/sass/embedded/compiler/requirements.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    class Compiler
+      REQUIREMENTS = '~> 1.0.0-beta.11'
+    end
+  end
+end

data/lib/sass/embedded/compiler.rb

@@ -1,17 +1,156 @@
 # frozen_string_literal: true
 
-require_relative 'platform'
+require 'observer'
+require 'open3'
+require_relative '../embedded_protocol'
+require_relative 'compiler/path'
+require_relative 'error'
 
 module Sass
   class Embedded
-    module Compiler
-      DART_SASS_EMBEDDED = File.absolute_path(
-        "../../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
-      )
+    # The {::Observable} {Compiler} for low level communication with
+    # `dart-sass-embedded` using protocol buffers via stdio. Received messages
+    # can be observed by an {Observer}.
+    class Compiler
+      include Observable
 
-      PROTOCOL_ERROR_ID = 4_294_967_295
+      ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
+                      .descriptor
+                      .lookup_oneof('message')
+                      .collect do |field_descriptor|
+        [field_descriptor.subtype, field_descriptor.name]
+      end.to_h
 
-      REQUIREMENTS = '~> 1.0.0-beta.11'
+      private_constant :ONEOF_MESSAGE
+
+      def initialize
+        @observerable_mutex = Mutex.new
+        @id = 0
+        @stdin_mutex = Mutex.new
+        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(PATH)
+
+        [@stdin, @stdout].each(&:binmode)
+
+        poll do
+          warn(@stderr.readline, uplevel: 1)
+        end
+        poll do
+          receive_proto read
+        end
+      end
+
+      def add_observer(*args)
+        @observerable_mutex.synchronize do
+          raise IOError, 'half-closed compiler' if half_closed?
+
+          super(*args)
+
+          id = @id
+          @id = @id.next
+          id
+        end
+      end
+
+      def delete_observer(*args)
+        @observerable_mutex.synchronize do
+          super(*args)
+
+          close if half_closed? && count_observers.zero?
+        end
+      end
+
+      def send_message(message)
+        write EmbeddedProtocol::InboundMessage.new(
+          ONEOF_MESSAGE[message.class.descriptor] => message
+        ).to_proto
+      end
+
+      def close
+        delete_observers
+
+        @stdin_mutex.synchronize do
+          @stdin.close unless @stdin.closed?
+          @stdout.close unless @stdout.closed?
+          @stderr.close unless @stderr.closed?
+        end
+
+        @wait_thread.value
+      end
+
+      def closed?
+        @stdin_mutex.synchronize do
+          @stdin.closed?
+        end
+      end
+
+      private
+
+      def half_closed?
+        @id == EmbeddedProtocol::PROTOCOL_ERROR_ID
+      end
+
+      def poll
+        Thread.new do
+          loop do
+            yield
+          rescue StandardError => e
+            notify_observers(e, nil)
+            close
+            break
+          end
+        end
+      end
+
+      def notify_observers(*args)
+        @observerable_mutex.synchronize do
+          changed
+          super(*args)
+        end
+      end
+
+      def receive_proto(proto)
+        payload = EmbeddedProtocol::OutboundMessage.decode(proto)
+        message = payload[payload.message.to_s]
+        case message
+        when EmbeddedProtocol::ProtocolError
+          raise ProtocolError, message.message
+        else
+          notify_observers(nil, message)
+        end
+      end
+
+      def read
+        length = read_varint(@stdout)
+        @stdout.read(length)
+      end
+
+      def write(payload)
+        @stdin_mutex.synchronize do
+          write_varint(@stdin, payload.length)
+          @stdin.write payload
+        end
+      end
+
+      def read_varint(readable)
+        value = bits = 0
+        loop do
+          byte = readable.readbyte
+          value |= (byte & 0x7f) << bits
+          bits += 7
+          break if byte < 0x80
+        end
+        value
+      end
+
+      def write_varint(writeable, value)
+        bytes = []
+        until value < 0x80
+          bytes << (0x80 | (value & 0x7f))
+          value >>= 7
+        end
+        bytes << value
+        writeable.write bytes.pack('C*')
+      end
     end
   end
 end

data/lib/sass/embedded/observer.rb

@@ -2,15 +2,15 @@
 
 module Sass
   class Embedded
-    # The {Observer} module for receiving messages from {Transport}.
+    # The {Observer} module for communicating with {Compiler}.
     module Observer
-      def initialize(transport)
-        @transport = transport
+      def initialize(channel)
         @mutex = Mutex.new
         @condition_variable = ConditionVariable.new
         @error = nil
         @message = nil
-        @transport.add_observer self
+
+        @subscription = channel.subscribe(self)
       end
 
       def receive_message
@@ -24,7 +24,7 @@ module Sass
       end
 
       def update(error, message)
-        @transport.delete_observer self
+        @subscription.unsubscribe
         @mutex.synchronize do
           @error = error
           @message = message
@@ -34,8 +34,12 @@ module Sass
 
       private
 
-      def send_message(message)
-        @transport.send_message(message)
+      def id
+        @subscription.id
+      end
+
+      def send_message(*args)
+        @subscription.send_message(*args)
       end
     end
   end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.8.2'
+    VERSION = '0.9.0'
   end
 end

data/lib/sass/embedded/{info.rb → version_context.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../embedded_protocol'
 require_relative 'observer'
-require_relative 'protocol'
 
 module Sass
   class Embedded
@@ -9,12 +9,10 @@ module Sass
     class VersionContext
       include Observer
 
-      def initialize(transport, id)
-        @id = id
+      def initialize(channel)
+        super(channel)
 
-        super(transport)
-
-        send_message EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
+        send_message EmbeddedProtocol::InboundMessage::VersionRequest.new(id: id)
       end
 
       def update(error, message)
@@ -22,7 +20,7 @@ module Sass
 
         case message
         when EmbeddedProtocol::OutboundMessage::VersionResponse
-          return unless message.id == @id
+          return unless message.id == id
 
           Thread.new do
             super(nil, message)

data/lib/sass/embedded.rb

@@ -2,17 +2,17 @@
 
 require 'base64'
 require 'json'
-require_relative 'embedded/compile'
+require_relative 'embedded/channel'
+require_relative 'embedded/compile_context'
 require_relative 'embedded/error'
-require_relative 'embedded/info'
 require_relative 'embedded/result'
-require_relative 'embedded/transport'
 require_relative 'embedded/util'
 require_relative 'embedded/version'
+require_relative 'embedded/version_context'
 
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
-  # its own {Transport}.
+  # its own {Channel}.
   #
   # @example
   #   embedded = Sass::Embedded.new
@@ -29,16 +29,14 @@ module Sass
     end
 
     def initialize
-      @transport = Transport.new
-      @id_semaphore = Mutex.new
-      @id = 0
+      @channel = Channel.new
     end
 
     # The {Embedded#info} method.
     #
     # @raise [ProtocolError]
     def info
-      @info ||= VersionContext.new(@transport, next_id).receive_message
+      @info ||= VersionContext.new(@channel).receive_message
     end
 
     # The {Embedded#render} method.
@@ -70,7 +68,7 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      message = CompileContext.new(@transport, next_id,
+      message = CompileContext.new(@channel,
                                    data: data,
                                    file: file,
                                    indented_syntax: indented_syntax,
@@ -124,11 +122,11 @@ module Sass
     end
 
     def close
-      @transport.close
+      @channel.close
     end
 
     def closed?
-      @transport.closed?
+      @channel.closed?
     end
 
     private
@@ -254,13 +252,5 @@ module Sass
         raise ArgumentError, 'linefeed must be one of :lf, :lfcr, :cr, :crlf'
       end
     end
-
-    def next_id
-      @id_semaphore.synchronize do
-        @id += 1
-        @id = 0 if @id == Compiler::PROTOCOL_ERROR_ID
-        @id
-      end
-    end
   end
 end

data/lib/sass/embedded_protocol.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative '../../ext/sass/embedded_sass_pb'
+
+module Sass
+  module EmbeddedProtocol
+    PROTOCOL_ERROR_ID = 4_294_967_295
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -139,24 +139,26 @@ files:
 - lib/sass-embedded.rb
 - lib/sass.rb
 - lib/sass/embedded.rb
-- lib/sass/embedded/compile.rb
+- lib/sass/embedded/channel.rb
+- lib/sass/embedded/compile_context.rb
 - lib/sass/embedded/compiler.rb
+- lib/sass/embedded/compiler/path.rb
+- lib/sass/embedded/compiler/requirements.rb
 - lib/sass/embedded/error.rb
-- lib/sass/embedded/info.rb
 - lib/sass/embedded/observer.rb
 - lib/sass/embedded/platform.rb
-- lib/sass/embedded/protocol.rb
 - lib/sass/embedded/result.rb
 - lib/sass/embedded/struct.rb
-- lib/sass/embedded/transport.rb
 - lib/sass/embedded/util.rb
 - lib/sass/embedded/version.rb
+- lib/sass/embedded/version_context.rb
+- lib/sass/embedded_protocol.rb
 homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.8.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.8.2
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.9.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.9.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/embedded/protocol.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../ext/sass/embedded_sass_pb'

data/lib/sass/embedded/transport.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-require 'open3'
-require 'observer'
-require_relative 'compiler'
-require_relative 'error'
-require_relative 'protocol'
-
-module Sass
-  class Embedded
-    # The {::Observable} {Transport} for low level communication with
-    # `dart-sass-embedded` using protocol buffers via stdio. Received messages
-    # can be observed by an {Observer}.
-    class Transport
-      include Observable
-
-      ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
-                      .descriptor
-                      .lookup_oneof('message')
-                      .collect do |field_descriptor|
-        [field_descriptor.subtype, field_descriptor.name]
-      end.to_h
-
-      private_constant :ONEOF_MESSAGE
-
-      def initialize
-        @observerable_mutex = Mutex.new
-        @stdin_mutex = Mutex.new
-        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(Compiler::DART_SASS_EMBEDDED)
-
-        [@stdin, @stdout].each(&:binmode)
-
-        poll do
-          warn(@stderr.readline, uplevel: 1)
-        end
-        poll do
-          receive_proto read
-        end
-      end
-
-      def add_observer(*args)
-        @observerable_mutex.synchronize do
-          super(*args)
-        end
-      end
-
-      def send_message(message)
-        write EmbeddedProtocol::InboundMessage.new(
-          ONEOF_MESSAGE[message.class.descriptor] => message
-        ).to_proto
-      end
-
-      def close
-        delete_observers
-        @stdin.close unless @stdin.closed?
-        @stdout.close unless @stdout.closed?
-        @stderr.close unless @stderr.closed?
-        nil
-      end
-
-      def closed?
-        @stdin.closed?
-      end
-
-      private
-
-      def poll
-        Thread.new do
-          loop do
-            yield
-          rescue StandardError => e
-            notify_observers(e, nil)
-            close
-            break
-          end
-        end
-      end
-
-      def notify_observers(*args)
-        @observerable_mutex.synchronize do
-          changed
-          super(*args)
-        end
-      end
-
-      def receive_proto(proto)
-        payload = EmbeddedProtocol::OutboundMessage.decode(proto)
-        message = payload[payload.message.to_s]
-        case message
-        when EmbeddedProtocol::ProtocolError
-          raise ProtocolError, message.message
-        else
-          notify_observers(nil, message)
-        end
-      end
-
-      def read
-        length = read_varint(@stdout)
-        @stdout.read(length)
-      end
-
-      def write(payload)
-        @stdin_mutex.synchronize do
-          write_varint(@stdin, payload.length)
-          @stdin.write payload
-        end
-      end
-
-      def read_varint(readable)
-        value = bits = 0
-        loop do
-          byte = readable.readbyte
-          value |= (byte & 0x7f) << bits
-          bits += 7
-          break if byte < 0x80
-        end
-        value
-      end
-
-      def write_varint(writeable, value)
-        bytes = []
-        until value < 0x80
-          bytes << (0x80 | (value & 0x7f))
-          value >>= 7
-        end
-        bytes << value
-        writeable.write bytes.pack('C*')
-      end
-    end
-  end
-end