sass-embedded 1.69.6-arm64-darwin → 1.69.7-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 468d6f04478756935b72746120088050ef5a27e1e7d5ac40dd68dd10627893e1
-  data.tar.gz: 7b0796a0639c32192be05312c8ae4f170b6271fd7edf24621ad836877c69f73d
+  metadata.gz: ce8136be62d71bb7b4de88d25492ff4378a9fe1a5a0c6803d0d662bc434024df
+  data.tar.gz: 98b661689a1c1de347b3b3f0154f461ad7ffe1998c8b5c30b736e793185ae5c9
 SHA512:
-  metadata.gz: a0c701e68cb63c7855e3b18b5f30d3951684d37635914acb3e9ddd8009d56ef53bbe10b9f6dd01e01fe68c5545e09fc6baa914330f9417c724e9ecf77929e277
-  data.tar.gz: 38f5dce8f66dfcf0351e1e7b89110af637677b8fbfa9eec36a2cdae461895561421e5c9bb80452ef201593c3e392a7ad71cbff6fb06deca78fe165f248153d82
+  metadata.gz: 4905e861154a798cd1b3c5ac7bfe0ba1fd8eb49dd571375d4f81632e5e178fa66ca26a5967c740fae19215bf36823bf47eda9541e240e0c13402b90ec4743846
+  data.tar.gz: 2bb8864046425cd17a3a5f03c2d1aaac3d2ee2d05aa9257ea8cc142b1f0c659ddf6bae2d2ae2fa98328463144389947c40f7805ff81f80601ccceb66bdd6e10b

data/ext/sass/cli.rb

@@ -3,8 +3,8 @@
 module Sass
   class CLI
     COMMAND = [
-      File.absolute_path('dart-sass/src/dart', __dir__),
-      File.absolute_path('dart-sass/src/sass.snapshot', __dir__)
+      File.absolute_path('dart-sass/src/dart', __dir__).freeze,
+      File.absolute_path('dart-sass/src/sass.snapshot', __dir__).freeze
     ].freeze
   end
 

data/lib/sass/calculation_value/calculation_operation.rb

@@ -18,12 +18,9 @@ module Sass
       def initialize(operator, left, right)
         raise Sass::ScriptError, "Invalid operator: #{operator}" unless OPERATORS.include?(operator)
 
-        left.assert_calculation_value
-        right.assert_calculation_value
-
         @operator = operator.freeze
-        @left = left.freeze
-        @right = right.freeze
+        @left = assert_calculation_value(left, 'left')
+        @right = assert_calculation_value(right, 'right')
       end
 
       # @return [::String]

data/lib/sass/calculation_value.rb

@@ -5,10 +5,16 @@ module Sass
   #
   # @see https://sass-lang.com/documentation/js-api/types/calculationvalue/
   module CalculationValue
-    # @return [CalculationValue]
-    # @raise [ScriptError]
-    def assert_calculation_value(_name = nil)
-      self
+    private
+
+    def assert_calculation_value(value, name = nil)
+      if !value.is_a?(Sass::CalculationValue) || (value.is_a?(Sass::Value::String) && value.quoted?)
+        raise Sass::ScriptError.new(
+          "#{value} must be one of SassNumber, unquoted SassString, SassCalculation, CalculationOperation", name
+        )
+      end
+
+      value
     end
   end
 end

data/lib/sass/compiler/dispatcher.rb

@@ -123,7 +123,7 @@ module Sass
         end
 
         def disconnect
-          @dispatcher.unsubscribe(id)
+          @dispatcher.unsubscribe(@id)
         end
 
         def error(...)

data/lib/sass/compiler/{resilient_dispatcher.rb → dispatcher_manager.rb}

@@ -2,32 +2,35 @@
 
 module Sass
   class Compiler
-    # The {ResilientDispatcher} class.
+    # The {DispatcherManager} class.
     #
-    # It recovers from failures and continues to function.
-    class ResilientDispatcher
+    # It manages the lifecycle of {Dispatcher}.
+    class DispatcherManager
       def initialize(dispatcher_class)
         @dispatcher_class = dispatcher_class
         @dispatcher = @dispatcher_class.new
         @mutex = Mutex.new
       end
 
-      def close(...)
+      def close
         @mutex.synchronize do
