sass-embedded 1.102.0-aarch64-linux-gnu → 1.103.0-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd98e8aad7fe8d369c41c8dc8acd71dfd422e3a721fde6eedaf7cd23a752beb9
-  data.tar.gz: bc780e7db83f62e46f339dd512c507c372eba11c4ce857aa8eb66de9138fc414
+  metadata.gz: 726b7dcc7b8644e402ba4f87b5ea77df4acd00330b39dbabc50cbdee793d2a1d
+  data.tar.gz: f88160a6b017fdd0677584d86b131508a1fef9151ade3e4374d75424929371fc
 SHA512:
-  metadata.gz: bb2ac9d4496427a88802bb60f8644f8fc3b771c03a49c23e44bb5a7df16073fe20162fc6a33cde9eb65eef3fff9c8a5fa53eedc9c731583259faa03afa197581
-  data.tar.gz: 30a891ec57cd22ed2225c5418abd894612a092f54c77589a28256cf1091aaa8d8bade15afbd158719527deb238ca848684e4893c9db693ad51e366b7a361ec13
+  metadata.gz: c65d8aa1b9c497c195307ab602dbe94a62dd0b33fdabfc067f2307078de30698b021f1c4d9f41e38faf9f52baccbdb97ccf6d8f56056291015c6049c35538de6
+  data.tar.gz: 6e9298dbd552e740c44f2deae7068fd7432a1d2128ee768a6877c5f4590b26303e07cde1e28de2466d5110d84e1f22d067732af63862a06af2c3db079d0d3826

data/lib/sass/compiler/session/function_registry.rb

@@ -71,11 +71,7 @@ module Sass
           @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
             id: function_call_request.id,
-            error: if e.respond_to?(:detailed_message)
-                     e.detailed_message(highlight: false)
-                   else # TODO: remove once ruby 3.1 support is dropped
-                     "#{e.message} (#{e.class.name})"
-                   end
+            error: e.detailed_message(highlight: false)
           )
         end
 

data/lib/sass/compiler/session/importer_registry.rb

@@ -82,11 +82,7 @@ module Sass
           @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            error: if e.respond_to?(:detailed_message)
-                     e.detailed_message(highlight: false)
-                   else # TODO: remove once ruby 3.1 support is dropped
-                     "#{e.message} (#{e.class.name})"
-                   end
+            error: e.detailed_message(highlight: false)
           )
         end
 
@@ -111,11 +107,7 @@ module Sass
           @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
-            error: if e.respond_to?(:detailed_message)
-                     e.detailed_message(highlight: false)
-                   else # TODO: remove once ruby 3.1 support is dropped
-                     "#{e.message} (#{e.class.name})"
-                   end
+            error: e.detailed_message(highlight: false)
           )
         end
 
@@ -134,11 +126,7 @@ module Sass
           @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            error: if e.respond_to?(:detailed_message)
-                     e.detailed_message(highlight: false)
-                   else # TODO: remove once ruby 3.1 support is dropped
-                     "#{e.message} (#{e.class.name})"
-                   end
+            error: e.detailed_message(highlight: false)
           )
         end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.102.0'
+    VERSION = '1.103.0'
   end
 end

data/lib/sass/exception.rb

@@ -12,78 +12,25 @@ module Sass
     # @return [Array<String>]
     attr_reader :loaded_urls
 
-    if Exception.public_method_defined?(:detailed_message, false)
-      # @!visibility private
-      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
-        super(message)
-
-        @detailed_message = detailed_message
-        @sass_stack = sass_stack
-        @span = span
-        @loaded_urls = loaded_urls
-      end
-
-      # @!visibility private
-      def detailed_message(highlight: nil, **)
-        return super if @detailed_message.nil?
-
-        highlight = Exception.to_tty? if highlight.nil?
-
-        detailed_message = @detailed_message.sub(message, super)
-        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
-        detailed_message
-      end
-    else # TODO: remove once ruby 3.1 support is dropped
-      # @!visibility private
-      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
-        super(detailed_message.nil? ? message : detailed_message)
-
-        @message = message
-        @detailed_message = detailed_message
-        @sass_stack = sass_stack
-        @span = span
-        @loaded_urls = loaded_urls
-      end
-
-      # @!visibility private
-      def message
-        return @message if @detailed_message.nil? || @full_message.nil?
-
-        @detailed_message
-      end
-
-      # @!visibility private
-      def detailed_message(highlight: nil, **)
-        highlight = Exception.to_tty? if highlight.nil?
-
-        super_ = if highlight
-                   lines = message.split("\n")
-                   lines[0] += " (\e[1;4m#{self.class.name}\e[m\e[1m)" unless lines.empty?
-                   lines.map { |line| "\e[1m#{line}\e[m" }.join("\n")
-                 else
-                   lines = message.split("\n", 2)
-                   lines[0] += " (#{self.class.name})" unless lines.empty?
-                   lines.join("\n")
-                 end
+    # @!visibility private
+    def initialize(message, detailed_message, sass_stack, span, loaded_urls)
+      super(message)
 
-        return super_ if @detailed_message.nil?
+      @detailed_message = detailed_message
+      @sass_stack = sass_stack
+      @span = span
+      @loaded_urls = loaded_urls
+    end
 
-        detailed_message = @detailed_message.sub(message, super_)
-        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
-        detailed_message
-      end
+    # @!visibility private
+    def detailed_message(highlight: nil, **)
+      return super if @detailed_message.nil?
 
-      # @!visibility private
-      def full_message(highlight: nil, order: :top, **)
-        highlight = Exception.to_tty? if highlight.nil?
+      highlight = Exception.to_tty? if highlight.nil?
 
-        @full_message = true
-        full_message = super.force_encoding(message.encoding)
-        full_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
-        full_message
-      ensure
-        @full_message = nil
-      end
+      detailed_message = @detailed_message.sub(message, super)
+      detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+      detailed_message
     end
 
     # @return [String]

data/lib/sass/fork_tracker.rb

@@ -8,9 +8,6 @@ module Sass
     module_function
 
     if Process.respond_to?(:_fork)
-      # TODO: remove next line once ruby 3.1 support is dropped
-      require 'set' unless defined?(::Set)
-
       SET = Set.new.compare_by_identity
 
       MUTEX = Mutex.new

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

@@ -29,6 +29,30 @@ module Sass
           end
 
           def convert(dest, hue, whiteness, blackness, alpha)
+            if whiteness.nil? && blackness.nil?
+              return Color.send(:_for_space, dest, nil, nil, nil, alpha) if hue.nil?
+
+              converted = convert(dest, hue, 0, 0, alpha)
+              return case dest
+                     when HSL
+                       Color.send(:_for_space,
+                                  dest,
+                                  converted.channel0,
+                                  nil,
+                                  nil,
+                                  converted.alpha)
+                     when LCH, OKLCH
+                       Color.send(:_for_space,
+                                  dest,
+                                  nil,
+                                  nil,
+                                  converted.channel2,
+                                  converted.alpha)
+                     else
+                       converted
+                     end
+            end
+
             missing_hue = hue.nil?
 
             hue = ((hue.nil? ? 0 : hue) % 360) / 30.0

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

@@ -22,6 +22,14 @@ module Sass
 
           def convert(dest, lightness, a, b, alpha, # rubocop:disable Naming/MethodParameterName
                       missing_chroma: false, missing_hue: false)
+            if missing_chroma && missing_hue
+              a = nil
+              b = nil
+            elsif a.nil? && b.nil?
+              missing_chroma = true
+              missing_hue = true
+            end
+
             case dest
             when LAB
               powerless_ab = lightness.nil? || FuzzyMath.equals?(lightness, 0)

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

@@ -26,6 +26,23 @@ module Sass
                       missing_hue: false,
                       missing_a: false,
                       missing_b: false)
+            if missing_a && missing_b
+              missing_chroma = true
+              missing_hue = true
+            elsif missing_chroma && missing_hue
+              missing_a = true
+              missing_b = true
+            end
+
+            if (missing_lightness && missing_chroma && missing_hue) || (long.nil? && medium.nil? && short.nil?)
+              return Color.send(:_for_space,
+                                dest,
+                                nil,
+                                nil,
+                                nil,
+                                alpha)
+            end
+
             case dest
             when OKLAB
               long_scaled = Math.cbrt(long.nil? ? 0 : long)

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

@@ -23,37 +23,42 @@ module Sass
 
           def convert(dest, lightness, a, b, alpha, # rubocop:disable Naming/MethodParameterName
                       missing_chroma: false, missing_hue: false)
-            case dest
-            when OKLCH
-              Utils.lab_to_lch(dest, lightness, a, b, alpha)
-            else
-              missing_lightness = lightness.nil?
-              missing_a = a.nil?
-              missing_b = b.nil?
+            return Utils.lab_to_lch(dest, lightness, a, b, alpha, missing_chroma:, missing_hue:) if dest == OKLCH
 
-              lightness = 0 if missing_lightness
-              a = 0 if missing_a
-              b = 0 if missing_b
-
-              LMS.convert(
-                dest,
-                ((Conversions::OKLAB_TO_LMS[0] * lightness) +
-                 (Conversions::OKLAB_TO_LMS[1] * a) +
-                 (Conversions::OKLAB_TO_LMS[2] * b))**3,
-                ((Conversions::OKLAB_TO_LMS[3] * lightness) +
-                 (Conversions::OKLAB_TO_LMS[4] * a) +
-                 (Conversions::OKLAB_TO_LMS[5] * b))**3,
-                ((Conversions::OKLAB_TO_LMS[6] * lightness) +
-                 (Conversions::OKLAB_TO_LMS[7] * a) +
-                 (Conversions::OKLAB_TO_LMS[8] * b))**3,
-                alpha,
-                missing_lightness:,
-                missing_chroma:,
-                missing_hue:,
-                missing_a:,
-                missing_b:
-              )
+            if a.nil? && b.nil?
+              missing_chroma = true
+              missing_hue = true
+            elsif missing_chroma && missing_hue
+              a = nil
+              b = nil
             end
+
+            missing_lightness = lightness.nil?
+            missing_a = a.nil?
+            missing_b = b.nil?
+
+            lightness = 0 if missing_lightness
+            a = 0 if missing_a
+            b = 0 if missing_b
+
+            LMS.convert(
+              dest,
+              ((Conversions::OKLAB_TO_LMS[0] * lightness) +
+               (Conversions::OKLAB_TO_LMS[1] * a) +
+               (Conversions::OKLAB_TO_LMS[2] * b))**3,
+              ((Conversions::OKLAB_TO_LMS[3] * lightness) +
+               (Conversions::OKLAB_TO_LMS[4] * a) +
+               (Conversions::OKLAB_TO_LMS[5] * b))**3,
+              ((Conversions::OKLAB_TO_LMS[6] * lightness) +
+               (Conversions::OKLAB_TO_LMS[7] * a) +
+               (Conversions::OKLAB_TO_LMS[8] * b))**3,
+              alpha,
+              missing_lightness:,
+              missing_chroma:,
+              missing_hue:,
+              missing_a:,
+              missing_b:
+            )
           end
         end
 

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

@@ -20,6 +20,11 @@ module Sass
                       missing_lightness: false,
                       missing_chroma: false,
                       missing_hue: false)
+            if (red.nil? && green.nil? && blue.nil?) ||
+               (missing_lightness && missing_chroma && missing_hue)
+              return Color.send(:for_space, dest, nil, nil, nil, alpha)
+            end
+
             case dest
             when HSL, HWB
               red = 0 if red.nil?
@@ -68,8 +73,8 @@ module Sass
                   :for_space_internal,
                   dest,
                   missing_hue || FuzzyMath.greater_than_or_equals?(whiteness + blackness, 100) ? nil : hue % 360,
-                  whiteness,
-                  blackness,
+                  missing_chroma && missing_lightness ? nil : whiteness,
+                  missing_chroma && missing_lightness ? nil : blackness,
                   alpha
                 )
               end

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

@@ -61,6 +61,9 @@ module Sass
           # @return [Color]
           def lab_to_lch(dest, lightness, a, b, alpha, # rubocop:disable Naming/MethodParameterName
                          missing_chroma: false, missing_hue: false)
+            missing_chroma ||= a.nil? && b.nil?
+            missing_hue ||= a.nil? && b.nil?
+
             chroma = Math.sqrt(((a.nil? ? 0 : a)**2) + ((b.nil? ? 0 : b)**2))
             hue = if missing_hue || FuzzyMath.equals?(chroma, 0)
                     nil

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

@@ -22,6 +22,19 @@ module Sass
                       missing_hue: false,
                       missing_a: false,
                       missing_b: false)
+            if missing_a && missing_b
+              missing_chroma = true
+              missing_hue = true
+            elsif missing_chroma && missing_hue
+              missing_a = true
+              missing_b = true
+            end
+
+            if (missing_lightness && missing_chroma && missing_hue) ||
+               (x.nil? && y.nil? && z.nil?)
+              return Color.send(:_for_space, dest, nil, nil, nil, alpha)
+            end
+
             case dest
             when LAB, LCH
               f0 = _convert_component_to_lab_f((x.nil? ? 0 : x) / Conversions::D50[0])

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

@@ -95,6 +95,23 @@ module Sass
                            missing_hue: false,
                            missing_a: false,
                            missing_b: false)
+          if missing_a && missing_b
+            missing_chroma = true
+            missing_hue = true
+          elsif missing_chroma && missing_hue
+            missing_a = true
+            missing_b = true
+          end
+
+          if (missing_lightness && missing_chroma && missing_hue) || (red.nil? && green.nil? && blue.nil?)
+            return Color.send(:_for_space,
+                              dest,
+                              nil,
+                              nil,
+                              nil,
+                              alpha)
+          end
+
           linear_dest = case dest
                         when HSL, HWB
                           SRGB

data/lib/sass/value/color.rb

@@ -508,37 +508,31 @@ module Sass
         color1 = _to_space(method.space)
         color2 = other._to_space(method.space)
 
-        c1_missing0 = _analogous_channel_missing?(self, color1, 0)
-        c1_missing1 = _analogous_channel_missing?(self, color1, 1)
-        c1_missing2 = _analogous_channel_missing?(self, color1, 2)
-        c2_missing0 = _analogous_channel_missing?(other, color2, 0)
-        c2_missing1 = _analogous_channel_missing?(other, color2, 1)
-        c2_missing2 = _analogous_channel_missing?(other, color2, 2)
-        c1_channel0 = (c1_missing0 ? color2 : color1).channel0
-        c1_channel1 = (c1_missing1 ? color2 : color1).channel1
-        c1_channel2 = (c1_missing2 ? color2 : color1).channel2
-        c2_channel0 = (c2_missing0 ? color1 : color2).channel0
-        c2_channel1 = (c2_missing1 ? color1 : color2).channel1
-        c2_channel2 = (c2_missing2 ? color1 : color2).channel2
+        c1_channel0 = color1.channel0_or_nil.nil? ? color2.channel0_or_nil : color1.channel0_or_nil
+        c1_channel1 = color1.channel1_or_nil.nil? ? color2.channel1_or_nil : color1.channel1_or_nil
+        c1_channel2 = color1.channel2_or_nil.nil? ? color2.channel2_or_nil : color1.channel2_or_nil
+        c2_channel0 = color2.channel0_or_nil.nil? ? color1.channel0_or_nil : color2.channel0_or_nil
+        c2_channel1 = color2.channel1_or_nil.nil? ? color1.channel1_or_nil : color2.channel1_or_nil
+        c2_channel2 = color2.channel2_or_nil.nil? ? color1.channel2_or_nil : color2.channel2_or_nil
         c1_alpha = alpha_or_nil.nil? ? other.alpha : alpha_or_nil
         c2_alpha = other.alpha_or_nil.nil? ? alpha : other.alpha_or_nil
 
         c1_multiplier = (alpha_or_nil.nil? ? 1 : alpha_or_nil) * weight
         c2_multiplier = (other.alpha_or_nil.nil? ? 1 : other.alpha_or_nil) * (1 - weight)
         mixed_alpha = alpha_missing? && other.alpha_missing? ? nil : (c1_alpha * weight) + (c2_alpha * (1 - weight))
-        mixed0 = if c1_missing0 && c2_missing0
+        mixed0 = if c1_channel0.nil?
                    nil
                  else
                    ((c1_channel0 * c1_multiplier) + (c2_channel0 * c2_multiplier)) /
                      (mixed_alpha.nil? ? 1 : mixed_alpha)
                  end
-        mixed1 = if c1_missing1 && c2_missing1
+        mixed1 = if c1_channel1.nil?
                    nil
                  else
                    ((c1_channel1 * c1_multiplier) + (c2_channel1 * c2_multiplier)) /
                      (mixed_alpha.nil? ? 1 : mixed_alpha)
                  end
-        mixed2 = if c1_missing2 && c2_missing2
+        mixed2 = if c1_channel2.nil?
                    nil
                  else
                    ((c1_channel2 * c1_multiplier) + (c2_channel2 * c2_multiplier)) /
@@ -549,7 +543,7 @@ module Sass
         when Space::HSL, Space::HWB
           Color.send(:for_space_internal,
                      method.space,
-                     c1_missing0 && c2_missing0 ? nil : _interpolate_hues(c1_channel0, c2_channel0, method.hue, weight),
+                     c1_channel0.nil? ? nil : _interpolate_hues(c1_channel0, c2_channel0, method.hue, weight),
                      mixed1,
                      mixed2,
                      mixed_alpha)
@@ -558,7 +552,7 @@ module Sass
                      method.space,
                      mixed0,
                      mixed1,
-                     c1_missing2 && c2_missing2 ? nil : _interpolate_hues(c1_channel2, c2_channel2, method.hue, weight),
+                     c1_channel2.nil? ? nil : _interpolate_hues(c1_channel2, c2_channel2, method.hue, weight),
                      mixed_alpha)
         else
           Color.send(:_for_space,
@@ -566,21 +560,6 @@ module Sass
         end._to_space(_space)
       end
 
-      def _analogous_channel_missing?(original, output, output_channel_index)
-        return true if output.channels_or_nil[output_channel_index].nil?
-
-        return false if original.equal?(output)
-
-        output_channel = output._space.channels[output_channel_index]
-        original_channel = original._space.channels.find do |channel|
-          output_channel.analogous?(channel)
-        end
-
-        return false if original_channel.nil?
-
-        original.channel_missing?(original_channel.name)
-      end
-
       def _interpolate_hues(hue1, hue2, method, weight)
         case method
         when :shorter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.102.0
+  version: 1.103.0
 platform: aarch64-linux-gnu
 authors:
 - なつき
@@ -116,8 +116,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.102.0
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.102.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.103.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.103.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []