sass-embedded 1.57.1 → 1.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64c7cc4177b807109120cfc58d634781461d4f1e0bbe6cbc77fe9b4ab851098
-  data.tar.gz: 1b72a54c93dfae66521849a33ad4129cce6f612a43a6b16c3b8469d5b9122b8c
+  metadata.gz: c922302bd463c0eade0a9a6c0dec35ac4d2e8af5535045983417fe029eec80e6
+  data.tar.gz: 964e801badaf2a191468a9778c77f3f5a2d1489e823b34903deba9a7f6f96040
 SHA512:
-  metadata.gz: 1d32650afe62f5ea8d7ca7f6f260370a4d5f292777911ae4110e1e651b127f9af30f445a86ca3755583d7840b6f933fa32901f22b8362ae21b6d47f108918660
-  data.tar.gz: c64f23f7b5ddddc19a29926323a9a90af1a01981021066d43bc127692893aa008158b21f5c7281a0a7b7181bfd31dcd659bf94e4a098a2ad6ed9428a826b601d
+  metadata.gz: c14cf67e6ffd6f7079df0d01ba178bf2c5e9717040dedf5d18f3872afa0e03c2063b5c3eaf63403efc6b1e2e2d1fca63e34fb6feb6c05734537e6a136dc16159
+  data.tar.gz: d7f99f709188d47359cbe02b6af3d319740b6e4c68272eadfcd59688ec7b4bea405fbebf6a75af69187ba6a92b6c032157e7ec6afc8ded83b18ec1ca325e7e96

data/ext/sass/Rakefile

@@ -21,13 +21,34 @@ file 'sass_embedded' do |t|
   archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })
   unarchive archive
   rm archive
+
+  if ENV.key?('NIX_BINTOOLS')
+    sh 'patchelf',
+       '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,
+       (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })
+  end
 end
 
 file 'embedded.rb' => %w[sass_embedded] do |t|
-  path = 'sass_embedded/dart-sass-embedded'
-  path = "#{path}#{['.exe', '.bat'].find { |ext| File.exist? "#{path}#{ext}" }}" unless File.exist? path
-
-  raise "#{path} not found" unless File.exist? path
+  exe = 'sass_embedded/dart-sass-embedded'
+  exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
+
+  raise "#{exe} not found" unless File.exist?(exe)
+
+  runtime = 'sass_embedded/src/dart'
+  runtime = "#{runtime}#{['', '.exe'].find { |ext| File.exist?("#{runtime}#{ext}") }}"
+  snapshot = 'sass_embedded/src/dart-sass-embedded.snapshot'
+
+  command = if File.exist?(runtime) && File.exist?(snapshot)
+              "
+        File.absolute_path('#{runtime}', __dir__),
+        File.absolute_path('#{snapshot}', __dir__)
+      "
+            else
+              "
+        File.absolute_path('#{exe}', __dir__)
+      "
+            end
 
   File.write(t.name, <<~EMBEDDED_RB)
     # frozen_string_literal: true
@@ -35,7 +56,7 @@ file 'embedded.rb' => %w[sass_embedded] do |t|
     module Sass
       class Embedded
         class Compiler
-          PATH = File.absolute_path('#{path}', __dir__)
+          COMMAND = [#{command}].freeze
         end
       end
     end
@@ -220,6 +241,9 @@ module Configuration
            'macos'
          when 'linux'
            'linux'
+         when 'linux-musl'
+           repo = 'https://github.com/dart-musl/dart-sass-embedded'
+           'linux'
          when 'windows'
            'windows'
          else
@@ -285,7 +309,7 @@ module Configuration
     require 'open3'
     require_relative 'embedded'
 
-    stdout, stderr, status = Open3.capture3(Sass::Embedded::Compiler::PATH, '--version')
+    stdout, stderr, status = Open3.capture3(*Sass::Embedded::Compiler::COMMAND, '--version')
 
     raise stderr unless status.success?
 

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass-embedded": "1.57.1"
+    "sass-embedded": "1.58.0"
   }
 }

