sass-embedded 1.77.5 → 1.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631464c3270dfeddd024e782fed7e3354594b03afa25ca5b9efc0509ccd70af4
-  data.tar.gz: bd6224dff05c20e442feee188d1ae9f9b0066db7c1ad0725c253ccb25c3b6aa0
+  metadata.gz: 6140546f1464fb936af0e5d76355e24844d12cb71f29142ca64e1aa5ec1cce56
+  data.tar.gz: 2956e3e5ec0b5860482e4f084159d94a4fc7bb06f67f6ae0820bc04971efd824
 SHA512:
-  metadata.gz: 6292f26854e7d873b7168d6e172fab1044eb7ca75754b2dc6b3ca158462abdaf49cc351a2cf58cb6da71bb81a1854b1da06267d76b2a779c67c9bd513a8736a1
-  data.tar.gz: '0958f5d6cd79525a5ba9d591e540bd2eb23e31a2acaa59a74f0a896c0596ad6709e6332d7f7d328bfa95835b6f3262797f321958c88ef83d17d8f6de78284713'
+  metadata.gz: e366ed09f3a7dd7235bb3375b2aa2e0e239bbd66f770ae0432dcaf9e279139957a3aaaf3f76415977d123b37eaace4153eb22bd6709fe8e47be8b4bccf3ebff5
+  data.tar.gz: e6ef849e9d80e3d3f4810c76d4d9c46de4d633d3cf3f1b6e906bae870dd3cae5dc7f21384c24a718dd063e088da69a2ca8198bfda7c03b2f595021ee850248d0

data/ext/sass/Rakefile

@@ -138,7 +138,7 @@ module FileUtils
   def fetch(source_uri, dest_path = nil)
     require 'rubygems/remote_fetcher'
 
-    source_uri = "/#{source_uri}" if File.absolute_path?(source_uri) && !source_uri.start_with?('/')
+    source_uri = "/#{source_uri}" if !source_uri.start_with?('/') && File.absolute_path?(source_uri)
 
     source_uri = begin
       Gem::Uri.parse!(source_uri)

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.77.5"
+    "sass": "1.78.0"
   }
 }

data/lib/sass/compiler/connection.rb

@@ -24,21 +24,24 @@ module Sass
 
         @stdin.binmode
 
-        @wait_thread.name = "sass-embedded-process-waiter-#{@wait_thread.pid}"
-      end
+        # # https://dart.dev/tools/dart-devtools
+        # if 'dart' == File.basename(CLI::COMMAND.first, '.exe') && CLI::COMMAND.include?('--observe')
+        #   Kernel.warn(@stdout.readline, uplevel: 0)
+        #   Kernel.warn(@stdout.readline, uplevel: 0)
+        # end
 
-      def listen(dispatcher)
-        Thread.new do
-          Thread.current.name = "sass-embedded-process-stdout-poller-#{@wait_thread.pid}"
+        @stdout.binmode
 
-          # # https://dart.dev/tools/dart-devtools
-          # if 'dart' == File.basename(CLI::COMMAND.first, '.exe') && CLI::COMMAND.include?('--observe')
-          #   Kernel.warn(@stdout.readline, uplevel: 0)
-          #   Kernel.warn(@stdout.readline, uplevel: 0)
-          # end
+        @wait_thread.name = "sass-embedded-process-waiter-#{id}"
+      end
 
-          @stdout.binmode
+      def id
+        @wait_thread.pid
+      end
 
+      def listen(dispatcher)
+        Thread.new do
+          Thread.current.name = "sass-embedded-process-stdout-poller-#{id}"
           loop do
             length = Varint.read(@stdout)
             id = Varint.read(@stdout)
@@ -53,7 +56,7 @@ module Sass
         end
 
         Thread.new do
-          Thread.current.name = "sass-embedded-process-stderr-poller-#{@wait_thread.pid}"
+          Thread.current.name = "sass-embedded-process-stderr-poller-#{id}"
           loop do
             Kernel.warn(@stderr.readline, uplevel: 0)
           end

data/lib/sass/compiler.rb

@@ -62,7 +62,7 @@ module Sass
     #   compilation to avoid deluging users in console noise. If you set verbose to +true+, it will instead print every
     #   deprecation warning it encounters.
     # @return [CompileResult]
