github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A better error message if a color stop list is not passed in.

Browse Source
This commit is contained in:
Chris Eppstein 2010-02-23 01:59:44 -08:00
parent 2baaffd013
commit 76c75b1d3d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/compass/sass_extensions/functions/gradient_support.rb
View File

@ -54,6 +54,7 @@ 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|
@ -67,11 +68,13 @@ module Compass::SassExtensions::Functions::GradientSupport
# 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,22 +132,24 @@ module Compass::SassExtensions::Functions::GradientSupport
when Sass::Script::Color
ColorStop.new(arg)
when Sass::Script::String
# 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
color = expr.instance_variable_get("@operand1")
stop = expr.instance_variable_get("@operand2")
when Sass::Script::Funcall
color = expr
else
puts expr.class.name
raise Sass::SyntaxError, "Couldn't parse a color stop from:: #{arg.value}"
raise Sass::SyntaxError, "Couldn't parse a color stop from: #{arg.value}"
end
ColorStop.new(color, stop)
else
@ -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