sass-embedded 1.89.1 → 1.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bbfdf14df5474e72673237541fec4d6d97bc7e32fe09687c5e59a4f46d249c
-  data.tar.gz: 44027eb9283e55ecc09554d3ec92267d633b0a6855cb1e95668660beec02e8da
+  metadata.gz: e00ec9ef4aaf921daad6c5c17469d6bc840fced53dd5aecdc100eb3ebf5fe6eb
+  data.tar.gz: 804488b84ae0a8edfcda048aa8742e2fd27103e7cdbb24f7f0711e66dbccc454
 SHA512:
-  metadata.gz: b4a73c1deeedc225d7ddf7b0dc81759764bbc08d389e5b12d93a87e8703fafaecd6715d2a5791df239d1a595d01a658de85f59853157eb55103f1dd025069247
-  data.tar.gz: aec6c7dd88a53a9677dd86c9e6bf52270f47321f60b08b444d6e67006098c8264fbd20d7df216d7bb82c74b8054c22013fb8eed489c65efe077a77f2fc4da6b6
+  metadata.gz: 9bc263de73dccc9732a7d9bfbca69112e5a0aab716eda4a69ce845f1b7e6ab4aa5ff563cb7caa60141e5ee1df69dec9ea4800b4a2ca11ce6b3e74fa87b0ef5ec
+  data.tar.gz: 7b7f06c15ebd95bc772f6ded3bf96f8b67d9e41af2d9830a11e143b5ba191f1e0f62ea7bb82621726c928768258becafb724496401731a3e46a497457d6937cf

data/ext/sass/Rakefile

@@ -288,64 +288,14 @@ end
 # This is a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
 module FileUtils
-  # PowerShell quirks:
-  # - `powershell -Command -`:
-  #     Arguments must be part of command, thus cannot pass arguments safely without escaping.
-  # - `powershell -Command <script-block> [-args <arg-array>]`:
-  #     This only works when invoking powershell subshell in powershell.
-  # - `powershell -Command <string> [<CommandParameters>]`:
-  #     CommandParameters are joined with command and then parsed, thus cannot pass arguments safely without escaping.
-  # - `powershell -File -`:
-  #     Arguments must be part of file, thus cannot pass arguments safely without escaping.
-  # - `powershell -File <filePath> <args>`:
-  #     This is the only way to pass arguments safely without escaping.
-  def powershell(file, *args)
-    sh 'powershell', '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', file, *args
-  end
-
-  def junzip(archive, dest = '.')
-    require 'java'
-
-    Rake.rake_output_message "Archive:  #{archive}" if Rake::FileUtilsExt.verbose_flag
-
-    current_directory = java.nio.file.Paths.get(org.jruby.Ruby.getGlobalRuntime.getCurrentDirectory)
-    zip_file = java.util.zip.ZipFile.new(current_directory.resolve(archive).toFile)
-    dest_path = current_directory.resolve(dest).normalize
-    entries = zip_file.entries
-    while entries.hasMoreElements
-      entry = entries.nextElement
-      name = entry.getName
-      path = dest_path.resolve(name).normalize
-      raise SecurityError unless path.startsWith(dest_path)
-
-      Rake.rake_output_message "  inflating: #{name}" if Rake::FileUtilsExt.verbose_flag
-
-      if entry.isDirectory
-        java.nio.file.Files.createDirectories(path)
-      else
-        java.nio.file.Files.createDirectories(path.getParent)
-        java.nio.file.Files.copy(zip_file.getInputStream(entry), path)
-      end
-    end
-  ensure
-    zip_file&.close
-  end
-
   def unarchive(archive, dest = '.')
-    case archive.downcase
-    when ->(name) { name.include?('.tar.') || name.end_with?('.tar') }
-      mkdir_p dest
-      sh 'tar', '-vxC', dest, '-f', archive, '--no-same-owner', '--no-same-permissions'
-    when ->(name) { name.end_with?('.zip') }
-      if RUBY_PLATFORM == 'java'
-        junzip archive, dest
-      elsif Gem.win_platform?
-        powershell 'expand-archive.ps1', '-Force', '-LiteralPath', archive, '-DestinationPath', dest
-      else
-        sh 'unzip', '-od', dest, archive
-      end
+    mkdir_p dest
+    if Gem.win_platform?
+      sh File.absolute_path('tar.exe', SassConfig.windows_get_folder_path(:System)), '-vxC', dest, '-f', archive
+    elsif archive.downcase.end_with?('.zip')
+      sh 'unzip', '-od', dest, archive
     else