-          @dispatcher.close(...)
+          unless @dispatcher.nil?
+            @dispatcher.close
+            @dispatcher = nil
+          end
         end
       end
 
-      def closed?(...)
+      def closed?
         @mutex.synchronize do
-          @dispatcher.closed?(...)
+          @dispatcher.nil?
         end
       end
 
       def connect(...)
-        @dispatcher.connect(...)
-      rescue Errno::EBUSY
         @mutex.synchronize do
+          raise IOError, 'closed compiler' if @dispatcher.nil?
+
           @dispatcher.connect(...)
         rescue Errno::EBUSY
           @dispatcher = @dispatcher_class.new
@@ -36,6 +39,6 @@ module Sass
       end
     end
 
-    private_constant :ResilientDispatcher
+    private_constant :DispatcherManager
   end
 end

data/lib/sass/compiler/host/importer_registry.rb

@@ -81,7 +81,7 @@ module Sass
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
             success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-              contents: importer_result.contents,
+              contents: importer_result.contents.to_str,
               syntax: Protofier.to_proto_syntax(importer_result.syntax),
               source_map_url: (importer_result.source_map_url&.to_s if importer_result.respond_to?(:source_map_url))
             )

data/lib/sass/compiler/host/value_protofier.rb

@@ -16,7 +16,7 @@ module Sass
           when Sass::Value::String
             EmbeddedProtocol::Value.new(
               string: EmbeddedProtocol::Value::String.new(
-                text: obj.text,
+                text: obj.text.to_str,
                 quoted: obj.quoted?
               )
             )
@@ -179,7 +179,7 @@ module Sass
               end
             )
           when :compiler_function
-            Sass::Value::Function.new(nil, nil).instance_eval do
+            Sass::Value::Function.new(nil).instance_eval do
               @id = obj.id
               self
             end

data/lib/sass/compiler/host.rb

@@ -44,7 +44,7 @@ module Sass
           send_message(compile_request: EmbeddedProtocol::InboundMessage::CompileRequest.new(
             string: unless source.nil?
                       EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
-                        source:,
+                        source: source.to_str,
                         url: url&.to_s,
                         syntax: Protofier.to_proto_syntax(syntax),
                         importer: (@importer_registry.register(importer) unless importer.nil?)
@@ -74,7 +74,14 @@ module Sass
           ))
         end
 
-        "sass-embedded\t#{version_response.implementation_version}"
+        lang = case version_response.implementation_name
+               when /\bdart\b/i
+                 '[Dart]'
+               else
+                 '[?]'
+               end
+
+        "#{version_response.implementation_name}\t#{version_response.implementation_version}\t(Sass Compiler)\t#{lang}"
       end
 
       def compile_response(message)

data/lib/sass/compiler.rb

@@ -4,8 +4,8 @@ require_relative 'canonicalize_context'
 require_relative 'compile_result'
 require_relative 'compiler/connection'
 require_relative 'compiler/dispatcher'
+require_relative 'compiler/dispatcher_manager'
 require_relative 'compiler/host'
-require_relative 'compiler/resilient_dispatcher'
 require_relative 'compiler/varint'
 require_relative 'embedded_protocol'
 require_relative 'exception'
@@ -27,7 +27,7 @@ module Sass
   #   sass.close
   class Compiler
     def initialize
-      @dispatcher = ResilientDispatcher.new(Dispatcher)
+      @dispatcher = DispatcherManager.new(Dispatcher)
     end
 
     # Compiles the Sass file at +path+ to CSS.
@@ -174,7 +174,10 @@ module Sass
     # @return [String] Information about the Sass implementation.
     # @see https://sass-lang.com/documentation/js-api/variables/info/
     def info
-      @info ||= Host.new(@dispatcher).version_request
+      @info ||= <<~INFO.freeze
+        sass-embedded\t#{Embedded::VERSION}\t(Embedded Host)\t[Ruby]
+        #{Host.new(@dispatcher).version_request}
+      INFO
     end
 
     def close

data/lib/sass/elf.rb

@@ -150,7 +150,7 @@ module Sass
     def initialize(buffer)
       @buffer = buffer
       @ehdr = read_ehdr
