sass-embedded 0.18.2 → 0.19.0

data/lib/sass/embedded/protofier.rb

@@ -2,17 +2,10 @@
 
 module Sass
   class Embedded
-    # The {Protofier} between Pure Ruby types and Protobuf Ruby types.
+    # The {Protofier} module.
+    #
+    # It converts Pure Ruby types and Protobuf Ruby types.
     module Protofier
-      ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
-                      .descriptor
-                      .lookup_oneof('message')
-                      .to_h do |field_descriptor|
-        [field_descriptor.subtype, field_descriptor.name]
-      end
-
-      private_constant :ONEOF_MESSAGE
-
       module_function
 
       def from_proto_compile_response(compile_response)
@@ -50,17 +43,6 @@ module Sass
                                    source_location.column)
       end
 
-      def from_proto_message(proto)
-        message = EmbeddedProtocol::OutboundMessage.decode(proto)
-        message.send(message.message)
-      end
-
-      def to_proto_message(message)
-        EmbeddedProtocol::InboundMessage.new(
-          ONEOF_MESSAGE[message.class.descriptor] => message
-        ).to_proto
-      end
-
       def to_proto_syntax(syntax)
         case syntax&.to_sym
         when :scss

data/lib/sass/embedded/structifier.rb

@@ -2,7 +2,9 @@
 
 module Sass
   class Embedded
-    # The {Structifier} that convert {::Hash} to {Struct}-like object.
+    # The {Structifier} module.
+    #
+    # It converts {::Hash} to {Struct}-like objects.
     module Structifier
       module_function
 

data/lib/sass/embedded/varint.rb

@@ -2,7 +2,9 @@
 
 module Sass
   class Embedded
-    # Read and write {Varint} from {::IO}.
+    # The {Varint} module.
+    #
+    # It reads and writes varints.
     module Varint
       module_function
 

data/lib/sass/embedded/version.rb

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

data/lib/sass/embedded.rb