-    # @raise [ArgumentError, CompileError]
+    # @raise [ArgumentError, CompileError, IOError]
     # @see https://sass-lang.com/documentation/js-api/functions/compile/
     def compile(path,
                 load_paths: [],
@@ -142,7 +142,7 @@ module Sass
     #   compilation to avoid deluging users in console noise. If you set verbose to +true+, it will instead print every
     #   deprecation warning it encounters.
     # @return [CompileResult]
-    # @raise [ArgumentError, CompileError]
+    # @raise [ArgumentError, CompileError, IOError]
     # @see https://sass-lang.com/documentation/js-api/functions/compilestring/
     def compile_string(source,
                        importer: nil,

data/lib/sass/elf.rb

@@ -7,26 +7,76 @@ module Sass
   # @see https://github.com/torvalds/linux/blob/HEAD/include/uapi/linux/elf.h
   # @see https://github.com/torvalds/linux/blob/HEAD/kernel/kexec_elf.c
   class ELF
-    # rubocop:disable Naming/ConstantName
-
-    # 32-bit ELF base types.
-    Elf32_Addr  = :__u32
-    Elf32_Half  = :__u16
-    Elf32_Off   = :__u32
-    Elf32_Sword = :__s32
-    Elf32_Word  = :__u32
-
-    # 64-bit ELF base types.
-    Elf64_Addr   = :__u64
-    Elf64_Half   = :__u16
-    Elf64_SHalf  = :__s16
-    Elf64_Off    = :__u64
-    Elf64_Sword  = :__s32
-    Elf64_Word   = :__u32
-    Elf64_Xword  = :__u64
-    Elf64_Sxword = :__s64
+    module PackInfo
+      PACK_MAP = {
+        Elf32_Ehdr: 'S<2L<5S<6',
+        Elf64_Ehdr: 'S<2L<Q<3L<S<6',
+        Elf32_Phdr: 'L<8',
+        Elf64_Phdr: 'L<2Q<6'
+      }.freeze
+
+      SIZE_MAP = {
+        Elf32_Ehdr: 36,
+        Elf64_Ehdr: 48,
+        Elf32_Phdr: 32,
+        Elf64_Phdr: 56
+      }.freeze
+
+      STRUCT_MAP = {
+        Elf32_Ehdr: %i[
+          e_type
+          e_machine
+          e_version
+          e_entry
+          e_phoff
+          e_shoff
+          e_flags
+          e_ehsize
+          e_phentsize
+          e_phnum
+          e_shentsize
+          e_shnum
+          e_shstrndx
+        ].freeze,
+        Elf64_Ehdr: %i[
+          e_type
+          e_machine
+          e_version
+          e_entry
+          e_phoff
+          e_shoff
+          e_flags
+          e_ehsize
+          e_phentsize
+          e_phnum
+          e_shentsize
+          e_shnum
+          e_shstrndx
+        ].freeze,
+        Elf32_Phdr: %i[
+          p_type
+          p_offset
+          p_vaddr
+          p_paddr
+          p_filesz
+          p_memsz
+          p_flags
+          p_align
+        ].freeze,
+        Elf64_Phdr: %i[
+          p_type
+          p_flags
+          p_offset
+          p_vaddr
+          p_paddr
+          p_filesz
+          p_memsz
+          p_align
+        ].freeze
+      }.freeze
+    end
 
-    # rubocop:enable Naming/ConstantName
+    private_constant :PackInfo
 
     # These constants are for the segment types stored in the image headers
     PT_NULL         = 0
@@ -41,10 +91,6 @@ module Sass
     PT_HIOS         = 0x6fffffff
     PT_LOPROC       = 0x70000000
     PT_HIPROC       = 0x7fffffff
-    PT_GNU_EH_FRAME = (PT_LOOS + 0x474e550)
-    PT_GNU_STACK    = (PT_LOOS + 0x474e551)
-    PT_GNU_RELRO    = (PT_LOOS + 0x474e552)
-    PT_GNU_PROPERTY = (PT_LOOS + 0x474e553)
 
     # These constants define the different elf file types
     ET_NONE   = 0
@@ -57,66 +103,6 @@ module Sass
 
     EI_NIDENT = 16
 
-    # rubocop:disable Naming/ConstantName
-
-    Elf32_Ehdr = [
-      [:unsigned_char, :e_ident, EI_NIDENT],
-      [Elf32_Half,     :e_type],
-      [Elf32_Half,     :e_machine],
-      [Elf32_Word,     :e_version],
-      [Elf32_Addr,     :e_entry],
-      [Elf32_Off,      :e_phoff],
-      [Elf32_Off,      :e_shoff],
-      [Elf32_Word,     :e_flags],
-      [Elf32_Half,     :e_ehsize],
-      [Elf32_Half,     :e_phentsize],
-      [Elf32_Half,     :e_phnum],
-      [Elf32_Half,     :e_shentsize],
-      [Elf32_Half,     :e_shnum],
-      [Elf32_Half,     :e_shstrndx]
-    ].freeze
-
-    Elf64_Ehdr = [
-      [:unsigned_char, :e_ident, EI_NIDENT],
-      [Elf64_Half,     :e_type],
-      [Elf64_Half,     :e_machine],
-      [Elf64_Word,     :e_version],
-      [Elf64_Addr,     :e_entry],
-      [Elf64_Off,      :e_phoff],
-      [Elf64_Off,      :e_shoff],
-      [Elf64_Word,     :e_flags],
-      [Elf64_Half,     :e_ehsize],
-      [Elf64_Half,     :e_phentsize],
-      [Elf64_Half,     :e_phnum],
-      [Elf64_Half,     :e_shentsize],
-      [Elf64_Half,     :e_shnum],
-      [Elf64_Half,     :e_shstrndx]
-    ].freeze
-
-    Elf32_Phdr = [
-      [Elf32_Word, :p_type],
-      [Elf32_Off,  :p_offset],
-      [Elf32_Addr, :p_vaddr],
-      [Elf32_Addr, :p_paddr],
-      [Elf32_Word, :p_filesz],
-      [Elf32_Word, :p_memsz],
-      [Elf32_Word, :p_flags],
-      [Elf32_Word, :p_align]
-    ].freeze
-
-    Elf64_Phdr = [
-      [Elf64_Word,  :p_type],
-      [Elf64_Word,  :p_flags],
-      [Elf64_Off,   :p_offset],
-      [Elf64_Addr,  :p_vaddr],
-      [Elf64_Addr,  :p_paddr],
-      [Elf64_Xword, :p_filesz],
-      [Elf64_Xword, :p_memsz],
-      [Elf64_Xword, :p_align]
-    ].freeze
-
-    # rubocop:enable Naming/ConstantName
-
     # e_ident[] indexes
     EI_MAG0    = 0
     EI_MAG1    = 1
@@ -130,9 +116,9 @@ module Sass
 
     # EI_MAG
     ELFMAG0 = 0x7f
-    ELFMAG1 = 'E'.ord
-    ELFMAG2 = 'L'.ord
-    ELFMAG3 = 'F'.ord
+    ELFMAG1 = 0x45
+    ELFMAG2 = 0x4c
+    ELFMAG3 = 0x46
     ELFMAG  = [ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3].pack('C*')
     SELFMAG = 4
 
@@ -149,10 +135,35 @@ module Sass
 
     def initialize(buffer)
       @buffer = buffer
-      @ehdr = read_ehdr
+
+      @ehdr = { e_ident: @buffer.read(EI_NIDENT).unpack('C*') }
+      raise ArgumentError unless @ehdr[:e_ident].slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
+
+      case @ehdr[:e_ident][EI_CLASS]
+      when ELFCLASS32
+        elf_ehdr = :Elf32_Ehdr
+        elf_phdr = :Elf32_Phdr
+      when ELFCLASS64
+        elf_ehdr = :Elf64_Ehdr
+        elf_phdr = :Elf64_Phdr
+      else
+        raise ArgumentError
+      end
+
+      case @ehdr[:e_ident][EI_DATA]
+      when ELFDATA2LSB
+        little_endian = true
+      when ELFDATA2MSB
+        little_endian = false
+      else
+        raise ArgumentError
+      end
+
+      @ehdr.merge!(read(elf_ehdr, little_endian))
+
       @buffer.seek(@ehdr[:e_phoff], IO::SEEK_SET)
       @proghdrs = Array.new(@ehdr[:e_phnum]) do
-        read_phdr
+        read(elf_phdr, little_endian)
       end
     end
 
@@ -185,75 +196,10 @@ module Sass
 
     private
 
-    def file_class
-      @ehdr[:e_ident][EI_CLASS]
-    end
-
-    def data_encoding
-      @ehdr[:e_ident][EI_DATA]
-    end
-
-    def read_ehdr
-      @ehdr = { e_ident: @buffer.read(EI_NIDENT).unpack('C*') }
-      raise ArgumentError unless @ehdr[:e_ident].slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
-
-      case file_class
-      when ELFCLASS32
-        Elf32_Ehdr
-      when ELFCLASS64
-        Elf64_Ehdr
-      else
-        raise ArgumentError
-      end.drop(1).to_h do |field|
-        [field[1], read1(field[0])]
-      end.merge!(@ehdr)
-    end
-
-    def read_phdr
-      case file_class
-      when ELFCLASS32
-        Elf32_Phdr
-      when ELFCLASS64
-        Elf64_Phdr
-      else
-        raise ArgumentError
-      end.to_h do |field|
-        [field[1], read1(field[0])]
-      end
-    end
-
-    def explicit_endian
-      case data_encoding
-      when ELFDATA2LSB
-        '<'
-      when ELFDATA2MSB
-        '>'
-      else
-        raise ArgumentError
-      end
-    end
-
-    def read1(type)
-      case type
-      when :__u8
-        @buffer.read(1).unpack1('C')
-      when :__u16
-        @buffer.read(2).unpack1("S#{explicit_endian}")
-      when :__u32
-        @buffer.read(4).unpack1("L#{explicit_endian}")
-      when :__u64
-        @buffer.read(8).unpack1("Q#{explicit_endian}")
-      when :__s8
-        @buffer.read(1).unpack1('c')
-      when :__s16
-        @buffer.read(2).unpack1("s#{explicit_endian}")
-      when :__s32
-        @buffer.read(4).unpack1("l#{explicit_endian}")
-      when :__s64
-        @buffer.read(8).unpack1("q#{explicit_endian}")
-      else
-        raise ArgumentError
-      end
+    def read(type, little_endian)
+      size = PackInfo::SIZE_MAP[type]
+      format = little_endian ? PackInfo::PACK_MAP[type] : PackInfo::PACK_MAP[type].tr('<', '>')
+      [PackInfo::STRUCT_MAP[type], @buffer.read(size).unpack(format)].transpose.to_h
     end
 
     INTERPRETER = begin

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.77.5'
+    VERSION = '1.78.0'
   end
 end

data/lib/sass/embedded.rb

@@ -63,7 +63,7 @@ module Sass
                 @last_accessed_time = current_time
 
                 Thread.new do
-                  Thread.current.name = 'sass-embedded-process-reaper'
+                  Thread.current.name = "sass-embedded-connection-reaper-#{@connection.id}"
                   duration = idle_timeout
                   loop do
                     sleep(duration.negative? ? idle_timeout : duration)

data/lib/sass/exception.rb

@@ -51,8 +51,12 @@ module Sass
           font-family: monospace, monospace;
           white-space: pre;
           content: #{Serializer.serialize_quoted_string(content).gsub(/[^[:ascii:]][\h\t ]?/) do |match|
-            replacement = "\\#{match.ord.to_s(16)}"
-            replacement << " #{match[1]}" if match.length > 1
+            ordinal = match.ord
+            replacement = "\\#{ordinal.to_s(16)}"
+            if match.length > 1
+              replacement << ' ' if ordinal < 0x100000
+              replacement << match[1]
+            end
             replacement
           end};
         }
@@ -62,6 +66,7 @@ module Sass
 
   # An exception thrown by Sass Script.
   class ScriptError < StandardError
+    # @!visibility private
     def initialize(message, name = nil)
       super(name.nil? ? message : "$#{name}: #{message}")
     end

data/lib/sass/value/number.rb

@@ -290,7 +290,7 @@ module Sass
 
         compatibility_error = lambda {
           unless other.nil?
-            message = +"#{self} and"
+            message = "#{self} and"
             message << " $#{other_name}:" unless other_name.nil?
             message << " #{other} have incompatible units"
             message << " (one has units and the other doesn't)" if unitless? || other_unitless

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.77.5
+  version: 1.78.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,22 +28,16 @@ dependencies:
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.25'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.25'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.27'
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -107,8 +101,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.77.5
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.77.5
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.78.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.78.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -126,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.18
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!