data/lib/sass/embedded/compiler.rb

@@ -9,7 +9,7 @@ module Sass
     # It runs the `dart-sass-embedded` process.
     class Compiler
       def initialize
-        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(PATH, chdir: __dir__)
+        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(*COMMAND, chdir: __dir__)
         @stdin.binmode
         @stdout.binmode
         @stdin_mutex = Mutex.new

data/lib/sass/embedded/dispatcher.rb

@@ -44,7 +44,13 @@ module Sass
         @mutex.synchronize do
           @observers.delete(id)
 
-          close if @id == PROTOCOL_ERROR_ID && @observers.empty?
+          return unless @observers.empty?
+
+          if @id == PROTOCOL_ERROR_ID
+            close
+          else
+            @id = 0
+          end
         end
       end
 
@@ -57,7 +63,8 @@ module Sass
       end
 
       def send_message(**kwargs)
-        @compiler.write(EmbeddedProtocol::InboundMessage.new(**kwargs).to_proto)
+        inbound_message = EmbeddedProtocol::InboundMessage.new(**kwargs)
+        @compiler.write(inbound_message.to_proto)
       end
 
       private

data/lib/sass/embedded/host.rb

@@ -32,7 +32,7 @@ module Sass
                           logger:,
                           quiet_deps:,
                           verbose:)
-        await do
+        compile_response = await do
           alert_color = $stderr.tty? if alert_color.nil?
 
           @function_registry = FunctionRegistry.new(functions, alert_color: alert_color)
@@ -62,14 +62,18 @@ module Sass
             verbose: verbose
           ))
         end
+
+        Protofier.from_proto_compile_response(compile_response)
       end
 
       def version_request
-        await do
+        version_response = await do
           send_message(version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
             id: id
           ))
         end
+
+        "sass-embedded\t#{version_response.implementation_version}"
       end
 
       def log_event(message)

data/lib/sass/embedded/varint.rb

@@ -22,7 +22,7 @@ module Sass
       def write(writeable, value)
         bytes = []
         until value < 0x80
-          bytes << (0x80 | (value & 0x7f))
+          bytes << ((value & 0x7f) | 0x80)
           value >>= 7
         end
         bytes << value

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.57.1'
+    VERSION = '1.58.0'
   end
 end

data/lib/sass/embedded.rb

@@ -28,8 +28,13 @@ require_relative 'value'
 # @example
 #   Sass.compile_string('h1 { font-size: 40px; }')
 module Sass
+  @instance = nil
+  @mutex = Mutex.new
+
+  # rubocop:disable Layout/LineLength
   class << self
     # Compiles the Sass file at +path+ to CSS.
+    # @overload compile(path, load_paths: [], charset: true, source_map: false, source_map_include_sources: false, style: :expanded, functions: {}, importers: [], alert_ascii: false, alert_color: nil, logger: nil, quiet_deps: false, verbose: false)
     # @param (see Embedded#compile)
     # @return (see Embedded#compile)
     # @raise (see Embedded#compile)
@@ -39,6 +44,7 @@ module Sass
     end
 
     # Compiles a stylesheet whose contents is +source+ to CSS.
+    # @overload compile_string(source, importer: nil, load_paths: [], syntax: :scss, url: nil, charset: true, source_map: false, source_map_include_sources: false, style: :expanded, functions: {}, importers: [], alert_ascii: false, alert_color: nil, logger: nil, quiet_deps: false, verbose: false)
     # @param (see Embedded#compile_string)
     # @return (see Embedded#compile_string)
     # @raise (see Embedded#compile_string)
@@ -58,17 +64,21 @@ module Sass
     private
 
     def instance
-      if defined? @instance
-        @instance = Embedded.new if @instance.closed?
-      else
+      return @instance if @instance
+
+      @mutex.synchronize do
+        return @instance if @instance
+
         @instance = Embedded.new
         at_exit do
           @instance.close
         end
       end
+
       @instance
     end
   end