-      raise ArgumentError, "Unknown archive format #{archive}"
+      sh 'tar', '-vxC', dest, '-f', archive, '--no-same-owner', '--no-same-permissions'
     end
   end
 
@@ -743,4 +693,19 @@ module SassConfig
       platform
     end
   end
+
+  def windows_get_folder_path(folder)
+    require 'open3'
+
+    stdout, stderr, status = Open3.capture3('powershell.exe',
+                                            '-NoLogo',
+                                            '-NoProfile',
+                                            '-NonInteractive',
+                                            '-Command',
+                                            "[Environment]::GetFolderPath('#{folder}') | Write-Host -NoNewline")
+
+    raise stderr unless status.success?
+
+    File.absolute_path(stdout)
+  end
 end

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.89.1"
+    "sass": "1.90.0"
   }
 }

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.89.1'
+    VERSION = '1.90.0'
   end
 end

data/lib/sass/value/color/gamut_map_method/local_minde.rb

@@ -28,7 +28,7 @@ module Sass
             hue = original_oklch.send(:channel2_or_nil)
             alpha = original_oklch.send(:alpha_or_nil)
 
-            if FuzzyMath.greater_than_or_equals(lightness.nil? ? 0 : lightness, 1)
+            if FuzzyMath.greater_than_or_equals?(lightness.nil? ? 0 : lightness, 1)
               if color.legacy?
                 return Color.send(:_for_space,
                                   Space::RGB, 255, 255, 255, color.send(:alpha_or_nil))
@@ -37,7 +37,7 @@ module Sass
                 return Color.send(:for_space_internal,
                                   color.send(:_space), 1, 1, 1, color.send(:alpha_or_nil))
               end
-            elsif FuzzyMath.less_than_or_equals(lightness.nil? ? 0 : lightness, 0)
+            elsif FuzzyMath.less_than_or_equals?(lightness.nil? ? 0 : lightness, 0)
               return Color.send(:_for_space,
                                 Space::RGB, 0, 0, 0, color.send(:alpha_or_nil))
                           .send(:_to_space, color.send(:_space))

data/lib/sass/value/color/space/lab.rb

@@ -24,7 +24,7 @@ module Sass
                       missing_chroma: false, missing_hue: false)
             case dest
             when LAB
-              powerless_ab = lightness.nil? || FuzzyMath.equals(lightness, 0)
+              powerless_ab = lightness.nil? || FuzzyMath.equals?(lightness, 0)
               Color.send(
                 :_for_space,
                 dest,

data/lib/sass/value/color/space/srgb.rb

@@ -55,7 +55,7 @@ module Sass
                 Color.send(
                   :for_space_internal,
                   dest,
-                  missing_hue || FuzzyMath.equals(saturation, 0) ? nil : hue % 360,
+                  missing_hue || FuzzyMath.equals?(saturation, 0) ? nil : hue % 360,
                   missing_chroma ? nil : saturation,
                   missing_lightness ? nil : lightness * 100,
                   alpha
@@ -67,7 +67,7 @@ module Sass
                 Color.send(
                   :for_space_internal,
                   dest,
-                  missing_hue || FuzzyMath.greater_than_or_equals(whiteness + blackness, 100) ? nil : hue % 360,
+                  missing_hue || FuzzyMath.greater_than_or_equals?(whiteness + blackness, 100) ? nil : hue % 360,
                   whiteness,
                   blackness,
                   alpha

data/lib/sass/value/color/space/utils.rb

@@ -62,7 +62,7 @@ module Sass
           def lab_to_lch(dest, lightness, a, b, alpha, # rubocop:disable Naming/MethodParameterName
                          missing_chroma: false, missing_hue: false)
             chroma = Math.sqrt(((a.nil? ? 0 : a)**2) + ((b.nil? ? 0 : b)**2))
-            hue = if missing_hue || FuzzyMath.equals(chroma, 0)
+            hue = if missing_hue || FuzzyMath.equals?(chroma, 0)
                     nil
                   else
                     Math.atan2(b.nil? ? 0 : b, a.nil? ? 0 : a) * 180 / Math::PI

data/lib/sass/value/color.rb

@@ -318,21 +318,21 @@ module Sass
 
         if legacy?
           return false unless other.legacy?
-          return false unless FuzzyMath.equals_nilable(other.alpha_or_nil, alpha_or_nil)
+          return false unless FuzzyMath.equals_nilable?(other.alpha_or_nil, alpha_or_nil)
 
           if _space == other._space
-            FuzzyMath.equals_nilable(other.channel0_or_nil, channel0_or_nil) &&
-              FuzzyMath.equals_nilable(other.channel1_or_nil, channel1_or_nil) &&
-              FuzzyMath.equals_nilable(other.channel2_or_nil, channel2_or_nil)
+            FuzzyMath.equals_nilable?(other.channel0_or_nil, channel0_or_nil) &&
+              FuzzyMath.equals_nilable?(other.channel1_or_nil, channel1_or_nil) &&
+              FuzzyMath.equals_nilable?(other.channel2_or_nil, channel2_or_nil)
           else
             _to_space(Space::RGB) == other._to_space(Space::RGB)
           end
         else
           other._space == _space &&
-            FuzzyMath.equals_nilable(other.channel0_or_nil, channel0_or_nil) &&
-            FuzzyMath.equals_nilable(other.channel1_or_nil, channel1_or_nil) &&
-            FuzzyMath.equals_nilable(other.channel2_or_nil, channel2_or_nil) &&
-            FuzzyMath.equals_nilable(other.alpha_or_nil, alpha_or_nil)
+            FuzzyMath.equals_nilable?(other.channel0_or_nil, channel0_or_nil) &&
+            FuzzyMath.equals_nilable?(other.channel1_or_nil, channel1_or_nil) &&
+            FuzzyMath.equals_nilable?(other.channel2_or_nil, channel2_or_nil) &&
+            FuzzyMath.equals_nilable?(other.alpha_or_nil, alpha_or_nil)
         end
       end
 
@@ -367,9 +367,9 @@ module Sass
       def channel0_powerless?
         case _space
         when Space::HSL
-          FuzzyMath.equals(channel1, 0)
+          FuzzyMath.equals?(channel1, 0)
         when Space::HWB
-          FuzzyMath.greater_than_or_equals(channel1 + channel2, 100)
+          FuzzyMath.greater_than_or_equals?(channel1 + channel2, 100)
         else
           false
         end
@@ -398,7 +398,7 @@ module Sass
       def channel2_powerless?
         case _space
         when Space::LCH, Space::OKLCH
-          FuzzyMath.equals(channel1, 0)
+          FuzzyMath.equals?(channel1, 0)
         else
           false
         end
@@ -421,9 +421,9 @@ module Sass
       def _in_gamut?
         return true unless _space.bounded?
 
-        _is_channel_in_gamut(channel0, _space.channels[0]) &&
-          _is_channel_in_gamut(channel1, _space.channels[1]) &&
-          _is_channel_in_gamut(channel2, _space.channels[2])
+        _is_channel_in_gamut?(channel0, _space.channels[0]) &&
+          _is_channel_in_gamut?(channel1, _space.channels[1]) &&
+          _is_channel_in_gamut?(channel2, _space.channels[2])
       end
 
       def _to_gamut(method)
@@ -449,7 +449,7 @@ module Sass
         when Space::HSL
           _initialize_for_space(
             space,
-            _normalize_hue(channel0, invert: !channel1.nil? && FuzzyMath.less_than(channel1, 0)),
+            _normalize_hue(channel0, invert: !channel1.nil? && FuzzyMath.less_than?(channel1, 0)),
             channel1&.abs,
             channel2,
             alpha
@@ -461,7 +461,7 @@ module Sass
             space,
             channel0,
             channel1&.abs,
-            _normalize_hue(channel2, invert: !channel1.nil? && FuzzyMath.less_than(channel1, 0)),
+            _normalize_hue(channel2, invert: !channel1.nil? && FuzzyMath.less_than?(channel1, 0)),
             alpha
           )
         else
@@ -485,10 +485,10 @@ module Sass
         ((hue % 360) + 360 + (invert ? 180 : 0)) % 360
       end
 
-      def _is_channel_in_gamut(value, channel)
+      def _is_channel_in_gamut?(value, channel)
         case channel
         when LinearChannel
-          FuzzyMath.less_than_or_equals(value, channel.max) && FuzzyMath.greater_than_or_equals(value, channel.min)
+          FuzzyMath.less_than_or_equals?(value, channel.max) && FuzzyMath.greater_than_or_equals?(value, channel.min)
         else
           true
         end
@@ -500,8 +500,8 @@ module Sass
           raise Sass::ScriptError.new("Expected #{wieght} to be within 0 and 1.", 'weight')
         end
 
-        return other if FuzzyMath.equals(weight, 0)
-        return self if FuzzyMath.equals(weight, 1)
+        return other if FuzzyMath.equals?(weight, 0)
+        return self if FuzzyMath.equals?(weight, 1)
 
         color1 = _to_space(method.space)
         color2 = other._to_space(method.space)

data/lib/sass/value/fuzzy_math.rb

@@ -12,7 +12,7 @@ module Sass
 
       module_function
 
-      def equals(number1, number2)
+      def equals?(number1, number2)
         return true if number1 == number2
 
         (number1 - number2).abs <= EPSILON &&
@@ -20,7 +20,7 @@ module Sass
             (number2 * INVERSE_EPSILON).round
       end
 
-      def equals_nilable(number1, number2)
+      def equals_nilable?(number1, number2)
         return true if number1 == number2
         return false if number1.nil? || number2.nil?
 
@@ -29,26 +29,26 @@ module Sass
             (number2 * INVERSE_EPSILON).round
       end
 
-      def less_than(number1, number2)
-        number1 < number2 && !equals(number1, number2)
+      def less_than?(number1, number2)
+        number1 < number2 && !equals?(number1, number2)
       end
 
-      def less_than_or_equals(number1, number2)
-        number1 < number2 || equals(number1, number2)
+      def less_than_or_equals?(number1, number2)
+        number1 < number2 || equals?(number1, number2)
       end
 
-      def greater_than(number1, number2)
-        number1 > number2 && !equals(number1, number2)
+      def greater_than?(number1, number2)
+        number1 > number2 && !equals?(number1, number2)
       end
 
-      def greater_than_or_equals(number1, number2)
-        number1 > number2 || equals(number1, number2)
+      def greater_than_or_equals?(number1, number2)
+        number1 > number2 || equals?(number1, number2)
       end
 
       def integer?(number)
         return false unless number.finite?
 
-        equals(number, number.round)
+        equals?(number, number.round)
       end
 
       def to_i(number)
@@ -56,8 +56,8 @@ module Sass
       end
 
       def between(number, min, max)
-        return min if equals(number, min)
-        return max if equals(number, max)
+        return min if equals?(number, min)
+        return max if equals?(number, max)
         return number if number > min && number < max
 
         nil

data/lib/sass/value/null.rb

@@ -31,7 +31,7 @@ module Sass
       end
 
       # @return [::Boolean]
-      def to_bool
+      def to_bool # rubocop:disable Naming/PredicateMethod
         false
       end
 

data/lib/sass/value/number.rb

@@ -80,14 +80,14 @@ module Sass
         return false if numerator_units.length != other.numerator_units.length ||
                         denominator_units.length != other.denominator_units.length
 
-        return FuzzyMath.equals(value, other.value) if unitless?
+        return FuzzyMath.equals?(value, other.value) if unitless?
 
         if Unit.canonicalize_units(numerator_units) != Unit.canonicalize_units(other.numerator_units) &&
            Unit.canonicalize_units(denominator_units) != Unit.canonicalize_units(other.denominator_units)
           return false
         end
 
-        FuzzyMath.equals(
+        FuzzyMath.equals?(
           value *
           Unit.canonical_multiplier(numerator_units) /
           Unit.canonical_multiplier(denominator_units),
@@ -306,7 +306,7 @@ module Sass
 
           unit_length = new_numerator_units.length + new_denominator_units.length
           units = unit_string(new_numerator_units, new_denominator_units)
-          Sass::ScriptError.new("Expected #{self} to have unit#{unit_length > 1 ? 's' : ''} #{units}", name)
+          Sass::ScriptError.new("Expected #{self} to have unit#{'s' if unit_length > 1} #{units}", name)
         }
 
         result = value

data/lib/sass/value.rb

@@ -38,7 +38,7 @@ module Sass
     end
 
     # @return [::Boolean]
-    def to_bool
+    def to_bool # rubocop:disable Naming/PredicateMethod
       true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.89.1
+  version: 1.90.0
 platform: ruby
 authors:
 - なつき
@@ -52,7 +52,6 @@ files:
 - exe/sass
 - ext/sass/Rakefile
 - ext/sass/embedded_sass_pb.rb
-- ext/sass/expand-archive.ps1
 - ext/sass/package.json
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
@@ -124,8 +123,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.89.1
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.89.1
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.90.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.90.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -142,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []

data/ext/sass/expand-archive.ps1

@@ -1 +0,0 @@
-Expand-Archive @args