sass-embedded 1.69.5 → 1.69.7

data/lib/sass/value/argument_list.rb

@@ -8,12 +8,12 @@ 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]
       def initialize(contents = [], keywords = {}, separator = ',')
-        super(contents, separator: separator)
+        super(contents, separator:)
 
         @id = 0
         @keywords_accessed = false

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/number.rb

@@ -183,7 +183,7 @@ module Sass
       def convert_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: false,
-                                name: name)
+                                name:)
       end
 
       # @param other [Number]
@@ -200,9 +200,9 @@ module Sass
       def convert_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: false,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @param new_numerator_units [Array<::String>]
@@ -221,7 +221,7 @@ module Sass
       def coerce_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: true,
-                                name: name)
+                                name:)
       end
 
       # @param unit [::String]
@@ -244,9 +244,9 @@ module Sass
       def coerce_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: true,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @return [Number]

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,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'calculation_value'
-require_relative 'script_error'
-
 module Sass
   # The abstract base class of Sass's value types.
   #
@@ -67,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)
@@ -130,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.5
+  version: 1.69.7
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,32 +55,33 @@ files:
 - ext/sass/embedded_sass_pb.rb
 - ext/sass/expand-archive.ps1
 - ext/sass/package.json
-- ext/sass/win32_api.rb
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
 - lib/sass/calculation_value/calculation_operation.rb
 - lib/sass/canonicalize_context.rb
-- lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
+- 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
+- lib/sass/compiler/host/logger_registry.rb
+- lib/sass/compiler/host/protofier.rb
+- lib/sass/compiler/host/structifier.rb
+- lib/sass/compiler/host/value_protofier.rb
+- lib/sass/compiler/varint.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
-- lib/sass/embedded/connection.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/protofier.rb
-- lib/sass/embedded/host/structifier.rb
-- lib/sass/embedded/host/value_protofier.rb
-- lib/sass/embedded/resilient_dispatcher.rb
-- lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded_protocol.rb
+- lib/sass/exception.rb
+- lib/sass/fork_tracker.rb
 - lib/sass/logger/silent.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
-- lib/sass/script_error.rb
+- lib/sass/serializer.rb
 - lib/sass/value.rb
 - lib/sass/value/argument_list.rb
 - lib/sass/value/boolean.rb
@@ -95,13 +96,14 @@ files:
 - lib/sass/value/number.rb
 - lib/sass/value/number/unit.rb
 - lib/sass/value/string.rb
-homepage: https://github.com/ntkme/sass-embedded-host-ruby
+homepage: https://github.com/sass-contrib/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.5
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.69.5
+  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:
@@ -110,14 +112,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/ext/sass/win32_api.rb

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-require 'fiddle'
-
-# @!visibility private
-module SassConfig
-  # @see https://learn.microsoft.com/en-us/windows/win32/api/
-  module Win32API
-    Kernel32 = Fiddle.dlopen('Kernel32.dll')
-
-    # @see https://learn.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants
-    module ImageFileMachineConstants
-      IMAGE_FILE_MACHINE_I386 = 0x014c
-      IMAGE_FILE_MACHINE_ARMNT = 0x01c4
-      IMAGE_FILE_MACHINE_AMD64 = 0x8664
-      IMAGE_FILE_MACHINE_ARM64 = 0xaa64
-    end
-
-    private_constant :ImageFileMachineConstants
-
-    # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/ne-processthreadsapi-machine_attributes
-    module MachineAttributes
-      USER_ENABLED = 0x00000001
-      KERNEL_ENABLED = 0x00000002
-      WOW64_CONTAINER = 0x00000004
-    end
-
-    private_constant :MachineAttributes
-
-    # Specifies the ways in which an architecture of code can run on a host operating system.
-    class MachineTypeAttributes
-      def initialize(machine_type_attributes)
-        @machine_type_attributes = machine_type_attributes
-      end
-
-      # The specified architecture of code can run in user mode.
-      def user_enabled?
-        @machine_type_attributes & MachineAttributes::USER_ENABLED == MachineAttributes::USER_ENABLED
-      end
-
-      # The specified architecture of code can run in kernel mode.
-      def kernel_enabled?
-        @machine_type_attributes & MachineAttributes::KERNEL_ENABLED == MachineAttributes::KERNEL_ENABLED
-      end
-
-      # The specified architecture of code runs on WOW64.
-      def wow64_container?
-        @machine_type_attributes & MachineAttributes::WOW64_CONTAINER == MachineAttributes::WOW64_CONTAINER
-      end
-    end
-
-    private_constant :MachineTypeAttributes
-
-    class << self
-      def x86?
-        get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_I386).user_enabled?
-      end
-
-      def arm?
-        get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_ARMNT).user_enabled?
-      end
-
-      def x64?
-        get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_AMD64).user_enabled?
-      end
-
-      def arm64?
-        get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_ARM64).user_enabled?
-      end
-
-      private
-
-      begin
-        # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getmachinetypeattributes
-        GetMachineTypeAttributes = Fiddle::Function.new(
-          Kernel32['GetMachineTypeAttributes'],
-          [-Fiddle::TYPE_SHORT, Fiddle::TYPE_VOIDP],
-          Fiddle::TYPE_LONG
-        )
-
-        def get_machine_type_attributes(machine)
-          p_machine_type_attributes = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT, Fiddle::RUBY_FREE)
-          raise Fiddle.win32_last_error unless GetMachineTypeAttributes.call(machine, p_machine_type_attributes).zero?
-
-          MachineTypeAttributes.new(p_machine_type_attributes.to_str.unpack1('i'))
-        end
-      rescue Fiddle::DLError
-        # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getcurrentprocess
-        GetCurrentProcess = Fiddle::Function.new(
-          Kernel32['GetCurrentProcess'],
-          [],
-          Fiddle::TYPE_VOIDP
-        )
-
-        # @see https://learn.microsoft.com/en-us/windows/win32/api/wow64apiset/nf-wow64apiset-iswow64process2
-        IsWow64Process2 = Fiddle::Function.new(
-          Kernel32['IsWow64Process2'],
-          [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP],
-          Fiddle::TYPE_CHAR
-        )
-
-        # @see https://learn.microsoft.com/en-us/windows/win32/api/wow64apiset/nf-wow64apiset-iswow64guestmachinesupported
-        IsWow64GuestMachineSupported = Fiddle::Function.new(
-          Kernel32['IsWow64GuestMachineSupported'],
-          [-Fiddle::TYPE_SHORT, Fiddle::TYPE_VOIDP],
-          Fiddle::TYPE_LONG
-        )
-
-        def get_machine_type_attributes(machine)
-          h_process = GetCurrentProcess.call
-          p_process_machine = Fiddle::Pointer.malloc(Fiddle::SIZEOF_SHORT, Fiddle::RUBY_FREE)
-          p_native_machine = Fiddle::Pointer.malloc(Fiddle::SIZEOF_SHORT, Fiddle::RUBY_FREE)
-          raise Fiddle.win32_last_error if IsWow64Process2.call(h_process, p_process_machine, p_native_machine).zero?
-
-          if p_native_machine.to_str.unpack1('S!') == machine
-            return MachineTypeAttributes.new(MachineAttributes::USER_ENABLED | MachineAttributes::KERNEL_ENABLED)
-          end
-
-          p_machine_is_supported = Fiddle::Pointer.malloc(Fiddle::SIZEOF_CHAR, Fiddle::RUBY_FREE)
-          raise Fiddle.win32_last_error unless IsWow64GuestMachineSupported.call(machine, p_machine_is_supported).zero?
-
-          if p_machine_is_supported.to_str.unpack1('c').zero?
-            MachineTypeAttributes.new(0)
-          else
-            MachineTypeAttributes.new(MachineAttributes::USER_ENABLED | MachineAttributes::WOW64_CONTAINER)
-          end
-        end
-      end
-    end
-  end
-
-  private_constant :Win32API
-end

data/lib/sass/compile_error.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # An exception thrown because a Sass compilation failed.
-  class CompileError < StandardError
-    # @return [String, nil]
-    attr_reader :sass_stack
-
-    # @return [Logger::SourceSpan, nil]
-    attr_reader :span
-
-    # @return [Array<String>]
-    attr_reader :loaded_urls
-
-    # @!visibility private
-    def initialize(message, full_message, sass_stack, span, loaded_urls)
-      super(message)
-      @full_message = full_message
-      @sass_stack = sass_stack
-      @span = span
-      @loaded_urls = loaded_urls
-    end
-
-    # @return [String]
-    def full_message(...)
-      return super(...) if @full_message.nil?
-
-      @full_message = +@full_message
-    end
-  end
-end

data/lib/sass/embedded/connection.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-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(dispatcher)
-        @mutex = Mutex.new
-        @stdin, stdout, stderr, @wait_thread = begin
-          Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
-        rescue Errno::ENOENT
-          require_relative '../elf'
-
-          raise if ELF::INTERPRETER.nil?
-
-          Open3.popen3(ELF::INTERPRETER, *CLI::COMMAND, '--embedded', chdir: __dir__)
-        end
-        @stdin.binmode
-
-        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)
-          rescue IOError, Errno::EBADF
-            break
-          end
-          stderr.close
-        end
-      end
-
-      def close
-        @stdin.close
-        @wait_thread.join
-      end
-
-      def closed?
-        @stdin.closed? && !@wait_thread.alive?
-      end
-
-      def write(id, proto)
-        buffer = []
-        Varint.write(buffer, Varint.length(id) + proto.length)
-        Varint.write(buffer, id)
-        @mutex.synchronize do
-          @stdin.write(buffer.pack('C*'), proto)
-        end
-      end
-    end
-
-    private_constant :Connection
-  end
-end

data/lib/sass/embedded/resilient_dispatcher.rb

@@ -1,40 +0,0 @@
-# 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(...)
-        @dispatcher.connect(...)
-      rescue Errno::EBUSY
-        @mutex.synchronize do
-          @dispatcher.connect(...)
-        rescue Errno::EBUSY
-          @dispatcher = Dispatcher.new
-          @dispatcher.connect(...)
-        end
-      end
-    end
-
-    private_constant :ResilientDispatcher
-  end
-end

data/lib/sass/script_error.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # An exception thrown by Sass Script.
-  class ScriptError < StandardError
-    def initialize(message, name = nil)
-      super(name.nil? ? message : "$#{name}: #{message}")
-    end
-  end
-end