+  # rubocop:enable Layout/LineLength
 
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
   # its own communication {Channel} with a dedicated compiler process.
@@ -129,26 +139,24 @@ module Sass
                 verbose: false)
       raise ArgumentError, 'path must be set' if path.nil?
 
-      Protofier.from_proto_compile_response(
-        Host.new(@channel).compile_request(
-          path: path,
-          source: nil,
-          importer: nil,
-          load_paths: load_paths,
-          syntax: nil,
-          url: nil,
-          charset: charset,
-          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
-        )
+      Host.new(@channel).compile_request(
+        path: path,
+        source: nil,
+        importer: nil,
+        load_paths: load_paths,
+        syntax: nil,
+        url: nil,
+        charset: charset,
+        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
 
@@ -205,33 +213,31 @@ module Sass
                        verbose: false)
       raise ArgumentError, 'source must be set' if source.nil?
 
-      Protofier.from_proto_compile_response(
-        Host.new(@channel).compile_request(
-          path: nil,
-          source: source,
-          importer: importer,
-          load_paths: load_paths,
-          syntax: syntax,
-          url: url,
-          charset: charset,
-          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
-        )
+      Host.new(@channel).compile_request(
+        path: nil,
+        source: source,
+        importer: importer,
+        load_paths: load_paths,
+        syntax: syntax,
+        url: url,
+        charset: charset,
+        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
 
     # @return [String] Information about the Sass implementation.
     # @see https://sass-lang.com/documentation/js-api/modules#info
     def info
-      @info ||= "sass-embedded\t#{Host.new(@channel).version_request.implementation_version}"
+      @info ||= Host.new(@channel).version_request
     end
 
     def close

data/lib/sass/value/argument_list.rb

@@ -25,6 +25,13 @@ module Sass
         @keywords_accessed = true
         @keywords
       end
+
+      private
+
+      def initialize_copy(orig)
+        super
+        @id = 0
+      end
     end
   end
 end

data/lib/sass/value/color.rb

@@ -178,21 +178,21 @@ module Sass
         if max == min
           @hue = 0
         elsif max == scaled_red
-          @hue = (60 * (scaled_green - scaled_blue) / delta) % 360
+          @hue = ((scaled_green - scaled_blue) * 60 / delta) % 360
         elsif max == scaled_green
-          @hue = (120 + (60 * (scaled_blue - scaled_red) / delta)) % 360
+          @hue = (((scaled_blue - scaled_red) * 60 / delta) + 120) % 360
         elsif max == scaled_blue
-          @hue = (240 + (60 * (scaled_red - scaled_green) / delta)) % 360
+          @hue = (((scaled_red - scaled_green) * 60 / delta) + 240) % 360
         end
 
-        lightness = @lightness = 50 * (max + min)
+        lightness = @lightness = (max + min) * 50
 
         @saturation = if max == min
                         0
                       elsif lightness < 50
-                        100 * delta / (max + min)
+                        delta * 100 / (max + min)
                       else
-                        100 * delta / (2 - max - min)
+                        delta * 100 / (2 - max - min)
                       end
       end
 

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

@@ -88,12 +88,12 @@ module Sass
             'deg' => Rational(Math::PI, 180),
             'grad' => Rational(Math::PI, 200),
             'rad' => Rational(1),
-            'turn' => Rational(2 * Math::PI)
+            'turn' => Rational(Math::PI * 2)
           },
           'turn' => {
             'deg' => Rational(1, 360),
             'grad' => Rational(1, 400),
-            'rad' => Rational(1, 2 * Math::PI),
+            'rad' => Rational(1, Math::PI * 2),
             'turn' => Rational(1)
           },
 

data/lib/sass/value/number.rb

@@ -253,7 +253,7 @@ module Sass
         self
       end
 
-      protected
+      private
 
       def single_unit?
         numerator_units.length == 1 && denominator_units.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.57.1
+  version: 1.58.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: 1.44.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: 1.44.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.18.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -160,8 +160,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.57.1
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.57.1
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.58.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.58.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!