-      @buffer.seek(@ehdr[:e_phoff], :SET)
+      @buffer.seek(@ehdr[:e_phoff], IO::SEEK_SET)
       @proghdrs = Array.new(@ehdr[:e_phnum]) do
         read_phdr
       end
@@ -176,7 +176,7 @@ module Sass
       phdr = @proghdrs.find { |p| p[:p_type] == PT_INTERP }
       return if phdr.nil?
 
-      @buffer.seek(phdr[:p_offset], :SET)
+      @buffer.seek(phdr[:p_offset], IO::SEEK_SET)
       interpreter = @buffer.read(phdr[:p_filesz])
       raise ArgumentError unless interpreter.end_with?("\0")
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.69.6'
+    VERSION = '1.69.7'
   end
 end

data/lib/sass/embedded.rb

@@ -56,7 +56,7 @@ module Sass
 
         compiler = Class.new(Compiler) do
           def initialize
-            @dispatcher = Compiler.const_get(:ResilientDispatcher).new(Class.new(Compiler.const_get(:Dispatcher)) do
+            @dispatcher = Compiler.const_get(:DispatcherManager).new(Class.new(Compiler.const_get(:Dispatcher)) do
               def initialize
                 super
 

data/lib/sass/exception.rb

@@ -50,7 +50,7 @@ module Sass
           border-bottom-style: solid;
           font-family: monospace, monospace;
           white-space: pre;
-          content: #{Serializer.dump_quoted_string(content)};
+          content: #{Serializer.serialize_quoted_string(content, ascii_only: true)};
         }
       CSS
     end

data/lib/sass/fork_tracker.rb

@@ -44,7 +44,7 @@ module Sass
 
     private_constant :CoreExt
 
-    Process.singleton_class.prepend(CoreExt)
+    Process.singleton_class.prepend(CoreExt) if Process.respond_to?(:_fork)
   end
 
   private_constant :ForkTracker

data/lib/sass/serializer.rb

@@ -5,67 +5,35 @@ module Sass
   module Serializer
     module_function
 
-    def dump_quoted_string(string)
-      include_double_quote = false
-      include_single_quote = false
-      buffer = [34]
+    def serialize_quoted_string(string, ascii_only: false)
+      buffer = [0x22]
       string.each_codepoint do |codepoint|
-        case codepoint
-        when 34
-          return dump_double_quoted_string(string) if include_single_quote
-
-          include_double_quote = true
-          buffer << 34
-        when 39
-          return dump_double_quoted_string(string) if include_double_quote
-
-          include_single_quote = true
-          buffer << 39
-        when 92
-          buffer << 92 << 92
-        when 9
-          buffer << 9
+        if codepoint.zero?
+          # If the character is NULL (U+0000), then the REPLACEMENT CHARACTER (U+FFFD).
+          buffer << 0xFFFD
+        elsif codepoint == 0x22
+          # If the character is '"' (U+0022) or "\" (U+005C), then the escaped character.
+          buffer << 0x5C << 0x22
+        elsif codepoint == 0x5C
+          # If the character is '"' (U+0022) or "\" (U+005C), then the escaped character.
+          buffer << 0x5C << 0x5C
+        elsif codepoint < 0x20 || (ascii_only ? codepoint >= 0x7F : codepoint == 0x7F)
+          # If the character is in the range [\1-\1f] (U+0001 to U+001F) or is U+007F,
+          # then the character escaped as code point.
+          buffer << 0x5C
+          buffer.concat(codepoint.to_s(16).codepoints)
+          buffer << 0x20
         else
-          if codepoint < 32 || codepoint > 126
-            buffer << 92
-            buffer.concat(codepoint.to_s(16).codepoints)
-            buffer << 32
-          else
-            buffer << codepoint
-          end
+          # Otherwise, the character itself.
+          buffer << codepoint
         end
       end
-      if include_double_quote
-        buffer[0] = 39
-        buffer << 39
-      else
-        buffer << 34
-      end
+      buffer << 0x22
       buffer.pack('U*')
     end
 
-    def dump_double_quoted_string(string)
-      buffer = [34]
-      string.each_codepoint do |codepoint|
-        case codepoint
-        when 34
-          buffer << 92 << 34
-        when 92
-          buffer << 92 << 92
-        when 9
-          buffer << 9
-        else
-          if codepoint < 32 || codepoint > 126
-            buffer << 92
-            buffer.concat(codepoint.to_s(16).codepoints)
-            buffer << 32
-          else
-            buffer << codepoint
-          end
-        end
-      end
-      buffer << 34
-      buffer.pack('U*')
+    def serialize_unquoted_string(string)
+      string.tr("\0", "\uFFFD").gsub(/\n */, ' ')
     end
   end
 

data/lib/sass/value/argument_list.rb

@@ -8,7 +8,7 @@ module Sass
     # map as well as the positional arguments.
     #
     # @see https://sass-lang.com/documentation/js-api/classes/sassargumentlist/
-    class ArgumentList < Value::List
+    class ArgumentList < List
       # @param contents [Array<Value>]
       # @param keywords [Hash<::String, Value>]
       # @param separator [::String]

data/lib/sass/value/calculation.rb

@@ -53,7 +53,9 @@ module Sass
       private
 
       def initialize(name, arguments)
-        arguments.each(&:assert_calculation_value)
+        arguments.each do |value|
+          assert_calculation_value(value)
+        end
 
         @name = name.freeze
         @arguments = arguments.freeze

data/lib/sass/value/function.rb

@@ -10,9 +10,11 @@ module Sass
 
       # @param signature [::String]
       # @param callback [Proc]
-      def initialize(signature, callback)
-        @signature = signature
-        @callback = callback
+      def initialize(signature, &callback)
+        raise Sass::ScriptError, 'no block given' unless signature.nil? || callback
+
+        @signature = signature.freeze
+        @callback = callback.freeze
       end
 
       # @return [Integer, nil]

data/lib/sass/value/string.rb

@@ -39,14 +39,6 @@ module Sass
         self
       end
 
-      # @return [CalculationValue]
-      # @raise [ScriptError]
-      def assert_calculation_value(name = nil)
-        raise Sass::ScriptError.new("Expected #{self} to be an unquoted string.", name) if quoted?
-
-        self
-      end
-
       # @param sass_index [Number]
       # @return [Integer]
       def sass_index_to_string_index(sass_index, name = nil)
@@ -59,6 +51,11 @@ module Sass
 
         index.negative? ? text.length + index : index - 1
       end
+
+      # @return [String]
+      def to_s
+        @quoted ? Serializer.serialize_quoted_string(@text) : Serializer.serialize_unquoted_string(@text)
+      end
     end
   end
 end

data/lib/sass/value.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'calculation_value'
-
 module Sass
   # The abstract base class of Sass's value types.
   #
@@ -66,12 +64,6 @@ module Sass
       raise Sass::ScriptError.new("#{self} is not a calculation", name)
     end
 
-    # @return [CalculationValue]
-    # @raise [ScriptError]
-    def assert_calculation_value(name = nil)
-      raise Sass::ScriptError.new("#{self} is not a calculation value", name)
-    end
-
     # @return [Color]
     # @raise [ScriptError]
     def assert_color(name = nil)
@@ -129,6 +121,7 @@ module Sass
   end
 end
 
+require_relative 'calculation_value'
 require_relative 'value/list'
 require_relative 'value/argument_list'
 require_relative 'value/boolean'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.69.6
+  version: 1.69.7
 platform: arm64-darwin
 authors:
 - なつき
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -50,6 +50,7 @@ files:
 - lib/sass/compiler.rb
 - lib/sass/compiler/connection.rb
 - lib/sass/compiler/dispatcher.rb
+- lib/sass/compiler/dispatcher_manager.rb
 - lib/sass/compiler/host.rb
 - lib/sass/compiler/host/function_registry.rb
 - lib/sass/compiler/host/importer_registry.rb
@@ -57,7 +58,6 @@ files:
 - lib/sass/compiler/host/protofier.rb
 - lib/sass/compiler/host/structifier.rb
 - lib/sass/compiler/host/value_protofier.rb
-- lib/sass/compiler/resilient_dispatcher.rb
 - lib/sass/compiler/varint.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
@@ -87,9 +87,10 @@ homepage: https://github.com/sass-contrib/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.6
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.69.6
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.7
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.69.7
   funding_uri: https://github.com/sponsors/ntkme
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: