sass-embedded 1.57.1-aarch64-linux-gnu → 1.58.0-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb14accd4fb99a3920fe2bfb92e83612dd485f935e910f16b7a7d7392a3c957
-  data.tar.gz: 9c7f95b7ba15c2c73037ae22fe4f298e7c42c4be08e8a2e0c1de1732618440d2
+  metadata.gz: 44b8cea5c246c98df6e534d7019e1571fe35241e5fa8f858fed01600f8d45d67
+  data.tar.gz: b6a049243ac6e86ab5dab60e62870dd5166e723ebcfdc70c5c05add0b5957c3c
 SHA512:
-  metadata.gz: 1efd6e00cda31ef4abe7a0ae6edd9fa0c59c6ff7d36ffecc1b3024d1e73464945862f6fb3ab7e9f477ba67f7c68b0b96753591c16c4a62e9f7efe9be09bdc48b
-  data.tar.gz: 9b748888ea03a2de5e3232327384b415619789fb94bcbbd89ac5976b96ea0cb05bb038fb1e296fab09f9f274c40986c71b3f328f3466ad0c52a973906fa0d913
+  metadata.gz: 6661139f20dc8065d4ab0662c869f0729be79b840a36ec3a2b4bd6f183b057028c59770ff30bf0c9cb69795838731a613ce1dc54163c1de1786a04613e5d0605
+  data.tar.gz: cddaf128574da891a91316355462a55613f5ad78f8796e0886c4274f4e1ebd11324be6dee5294c3af3dfaba851f4a53ac9f3b5630405bf671b04cffe18b8468e

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: aarch64-linux-gnu
 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:
@@ -122,6 +122,8 @@ files:
 - ext/sass/embedded_sass_pb.rb
 - ext/sass/sass_embedded/dart-sass-embedded
 - ext/sass/sass_embedded/src/LICENSE
+- ext/sass/sass_embedded/src/dart
+- ext/sass/sass_embedded/src/dart-sass-embedded.snapshot
 - lib/sass-embedded.rb
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
@@ -159,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: []
@@ -177,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!