@@ -18,7 +18,6 @@ module Sass
     #
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [ProtocolError]
     def compile(path,
                 load_paths: [],
 
@@ -38,23 +37,24 @@ module Sass
       raise ArgumentError, 'path must be set' if path.nil?
 
       Protofier.from_proto_compile_response(
-        CompileContext.new(@channel,
-                           path: path,
-                           source: nil,
-                           importer: nil,
-                           load_paths: load_paths,
-                           syntax: nil,
-                           url: nil,
-                           source_map: source_map,
-                           source_map_include_sources: source_map_include_sources,
-                           style: style,
-                           functions: functions,
-                           importers: importers,
-                           alert_color: alert_color,
-                           alert_ascii: alert_ascii,
-                           logger: logger,
-                           quiet_deps: quiet_deps,
-                           verbose: verbose).receive_message
+        Host.new(@channel).compile_request(
+          path: path,
+          source: nil,
+          importer: nil,
+          load_paths: load_paths,
+          syntax: nil,
+          url: nil,
+          source_map: source_map,
+          source_map_include_sources: source_map_include_sources,
+          style: style,
+          functions: functions,
+          importers: importers,
+          alert_color: alert_color,
+          alert_ascii: alert_ascii,
+          logger: logger,
+          quiet_deps: quiet_deps,
+          verbose: verbose
+        )
       )
     end
 
@@ -62,7 +62,6 @@ module Sass
     #
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [ProtocolError]
     def compile_string(source,
                        importer: nil,
                        load_paths: [],
@@ -84,31 +83,30 @@ module Sass
       raise ArgumentError, 'source must be set' if source.nil?
 
       Protofier.from_proto_compile_response(
-        CompileContext.new(@channel,
-                           path: nil,
-                           source: source,
-                           importer: importer,
-                           load_paths: load_paths,
-                           syntax: syntax,
-                           url: url,
-                           source_map: source_map,
-                           source_map_include_sources: source_map_include_sources,
-                           style: style,
-                           functions: functions,
-                           importers: importers,
-                           alert_color: alert_color,
-                           alert_ascii: alert_ascii,
-                           logger: logger,
-                           quiet_deps: quiet_deps,
-                           verbose: verbose).receive_message
+        Host.new(@channel).compile_request(
+          path: nil,
+          source: source,
+          importer: importer,
+          load_paths: load_paths,
+          syntax: syntax,
+          url: url,
+          source_map: source_map,
+          source_map_include_sources: source_map_include_sources,
+          style: style,
+          functions: functions,
+          importers: importers,
+          alert_color: alert_color,
+          alert_ascii: alert_ascii,
+          logger: logger,
+          quiet_deps: quiet_deps,
+          verbose: verbose
+        )
       )
     end
 
     # The {Embedded#info} method.
-    #
-    # @raise [ProtocolError]
     def info
-      @info ||= "sass-embedded\t#{VersionContext.new(@channel).receive_message.implementation_version}"
+      @info ||= "sass-embedded\t#{Host.new(@channel).version_request.implementation_version}"
     end
 
     def close

data/lib/sass/value/argument_list.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's argument list type.
     #
     # An argument list comes from a rest argument. It's distinct from a normal {List} in that it may contain a keyword
     # map as well as the positional arguments.
-    class ArgumentList < Sass::Value::List
+    class ArgumentList < Value::List
       def initialize(contents = [], keywords = {}, separator = ',')
         super(contents, separator: separator)
 

data/lib/sass/value/boolean.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's boolean type.
-    class Boolean < Sass::Value
-      def initialize(value) # rubocop:disable Lint/MissingSuper
+    class Boolean
+      include Value
+
+      def initialize(value)
         @value = value
       end
 

data/lib/sass/value/color.rb

@@ -1,14 +1,21 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's color type.
     #
     # No matter what representation was originally used to create this color, all of its channels are accessible.
-    class Color < Sass::Value
-      def initialize(red: nil, green: nil, blue: nil, # rubocop:disable Lint/MissingSuper
-                     hue: nil, saturation: nil, lightness: nil,
-                     whiteness: nil, blackness: nil,
+    class Color
+      include Value
+
+      def initialize(red: nil,
+                     green: nil,
+                     blue: nil,
+                     hue: nil,
+                     saturation: nil,
+                     lightness: nil,
+                     whiteness: nil,
+                     blackness: nil,
                      alpha: nil)
         @alpha = alpha.nil? ? 1 : FuzzyMath.assert_between(alpha, 0, 1, 'alpha')
         if red && green && blue

data/lib/sass/value/function.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's function type.
-    class Function < Sass::Value
-      def initialize(id_or_signature, callback = nil) # rubocop:disable Lint/MissingSuper
+    class Function
+      include Value
+
+      def initialize(id_or_signature, callback = nil)
         if id_or_signature.is_a? Numeric
           @id = id_or_signature
         else

data/lib/sass/value/fuzzy_math.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's {FuzzyMath} module.
     module FuzzyMath
       PRECISION = 10

data/lib/sass/value/list.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's list type.
-    class List < Sass::Value
-      def initialize(contents = [], separator: ',', bracketed: false) # rubocop:disable Lint/MissingSuper
+    class List
+      include Value
+
+      def initialize(contents = [], separator: ',', bracketed: false)
         if separator.nil? && contents.length > 1
           raise error 'A list with more than one element must have an explicit separator'
         end

data/lib/sass/value/map.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's map type.
-    class Map < Sass::Value
-      def initialize(contents = {}) # rubocop:disable Lint/MissingSuper
+    class Map
+      include Value
+
+      def initialize(contents = {})
         @contents = contents.freeze
       end
 

data/lib/sass/value/null.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's null type.
-    class Null < Sass::Value
-      def initialize # rubocop:disable Lint/MissingSuper
+    class Null
+      include Value
+
+      def initialize
         @value = nil
       end
 

data/lib/sass/value/number/unit.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     class Number
       # The {Unit} module.
       module Unit

data/lib/sass/value/number.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's number type.
-    class Number < Sass::Value
-      def initialize(value, numerator_units = [], denominator_units = []) # rubocop:disable Lint/MissingSuper
+    class Number
+      include Value
+
+      def initialize(value, numerator_units = [], denominator_units = [])
         numerator_units = [numerator_units] if numerator_units.is_a?(::String)
         denominator_units = [denominator_units] if denominator_units.is_a?(::String)
 

data/lib/sass/value/string.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Sass
-  class Value
+  module Value
     # Sass's string type.
-    class String < Sass::Value
-      def initialize(text = '', quoted: true) # rubocop:disable Lint/MissingSuper
+    class String
+      include Value
+
+      def initialize(text = '', quoted: true)
         @text = text.freeze
         @quoted = quoted
       end
@@ -20,8 +22,7 @@ module Sass
         raise error('String index may not be 0', name) if index.zero?
 
         if index.abs > text.length
-          raise error("Invalid index #{sass_index} for a string with #{text.length} characters",
-                      name)
+          raise error("Invalid index #{sass_index} for a string with #{text.length} characters", name)
         end
 
         index.negative? ? text.length + index : index - 1

data/lib/sass/value.rb

@@ -2,7 +2,7 @@
 
 module Sass
   # The abstract base class of Sass's value types.
-  class Value
+  module Value
     def to_a
       [self]
     end
@@ -32,8 +32,7 @@ module Sass
       raise error('List index may not be 0', name) if index.zero?
 
       if index.abs > to_a_length
-        raise error("Invalid index #{sass_index} for a list with #{to_a_length} elements",
-                    name)
+        raise error("Invalid index #{sass_index} for a list with #{to_a_length} elements", name)
       end
 
       index.negative? ? to_a_length + index : index - 1

data/lib/sass.rb

@@ -3,22 +3,21 @@
 require_relative 'sass/compile_error'
 require_relative 'sass/compile_result'
 require_relative 'sass/embedded'
+require_relative 'sass/embedded/async'
 require_relative 'sass/embedded/channel'
-require_relative 'sass/embedded/observer'
-require_relative 'sass/embedded/compile_context'
-require_relative 'sass/embedded/compile_context/function_registry'
-require_relative 'sass/embedded/compile_context/importer_registry'
-require_relative 'sass/embedded/compile_context/logger_registry'
-require_relative 'sass/embedded/compile_context/value_protofier'
 require_relative 'sass/embedded/compiler'
-require_relative 'sass/embedded_protocol'
+require_relative 'sass/embedded/dispatcher'
+require_relative 'sass/embedded/host'
+require_relative 'sass/embedded/host/function_registry'
+require_relative 'sass/embedded/host/importer_registry'
+require_relative 'sass/embedded/host/logger_registry'
+require_relative 'sass/embedded/host/value_protofier'
 require_relative 'sass/embedded/legacy'
-require_relative 'sass/embedded/protocol_error'
 require_relative 'sass/embedded/protofier'
 require_relative 'sass/embedded/structifier'
 require_relative 'sass/embedded/varint'
 require_relative 'sass/embedded/version'
-require_relative 'sass/embedded/version_context'
+require_relative 'sass/embedded_protocol'
 require_relative 'sass/logger'
 require_relative 'sass/logger/source_location'
 require_relative 'sass/logger/source_span'
@@ -51,7 +50,6 @@ module Sass
     #   Sass.compile('style.scss')
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [Embedded::ProtocolError]
     def compile(path, **kwargs)
       instance.compile(path, **kwargs)
     end
@@ -66,7 +64,6 @@ module Sass
     #   Sass.compile_string('h1 { font-size: 40px; }')
     # @return [CompileResult]
     # @raise [CompileError]
-    # @raise [Embedded::ProtocolError]
     def compile_string(source, **kwargs)
       instance.compile_string(source, **kwargs)
     end
@@ -74,8 +71,6 @@ module Sass
     # The global {.info} method.
     #
     # This instantiates a global {Embedded} instance and calls {Embedded#info}.
-    #
-    # @raise [Embedded::ProtocolError]
     def info
       instance.info
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -128,21 +128,20 @@ files:
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
 - lib/sass/embedded.rb
+- lib/sass/embedded/async.rb
 - lib/sass/embedded/channel.rb
-- lib/sass/embedded/compile_context.rb
-- lib/sass/embedded/compile_context/function_registry.rb
-- lib/sass/embedded/compile_context/importer_registry.rb
-- lib/sass/embedded/compile_context/logger_registry.rb
-- lib/sass/embedded/compile_context/value_protofier.rb
 - lib/sass/embedded/compiler.rb
+- lib/sass/embedded/dispatcher.rb
+- lib/sass/embedded/host.rb
+- 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/value_protofier.rb
 - lib/sass/embedded/legacy.rb
-- lib/sass/embedded/observer.rb
-- lib/sass/embedded/protocol_error.rb
 - lib/sass/embedded/protofier.rb
 - lib/sass/embedded/structifier.rb
 - lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
-- lib/sass/embedded/version_context.rb
 - lib/sass/embedded_protocol.rb
 - lib/sass/logger.rb
 - lib/sass/logger/source_location.rb
@@ -164,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.18.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.18.2
+  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
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/embedded/compile_context.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Observer} for {Embedded#compile}.
-    class CompileContext
-      include Observer
-
-      def initialize(channel,
-                     path:,
-                     source:,
-
-                     importer:,
-                     load_paths:,
-                     syntax:,
-                     url:,
-
-                     source_map:,
-                     source_map_include_sources:,
-                     style:,
-
-                     functions:,
-                     importers:,
-
-                     alert_ascii:,
-                     alert_color:,
-                     logger:,
-                     quiet_deps:,
-                     verbose:)
-        @function_registery = FunctionRegistry.new(functions, highlight: alert_color)
-        @importer_registery = ImporterRegistry.new(importers, load_paths, highlight: alert_color)
-        @logger_registery = LoggerRegistry.new(logger)
-
-        super(channel)
-
-        send_message EmbeddedProtocol::InboundMessage::CompileRequest.new(
-          id: id,
-          string: unless source.nil?
-                    EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
-                      source: source,
-                      url: url&.to_s,
-                      syntax: Protofier.to_proto_syntax(syntax),
-                      importer: importer.nil? ? nil : @importer_registery.register(importer)
-                    )
-                  end,
-          path: path,
-          style: Protofier.to_proto_output_style(style),
-          source_map: source_map,
-          source_map_include_sources: source_map_include_sources,
-          importers: @importer_registery.importers,
-          global_functions: @function_registery.global_functions,
-          alert_ascii: alert_ascii,
-          alert_color: alert_color,
-          quiet_deps: quiet_deps,
-          verbose: verbose
-        )
-      end
-
-      def update(error, message)
-        raise error unless error.nil?
-
-        case message
-        when EmbeddedProtocol::OutboundMessage::CompileResponse
-          return unless message.id == id
-
-          Thread.new do
-            super(nil, message)
-          end
-        when EmbeddedProtocol::OutboundMessage::LogEvent
-          return unless message.compilation_id == id
-
-          @logger_registery.log message
-        when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
-          return unless message.compilation_id == id
-
-          Thread.new do
-            send_message @importer_registery.canonicalize message
-          end
-        when EmbeddedProtocol::OutboundMessage::ImportRequest
-          return unless message.compilation_id == id
-
-          Thread.new do
-            send_message @importer_registery.import message
-          end
-        when EmbeddedProtocol::OutboundMessage::FileImportRequest
-          return unless message.compilation_id == id
-
-          Thread.new do
-            send_message @importer_registery.file_import message
-          end
-        when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
-          return unless message.compilation_id == id
-
-          Thread.new do
-            send_message @function_registery.function_call message
-          end
-        end
-      rescue StandardError => e
-        Thread.new do
-          super(e, nil)
-        end
-      end
-    end
-
-    private_constant :CompileContext
-  end
-end

data/lib/sass/embedded/observer.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Observer} module for communicating with {Compiler}.
-    module Observer
-      def initialize(channel)
-        @mutex = Mutex.new
-        @condition_variable = ConditionVariable.new
-        @error = nil
-        @message = nil
-
-        @subscription = channel.subscribe(self)
-      end
-
-      def receive_message
-        @mutex.synchronize do
-          @condition_variable.wait(@mutex) if @error.nil? && @message.nil?
-        end
-
-        raise @error unless @error.nil?
-
-        @message
-      end
-
-      def update(error, message)
-        @subscription.unsubscribe
-
-        @mutex.synchronize do
-          @error = error
-          @message = message
-          @condition_variable.broadcast
-        end
-      end
-
-      private
-
-      def id
-        @subscription.id
-      end
-
-      def send_message(*args)
-        @subscription.send_message(*args)
-      end
-    end
-
-    private_constant :Observer
-  end
-end

data/lib/sass/embedded/protocol_error.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class ProtocolError < StandardError; end
-  end
-end