compass 0.10.0.pre6 → 0.10.0.pre7

data/REVISION

@@ -1 +1 @@
-9503512782eba7e387ba0dec14e5cfe1f3c0f22b
+e3b0b06eda29c0fe179797f0f47d05d47cb0702c

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: pre6
+:build: pre7

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

@@ -6,10 +6,10 @@ module Compass::SassExtensions::Functions::GradientSupport
       self.values = values
     end
     def inspect
-      to_s
+      values.map{|v| v.inspect}.join(", ")
     end
     def to_s
-      values.map{|v| v.to_s}.join(", ")
+      inspect
     end
   end
 
@@ -22,13 +22,13 @@ module Compass::SassExtensions::Functions::GradientSupport
       to_s
     end
     def to_s
-      s = "#{color}"
+      s = color.inspect.dup
       if stop
         s << " "
         if stop.unitless?
-          s << stop.times(Sass::Script::Number.new(100, ["%"])).to_s
+          s << stop.times(Sass::Script::Number.new(100, ["%"])).inspect
         else
-          s << stop.to_s
+          s << stop.inspect
         end
       end
       s
@@ -54,24 +54,27 @@ module Compass::SassExtensions::Functions::GradientSupport
 
     # returns color-stop() calls for use in webkit.
     def grad_color_stops(color_list)
+      assert_list(color_list)
       normalize_stops!(color_list)
       max = color_list.values.last.stop
       color_stops = color_list.values.map do |pos|
         # have to convert absolute units to percentages for use in color stop functions.
         stop = pos.stop
         stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units
-        "color-stop(#{stop}, #{pos.color})"
+        "color-stop(#{stop.inspect}, #{pos.color.inspect})"
       end
       Sass::Script::String.new(color_stops.join(", "))
     end
-    
+
     # returns the end position of the gradient from the color stop
     def grad_end_position(color_list, radial = Sass::Script::Bool.new(false))
+      assert_list(color_list)
       default = Sass::Script::Number.new(100)
       grad_position(color_list, Sass::Script::Number.new(color_list.values.size), default, radial)
     end
 
     def grad_position(color_list, index, default, radial = Sass::Script::Bool.new(false))
+      assert_list(color_list)
       stop = color_list.values[index.value - 1].stop
       if stop && radial.to_bool
         orig_stop = stop
@@ -129,26 +132,28 @@ module Compass::SassExtensions::Functions::GradientSupport
         when Sass::Script::Color
           ColorStop.new(arg)
         when Sass::Script::String
-          color, stop = arg.value.split(/ +/, 2)
-          color = Sass::Script::Parser.parse(color, 0, 0)
-          if stop =~ /^(\d+)?(?:\.(\d+))?(%)?$/
-            integral, decimal, percent = $1, $2, $3
-            number = "#{integral || 0}.#{decimal || 0}".to_f
-            number = number / 100 if percent
-            if number > 1
-              raise Sass::SyntaxError, "A color stop location must be between 0#{"%" if percent} and 1#{"00%" if percent}. Got: #{stop}"
-            end
-            stop = Sass::Script::Number.new(number)
-          elsif !stop.nil?
-            number = Sass::Script::Parser.parse(stop, 0, 0)
-            unless number.is_a?(Sass::Script::Number)
-              raise Sass::SyntaxError, "A color stop location must be a number. Got: #{stop}"
+          # We get a string as the result of concatenation
+          # So we have to reparse the expression
+          color = stop = nil
+          expr = Sass::Script::Parser.parse(arg.value, 0, 0)
+          case expr
+          when Sass::Script::Color
+            color = expr
+          when Sass::Script::Funcall
+            color = expr
+          when Sass::Script::Operation
+            unless expr.instance_variable_get("@operator") == :concat
+              # This should never happen.
+              raise Sass::SyntaxError, "Couldn't parse a color stop from: #{arg.value}"
             end
-            stop = number
+            color = expr.instance_variable_get("@operand1")
+            stop = expr.instance_variable_get("@operand2")
+          else
+            raise Sass::SyntaxError, "Couldn't parse a color stop from: #{arg.value}"
           end
           ColorStop.new(color, stop)
         else
-          raise Sass::SyntaxError, "Not a valid color stop: #{arg}"          
+          raise Sass::SyntaxError, "Not a valid color stop: #{arg}"
         end
       end)
     end
@@ -182,5 +187,9 @@ module Compass::SassExtensions::Functions::GradientSupport
       end
       nil
     end
+    def assert_list(value)
+      return if value.is_a?(List)
+      raise ArgumentError.new("#{value.inspect} is not a list of color stops. Expected: color_stops(<color> <number>?, ...)")
+    end
   end
 end

data/test/fixtures/stylesheets/compass/css/gradients.css

@@ -23,8 +23,8 @@
   background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 20%, #aaaaaa 100%); }
 
 .linear-7 {
-  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(20%, #cccccc), color-stop(50.1%, #eeeeee), color-stop(100%, #aaaaaa));
-  background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 20%, #eeeeee 50.1%, #aaaaaa 100%); }
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(20%, #cccccc), color-stop(60%, #eeeeee), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 20%, #eeeeee 60%, #aaaaaa 100%); }
 
 .linear-8 {
   background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(80%, #dddddd), color-stop(100%, #aaaaaa));
@@ -69,3 +69,7 @@
 .radial-7 {
   background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 50, color-stop(20%, #dddddd), color-stop(100%, #aaaaaa));
   background-image: -moz-radial-gradient(center center, circle, #dddddd 20%, #aaaaaa 50px); }
+
+.alpha-linear {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(80%, rgba(255, 255, 255, 0)), color-stop(90%, rgba(255, 127, 127, 0.5)), color-stop(100%, rgba(255, 255, 255, 1)));
+  background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0) 40%, rgba(255, 127, 127, 0.5) 45%, rgba(255, 255, 255, 1) 50%); }

data/test/fixtures/stylesheets/compass/sass/gradients.sass

@@ -46,3 +46,6 @@
   // A centered elliptical gradient with color stops
   // The color stops must be relative units
   +radial-gradient(color_stops(#ddd 20%, #aaa 50px))
+
+.alpha-linear
+  +linear-gradient(color_stops(rgba(255, 255, 255, 0) 40%, rgba(255, 127, 127, 0.5), rgba(255, 255, 255, 1) 50%))

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 0
-  - pre6
-  version: 0.10.0.pre6
+  - pre7
+  version: 0.10.0.pre7
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-02-23 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency