compass-core-sass37 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748eccd29e4e0f853f2de750f8ba0edcae4237f3dcb79e8d3b3ae03f040ff4cd
-  data.tar.gz: d9bebeaae9d5fb5bb134924dbf372a6f3ad571380bd9f9dfcdc5c5aa937cb57e
+  metadata.gz: 6548a79fd2ab2d4e719c8c963d32f587f0cd367fac1297d4bd544d3398feabec
+  data.tar.gz: 05fefb87bc381284b4e4cc24c194bf81b345a4a83e581418dd729369006efbe3
 SHA512:
-  metadata.gz: af6c275f3879f3f60af79c2e021469909c050d3b3a2132e987da82e278bd2daa851967e1bb9325b37782c6f16a382aceffa5ae512ca572b38524c31949ece4d5
-  data.tar.gz: da00e60ab7f22ddf07ba300fd7453a92c346f41e13d63b763c589d9863fe3ca604063259e77690ed8b2f2fafa62b56be628bb88eacb3e0de1f786b0618838eb6
+  metadata.gz: 973b443d162d545c1febe876f44196daceef6cf3cd537933140c6e0a2dbc41cca41d200280de52fffa16a795a88899382eefe57c8995698efa439df43a09d59e
+  data.tar.gz: efe5f9913680aa983ea75660ec9ef3c76720ae4a4de3e4fdca6e0a845810d805c020858fd75374a6821fc9ad1895906a6952572e45ecf89e33eb314e1918b669

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/compass/core/sass_extensions/functions/gradient_support.rb

@@ -145,14 +145,19 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
   class ColorStop < Sass::Script::Value::Base
     include Sass::Script::Value::Helpers
-    attr_accessor :color, :stop
+    attr_accessor :color, :stop, :stop2
+    # Rightmost stop position (for CSS color hint / double-position syntax).
+    def outer_stop
+      stop2 || stop
+    end
     def children
-      [color, stop].compact
+      [color, stop, stop2].compact
     end
-    def initialize(color, stop = nil)
+    def initialize(color, stop = nil, stop2 = nil)
       assert_legal_color! color
       assert_legal_color_stop! stop if stop
-      self.color, self.stop = color, stop
+      assert_legal_color_stop! stop2 if stop2
+      self.color, self.stop, self.stop2 = color, stop, stop2
     end
     def inspect
       to_s
@@ -212,10 +217,10 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       s = self.class.color_to_s(color)
       if stop
         s << " "
-        if stop.respond_to?(:unitless?) && stop.unitless?
-          s << stop.times(number(100, "%")).inspect
-        else
-          s << stop.to_s
+        s << format_stop_for_css(stop)
+        if stop2
+          s << " "
+          s << format_stop_for_css(stop2)
         end
       end
       s
@@ -224,6 +229,16 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def to_sass(options = nil)
       identifier("color-stop(#{color.to_sass rescue nil}, #{stop.to_sass rescue nil})")
     end
+
+    private
+
+    def format_stop_for_css(stop)
+      if stop.respond_to?(:unitless?) && stop.unitless?
+        stop.times(number(100, "%")).inspect
+      else
+        stop.to_s
+      end
+    end
   end
 
   module Gradient
@@ -427,7 +442,10 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       # I don't know how to support degree-based gradients in old webkit gradients (owg) or svg so we just disable them.
       if %w(owg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Value::Number) && position_or_angle.numerator_units.include?("deg")
         false
-      elsif %w(owg svg).include?(aspect) && color_stops.value.any?{|cs| cs.stop.is_a?(Sass::Script::Value::String) }
+      elsif %w(owg svg).include?(aspect) && color_stops.value.any?{|cs|
+            cs.stop.is_a?(Sass::Script::Value::String) ||
+              (cs.stop2 && cs.stop2.is_a?(Sass::Script::Value::String))
+          }
         # calc expressions cannot be represented in svg or owg
         false
       else
@@ -442,7 +460,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       start_point = grad_point(position_list)
       args = []
       args << start_point
-      args << linear_end_position(position_list, start_point, color_stops.value.last.stop)
+      args << linear_end_position(position_list, start_point, color_stops.value.last.outer_stop)
       args << grad_color_stops(color_stops)
       args.each{|a| a.options = options}
       Sass::Script::String.new("-webkit-gradient(linear, #{args.join(', ')})")
@@ -546,7 +564,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
         elsif Sass::Script::Value::Color === arg
           ColorStop.new(arg)
         elsif Sass::Script::Value::List === arg
-          ColorStop.new(*arg.value)
+          color_stop_from_list(arg)
         elsif Sass::Script::Value::String === arg && arg.value == "transparent"
           ColorStop.new(arg)
         elsif Sass::Script::Value::String === arg && arg.value == "currentColor"
@@ -630,19 +648,29 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def color_stops_in_percentages(color_list)
       assert_type color_list, :List
       color_list = normalize_stops(color_list)
-      max = color_list.value.last.stop
+      last_cs = color_list.value.last
+      max = last_cs.outer_stop
       last_value = nil
-      color_list.value.map do |pos|
-        next [pos.stop, pos.color] if pos.stop.is_a?(Sass::Script::Value::String)
+      pairs = color_list.value.flat_map do |pos|
+        if pos.stop2
+          [[pos.stop, pos.color], [pos.stop2, pos.color]]
+        else
+          [[pos.stop, pos.color]]
+        end
+      end
+      pairs.map do |stop, color|
+        next [stop, color] if stop.is_a?(Sass::Script::Value::String)
         # have to convert absolute units to percentages for use in color stop functions.
-        stop = pos.stop
-        stop = stop.div(max).times(number(100, "%")) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
+        if max.is_a?(Sass::Script::Value::Number) &&
+            stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
+          stop = stop.div(max).times(number(100, "%"))
+        end
         # Make sure the color stops are specified in the right order.
         if last_value && stop.numerator_units == last_value.numerator_units && stop.denominator_units == last_value.denominator_units && (stop.value * 1000).round < (last_value.value * 1000).round
           raise Sass::SyntaxError.new("Color stops must be specified in increasing order. #{stop.value} came after #{last_value.value}.")
         end
         last_value = stop
-        [stop, pos.color]
+        [stop, color]
       end
     end
 
@@ -678,7 +706,8 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def grad_position(color_list, index, default, radial = bool(false))
       assert_type color_list, :List
-      stop = color_list.value[index.value - 1].stop
+      # Use outermost position so double-position stops (e.g. transparent 0 25%) extend the radial correctly.
+      stop = color_list.value[index.value - 1].outer_stop
       if stop && radial.to_bool
         orig_stop = stop
         if stop.unitless?
@@ -690,8 +719,9 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
             stop = stop.times(number(1, "px"))
           end
         end
-        if stop.numerator_units == ["%"] && color_list.value.last.stop && color_list.value.last.stop.numerator_units == ["px"]
-          stop = stop.times(color_list.value.last.stop).div(number(100, "%"))
+        last_outer = color_list.value.last.outer_stop
+        if stop.numerator_units == ["%"] && last_outer && last_outer.numerator_units == ["px"]
+          stop = stop.times(last_outer).div(number(100, "%"))
         end
         Compass::Logger.new.record(:warning, "Webkit only supports pixels for the start and end stops for radial gradients. Got: #{orig_stop}") if stop.numerator_units != ["px"]
         stop.div(Sass::Script::Value::Number.new(1, stop.numerator_units, stop.denominator_units))
@@ -723,12 +753,36 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def color_stop?(arg)
       arg.is_a?(ColorStop) ||
-      (arg.is_a?(Sass::Script::Value::List) && ColorStop.new(*arg.value)) ||
+      (arg.is_a?(Sass::Script::Value::List) && color_stop_from_list(arg)) ||
       ColorStop.new(arg)
     rescue
       nil
     end
 
+    # True for values that may appear as gradient stop positions in Sass lists.
+    def legal_color_stop?(stop)
+      return false unless stop
+      case stop
+      when Sass::Script::Value::String
+        stop.value.start_with?("calc(")
+      when Sass::Script::Value::Number
+        true
+      else
+        false
+      end
+    end
+
+    # Parses a space- or comma-separated stop list; supports CSS Color Module 4
+    # double-position stops, e.g. (transparent 0 25%).
+    def color_stop_from_list(list)
+      v = list.value
+      if v.size == 3 && legal_color_stop?(v[1]) && legal_color_stop?(v[2])
+        ColorStop.new(v[0], v[1], v[2])
+      else
+        ColorStop.new(*v)
+      end
+    end
+
     def normalize_stops(color_list)
       positions = color_list.value.map{|obj| obj.dup}
       # fill in the start and end positions, if unspecified
@@ -750,18 +804,23 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       end
       # normalize unitless numbers
       positions.each do |pos|
-        next pos if pos.stop.is_a?(Sass::Script::Value::String)
-        if pos.stop.unitless? && pos.stop.value <= 1
-          pos.stop = pos.stop.times(number(100, "%"))
-        elsif pos.stop.unitless?
-          pos.stop = pos.stop.times(number(1, "px"))
+        [:stop, :stop2].each do |attr|
+          st = pos.send(attr)
+          next unless st
+          next if st.is_a?(Sass::Script::Value::String)
+          if st.unitless? && st.value <= 1
+            pos.send("#{attr}=", st.times(number(100, "%")))
+          elsif st.unitless?
+            pos.send("#{attr}=", st.times(number(1, "px")))
+          end
         end
       end
-      if (positions.last.stop.eq(number(0, "px")).to_bool ||
-         positions.last.stop.eq(number(0, "%")).to_bool)
-         raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
-       end
-       opts(list(positions, color_list.separator))
+      last_outer = positions.last.outer_stop
+      if (last_outer.eq(number(0, "px")).to_bool ||
+          last_outer.eq(number(0, "%")).to_bool)
+        raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
+      end
+      opts(list(positions, color_list.separator))
     end
 
     def parse_color_stop(arg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-core-sass37
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vladimir Ivanin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2026-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass