sass-embedded 1.57.1-arm64-darwin → 1.58.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86d98787cec3e53533b3726fab6ffd26fb080f7cf2e79e78ae9c5c05b240c30
-  data.tar.gz: cfba9964b964b5d46d74e935760ce589eade05f6142648d6c5997d6b50b7ed50
+  metadata.gz: f36781344863e3fe00ba6a4f976b0f1340eb92957df1b3071ca8017f1643dc75
+  data.tar.gz: 4d14ada11b653af947a7cb46716f1449d035d0663d6d5efd42220131733031bb
 SHA512:
-  metadata.gz: fd0a0e8de87900900fb13edb3ef8ed2680a1a1703e38985b3c96950ab67816a80fade1af79bb3521e4bd06210d2e0a47d094fe5b4c3874cb4dfa0451d2029b67
-  data.tar.gz: a7f40fa2839a042aa95da45ade6a1e880fc493dbd91600830769590c2c89cbb2bdb3f83b499e2f2f0c58a34899475e5165c853b3a375da99a0de595940101b1b
+  metadata.gz: 11006f2b3b8d2424cbc0c10fd39acaf31d1caf440ab0e0c6e96737611928ffd160de7d026a81f15c08147aa1efff63ae510b254f3e172d63ed655893caad91bd
+  data.tar.gz: b7451ba4529945426c1eb005bac3c7dccc9fecb29ff66696b527d1be0481a3107653eb7cb67dd48efbd4d0a439351d7662f7e9d1b8e1eaaea7e90506c253025b

data/ext/sass/embedded.rb

@@ -3,7 +3,10 @@
 module Sass
   class Embedded
     class Compiler
-      PATH = File.absolute_path('sass_embedded/dart-sass-embedded', __dir__)
+      COMMAND = [
+        File.absolute_path('sass_embedded/src/dart', __dir__),
+        File.absolute_path('sass_embedded/src/dart-sass-embedded.snapshot', __dir__)
+      ].freeze
     end
   end
 end

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: arm64-darwin
 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:
@@ -161,8 +161,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: []
@@ -179,7 +179,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!