compass 0.13.alpha.4 → 0.13.alpha.5

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

@@ -1,27 +1,32 @@
 module Compass::SassExtensions::Functions::Display
   DEFAULT_DISPLAY = {
-    :block => %w{address article aside blockquote center dir div dd details dl dt fieldset
-                  figcaption figure form footer frameset h1 h2 h3 h4 h5 h6 hr header hgroup
-                  isindex menu nav noframes noscript ol p pre section summary ul},
-    :inline => %w{a abbr acronym audio b basefont bdo big br canvas cite code command
-                  datalist dfn em embed font i img input keygen kbd label mark meter output
-                  progress q rp rt ruby s samp select small span strike strong sub
-                  sup textarea time tt u var video wbr},
-    :"inline-block" => %w{img},
-    :table => %w{table},
-    :"list-item" => %w{li},
-    :"table-row-group" => %w{tbody},
-    :"table-header-group" => %w{thead},
-    :"table-footer-group" => %w{tfoot},
-    :"table-row" => %w{tr},
-    :"table-cell" => %w{th td},
-    :"html5-block" => %w{article aside details figcaption figure footer header hgroup menu nav section summary},
-    :"html5-inline" => %w{audio canvas command datalist embed keygen mark meter output progress rp rt ruby time video wbr},
+                 "block" => %w{address article aside blockquote center dir div dd details dl dt fieldset
+                               figcaption figure form footer frameset h1 h2 h3 h4 h5 h6 hr header hgroup
+                               isindex menu nav noframes noscript ol p pre section summary ul},
+                "inline" => %w{a abbr acronym audio b basefont bdo big br canvas cite code command
+                               datalist dfn em embed font i img input keygen kbd label mark meter output
+                               progress q rp rt ruby s samp select small span strike strong sub
+                               sup textarea time tt u var video wbr},
+          "inline-block" => %w{img},
+                 "table" => %w{table},
+             "list-item" => %w{li},
+       "table-row-group" => %w{tbody},
+    "table-header-group" => %w{thead},
+    "table-footer-group" => %w{tfoot},
+             "table-row" => %w{tr},
+            "table-cell" => %w{th td},
+           "html5-block" => %w{article aside details figcaption figure footer header hgroup menu nav
+                               section summary},
+          "html5-inline" => %w{audio canvas command datalist embed keygen mark meter output progress rp
+                               rt ruby time video wbr},
+            "text-input" => %w{input textarea}
   }
-  DEFAULT_DISPLAY[:html5] = (DEFAULT_DISPLAY[:"html5-block"] + DEFAULT_DISPLAY[:"html5-inline"]).sort
+
+  DEFAULT_DISPLAY["html5"] = (DEFAULT_DISPLAY["html5-block"] + DEFAULT_DISPLAY["html5-inline"]).sort.uniq
+
   # returns a comma delimited string for all the
   # elements according to their default css3 display value.
   def elements_of_type(display)
-    Sass::Script::String.new(DEFAULT_DISPLAY.fetch(display.value.to_sym).join(", "))
+    Sass::Script::String.new(DEFAULT_DISPLAY.fetch(display.value.to_s).join(", "))
   end
 end

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

@@ -1,23 +1,52 @@
 module Compass::SassExtensions::Functions::Env
+  extend Compass::SassExtensions::Functions::SassDeclarationHelper
 
   def compass_env
     Sass::Script::String.new((options[:compass][:environment] || "development").to_s)
   end
+  register_sass_function :compass_env, []
 
-  def current_time(format)
-    time = Time.now.strftime(format.to_s)
-
-    Sass::Script::String.new(time.to_s)
+  DEFAULT_TIME = Sass::Script::String.new("%T%:z")
+  def current_time(format = DEFAULT_TIME)
+    assert_type format, :String
+    Sass::Script::String.new(Time.now.strftime(format.value))
   end
+  register_sass_function :current_time, []
+  register_sass_function :current_time, [:format]
 
-  alias :current_date :current_time
+  DEFAULT_DATE = Sass::Script::String.new("%F")
+  def current_date(format = DEFAULT_DATE)
+    current_time(format)
+  end
+  register_sass_function :current_date, []
+  register_sass_function :current_date, [:format]
 
-  def current_source_file
-    Sass::Script::String.new(options[:filename].to_s)
+  NOT_ABSOLUTE = Sass::Script::Bool.new(false)
+  def current_source_file(absolute = NOT_ABSOLUTE)
+    if absolute.to_bool
+      Sass::Script::String.new(options[:original_filename].to_s)
+    else
+      filename = Pathname.new(options[:original_filename].to_s)
+      sass_path = Pathname.new(Compass.configuration.sass_path)
+      relative_filename = filename.relative_path_from(sass_path).to_s rescue path
+      Sass::Script::String.new(relative_filename)
+    end
   end
+  register_sass_function :current_source_file, []
+  register_sass_function :current_source_file, [:absolute]
 
-  def current_output_file
+  def current_output_file(absolute = NOT_ABSOLUTE)
     Sass::Script::String.new(options[:css_filename].to_s)
+    if absolute.to_bool
+      Sass::Script::String.new(options[:css_filename].to_s)
+    else
+      filename = Pathname.new(options[:css_filename].to_s)
+      css_path = Pathname.new(Compass.configuration.css_path)
+      relative_filename = filename.relative_path_from(css_path).to_s rescue path
+      Sass::Script::String.new(relative_filename)
+    end
   end
+  register_sass_function :current_output_file, []
+  register_sass_function :current_output_file, [:absolute]
 
 end

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

@@ -1,6 +1,6 @@
 module Compass::SassExtensions::Functions::GradientSupport
 
-  GRADIENT_ASPECTS = %w(webkit moz svg pie css2 o owg).freeze
+  GRADIENT_ASPECTS = %w(webkit moz svg css2 o owg).freeze
 
   class ColorStop < Sass::Script::Literal
     attr_accessor :color, :stop
@@ -67,6 +67,10 @@ module Compass::SassExtensions::Functions::GradientSupport
       end
       s
     end
+
+    def to_sass(options = nil)
+      Sass::Script::String.new("color-stop(#{color.to_sass rescue nil}, #{stop.to_sass rescue nil})")
+    end
   end
 
   module Gradient
@@ -97,6 +101,10 @@ module Compass::SassExtensions::Functions::GradientSupport
       true
     end
 
+    def is_position(pos)
+      pos.value =~ Compass::SassExtensions::Functions::Constants::POSITIONS
+    end
+
     def angle?(value)
       value.is_a?(Sass::Script::Number) &&
       value.numerator_units.size == 1 &&
@@ -148,11 +156,6 @@ module Compass::SassExtensions::Functions::GradientSupport
       radial_svg_gradient(color_stops, position || _center_position)
     end
 
-    def to_pie(options = self.options)
-      Compass::Logger.new.record(:warning, "PIE does not support radial-gradient.")
-      Sass::Script::String.new("-pie-radial-gradient(unsupported)")
-    end
-
     def to_css2(options = self.options)
       Sass::Script::String.new("")
     end
@@ -224,12 +227,6 @@ module Compass::SassExtensions::Functions::GradientSupport
       linear_svg_gradient(color_stops, position_or_angle || Sass::Script::String.new("top"))
     end
 
-    def to_pie(options = self.options)
-      # PIE just uses the standard rep, but the property is prefixed so
-      # the presence of this attribute helps flag when to render a special rule.
-      Sass::Script::String.new to_s(options)
-    end
-
     def to_css2(options = self.options)
       Sass::Script::String.new("")
     end
@@ -269,7 +266,7 @@ module Compass::SassExtensions::Functions::GradientSupport
         Sass::Script::List.new(position.value.dup, position.separator)
       end
       # Handle unknown arguments by passing them along untouched.
-      unless position.value.all?{|p| is_position(p).to_bool }
+      unless position.value.all?{|p| is_position(p) }
         return original_value
       end
       if (position.value.first.value =~ /top|bottom/) or (position.value.last.value =~ /left|right/)

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

@@ -1,9 +1,12 @@
 module Compass::SassExtensions::Functions::Math
 
+  extend Compass::SassExtensions::Functions::SassDeclarationHelper
+
+  PI = Sass::Script::Number.new(Math::PI)
   def pi()
-    Sass::Script::Number.new(Math::PI)
+    PI
   end
-  Sass::Script::Functions.declare :pi, []
+  register_sass_function :pi, []
 
   def random(*args)
     value = if args.length == 1
@@ -14,28 +17,43 @@ module Compass::SassExtensions::Functions::Math
     end
     Sass::Script::Number.new(value)
   end
-  Sass::Script::Functions.declare :random, [:limit]
-  Sass::Script::Functions.declare :random, [:start, :limit]
+  register_sass_function :random, [:limit]
+  register_sass_function :random, [:start, :limit]
 
   def sin(number)
     trig(:sin, number)
   end
-  Sass::Script::Functions.declare :sin, [:number]
+  register_sass_function :sin, [:number]
+
+  def asin(number)
+    trig(:asin, number)
+  end
+  register_sass_function :asin, [:number]
 
   def cos(number)
     trig(:cos, number)
   end
-  Sass::Script::Functions.declare :cos, [:number]
+  register_sass_function :cos, [:number]
+
+  def acos(number)
+    trig(:acos, number)
+  end
+  register_sass_function :acos, [:number]
 
   def tan(number)
     trig(:tan, number)
   end
-  Sass::Script::Functions.declare :tan, [:number]
+  register_sass_function :tan, [:number]
+
+  def atan(number)
+    trig(:atan, number)
+  end
+  register_sass_function :atan, [:number]
 
   def e
     Sass::Script::Number.new(Math::E)
   end
-  Sass::Script::Functions.declare :e, []
+  register_sass_function :e, []
 
   def logarithm(number, base = e )
     assert_type number, :Number
@@ -45,16 +63,16 @@ module Compass::SassExtensions::Functions::Math
     result = Math.log(number.value, base.value) rescue Math.log(number.value) / Math.log(base.value)
     Sass::Script::Number.new(result, number.numerator_units, number.denominator_units)
   end
-  Sass::Script::Functions.declare :logarithm, [:number]
-  Sass::Script::Functions.declare :logarithm, [:number, :base]
+  register_sass_function :logarithm, [:number]
+  register_sass_function :logarithm, [:number, :base]
 
   def sqrt(number)
     numeric_transformation(number) { |n| Math.sqrt(n) }
   end
-  Sass::Script::Functions.declare :sqrt, [:number]
+  register_sass_function :sqrt, [:number]
 
   alias square_root sqrt
-  Sass::Script::Functions.declare :square_root, [:number]
+  register_sass_function :square_root, [:number]
 
   def pow(number, exponent)
     assert_type number, :Number
@@ -62,7 +80,7 @@ module Compass::SassExtensions::Functions::Math
     raise Sass::SyntaxError, "exponent to pow must be unitless." unless exponent.unitless?
     Sass::Script::Number.new(number.value**exponent.value, number.numerator_units, number.denominator_units)
   end
-  Sass::Script::Functions.declare :pow, [:number, :exponent]
+  register_sass_function :pow, [:number, :exponent]
 
   private
   def trig(operation, number)

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

@@ -1,7 +1,10 @@
 module Compass::SassExtensions::Functions::Sprites
+
+  extend Compass::SassExtensions::Functions::SassDeclarationHelper
+
   ZERO = Sass::Script::Number::new(0)
   BOOL_FALSE = Sass::Script::Bool::new(false)
-  VALID_SELECTORS = %w(hover active target)
+  VALID_SELECTORS = %w(hover active target focus)
   # Provides a consistent interface for getting a variable in ruby
   # from a keyword argument hash that accounts for underscores/dash equivalence
   # and allows the caller to pass a symbol instead of a string.
@@ -18,8 +21,8 @@ module Compass::SassExtensions::Functions::Sprites
     width, _ = image_dimensions(file)
     Sass::Script::Number.new(width, ["px"])
   end
-  Sass::Script::Functions.declare :sprite_width, [:map]
-  Sass::Script::Functions.declare :sprite_width, [:map, :sprite]
+  register_sass_function :sprite_width, [:map]
+  register_sass_function :sprite_width, [:map, :sprite]
   
   # Returns the height of the generated sprite map
   def sprite_height(map, sprite=nil)
@@ -28,22 +31,22 @@ module Compass::SassExtensions::Functions::Sprites
     _, height = image_dimensions(file)
     Sass::Script::Number.new(height, ["px"])
   end
-  Sass::Script::Functions.declare :sprite_height, [:map]
-  Sass::Script::Functions.declare :sprite_height, [:map, :sprite]
+  register_sass_function :sprite_height, [:map]
+  register_sass_function :sprite_height, [:map, :sprite]
 
   # Returns a list of all sprite names
   def sprite_names(map)
     verify_map(map, 'sprite-names')
     Sass::Script::List.new(map.sprite_names.map { |f| Sass::Script::String.new(f) }, ' ')
   end
-  Sass::Script::Functions.declare :sprite_names, [:map]
+  register_sass_function :sprite_names, [:map]
 
   # Returns the system path of the sprite file
   def sprite_path(map)
     verify_map(map, 'sprite-path')
     Sass::Script::String.new(map.filename)
   end
-  Sass::Script::Functions.declare :sprite_path, [:map]
+  register_sass_function :sprite_path, [:map]
 
   # Returns the sprite file as an inline image
   #    @include "icon/*.png";
@@ -56,7 +59,7 @@ module Compass::SassExtensions::Functions::Sprites
     path = map.filename
     inline_image_string(data(path), compute_mime_type(path))
   end
-  Sass::Script::Functions.declare :inline_sprite, [:map]
+  register_sass_function :inline_sprite, [:map]
 
   # Creates a Compass::SassExtensions::Sprites::SpriteMap object. A sprite map, when used in a property is the same
   # as calling sprite-url. So the following background properties are equivalent:
@@ -71,7 +74,7 @@ module Compass::SassExtensions::Functions::Sprites
     kwargs.extend VariableReader
     Compass::SassExtensions::Sprites::SpriteMap.from_uri(glob, self, kwargs)
   end
-  Sass::Script::Functions.declare :sprite_map, [:glob], :var_kwargs => true
+  register_sass_function :sprite_map, [:glob], :var_kwargs => true
 
   # Returns the image and background position for use in a single shorthand property:
   #
@@ -95,10 +98,10 @@ module Compass::SassExtensions::Functions::Sprites
     position = sprite_position(map, sprite, offset_x, offset_y, use_percentages)
     Sass::Script::List.new([url] + position.value, :space)
   end
-  Sass::Script::Functions.declare :sprite, [:map, :sprite]
-  Sass::Script::Functions.declare :sprite, [:map, :sprite, :offset_x]
-  Sass::Script::Functions.declare :sprite, [:map, :sprite, :offset_x, :offset_y]
-  Sass::Script::Functions.declare :sprite, [:map, :sprite, :offset_x, :offset_y, :use_percentages]
+  register_sass_function :sprite, [:map, :sprite]
+  register_sass_function :sprite, [:map, :sprite, :offset_x]
+  register_sass_function :sprite, [:map, :sprite, :offset_x, :offset_y]
+  register_sass_function :sprite, [:map, :sprite, :offset_x, :offset_y, :use_percentages]
 
   # Returns the name of a sprite map
   # The name is derived from the folder than contains the sprites.
@@ -106,7 +109,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite-map-name")
     Sass::Script::String.new(map.name)
   end
-  Sass::Script::Functions.declare :sprite_name, [:sprite]
+  register_sass_function :sprite_name, [:sprite]
 
   # Returns the path to the original image file for the sprite with the given name
   def sprite_file(map, sprite)
@@ -119,7 +122,7 @@ module Compass::SassExtensions::Functions::Sprites
       missing_image!(map, sprite)
     end
   end
-  Sass::Script::Functions.declare :sprite_file, [:map, :sprite]
+  register_sass_function :sprite_file, [:map, :sprite]
 
   # Returns boolean if sprite has a parent
   def sprite_does_not_have_parent(map, sprite)
@@ -129,7 +132,20 @@ module Compass::SassExtensions::Functions::Sprites
     Sass::Script::Bool.new map.image_for(sprite.value).parent.nil?
   end
   
-  Sass::Script::Functions.declare :sprite_does_not_have_parent, [:map, :sprite]
+  register_sass_function :sprite_does_not_have_parent, [:map, :sprite]
+
+  #return the name of the selector file
+  def sprite_selector_file(map, sprite, selector)
+    sprite = convert_sprite_name(sprite)
+    image = map.image_for(sprite)
+    if map.send(:"has_#{selector.value}?", sprite.value)
+      return Sass::Script::String.new(image.send(selector.value).name)
+    end
+
+    raise Sass::SyntaxError, "Sprite: #{sprite.value} does not have a #{selector} state"
+  end
+
+  register_sass_function :sprite_selector_file, [:map, :sprite, :selector]
 
   # Returns boolean if sprite has the selector
   def sprite_has_selector(map, sprite, selector)
@@ -142,11 +158,12 @@ module Compass::SassExtensions::Functions::Sprites
     Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value)
   end
   
-  Sass::Script::Functions.declare :sprite_has_selector, [:map, :sprite, :selector]
+  register_sass_function :sprite_has_selector, [:map, :sprite, :selector]
 
   # Determines if the CSS selector is valid
+  IDENTIFIER_RX = /\A#{Sass::SCSS::RX::IDENT}\Z/
   def sprite_has_valid_selector(selector)
-    unless selector.value =~ /\A#{Sass::SCSS::RX::IDENT}\Z/
+    unless selector.value =~ IDENTIFIER_RX
       raise Sass::SyntaxError, "#{selector} must be a legal css identifier"
     end
     Sass::Script::Bool.new true
@@ -158,7 +175,7 @@ module Compass::SassExtensions::Functions::Sprites
     map.generate
     generated_image_url(Sass::Script::String.new("#{map.path}-s#{map.uniqueness_hash}.png"))
   end
-  Sass::Script::Functions.declare :sprite_url, [:map]
+  register_sass_function :sprite_url, [:map]
 
   # Returns the position for the original image in the sprite.
   # This is suitable for use as a value to background-position:
@@ -220,11 +237,11 @@ module Compass::SassExtensions::Functions::Sprites
     end
     Sass::Script::List.new([x, y],:space)
   end
-  Sass::Script::Functions.declare :sprite_position, [:map]
-  Sass::Script::Functions.declare :sprite_position, [:map, :sprite]
-  Sass::Script::Functions.declare :sprite_position, [:map, :sprite, :offset_x]
-  Sass::Script::Functions.declare :sprite_position, [:map, :sprite, :offset_x, :offset_y]
-  Sass::Script::Functions.declare :sprite_position, [:map, :sprite, :offset_x, :offset_y, :use_percentages]
+  register_sass_function :sprite_position, [:map]
+  register_sass_function :sprite_position, [:map, :sprite]
+  register_sass_function :sprite_position, [:map, :sprite, :offset_x]
+  register_sass_function :sprite_position, [:map, :sprite, :offset_x, :offset_y]
+  register_sass_function :sprite_position, [:map, :sprite, :offset_x, :offset_y, :use_percentages]
 
 protected
 
@@ -247,7 +264,13 @@ protected
   def convert_sprite_name(sprite)
     case sprite
       when Sass::Script::Color
-        Sass::Script::String.new(reversed_color_names[sprite.rgb])
+        rgb = if reversed_color_names.keys.first.size == 3
+                sprite.rgb
+              else
+                # Sass 3.3 includes the alpha channel
+                sprite.rgba
+              end
+        Sass::Script::String.new(reversed_color_names[rgb])
       when Sass::Script::Bool
         Sass::Script::String.new(sprite.to_s)
       else

data/lib/compass/sass_extensions/monkey_patches/browser_support.rb

@@ -1,8 +1,43 @@
-require 'sass/script/node'
-require 'sass/script/literal'
-require 'sass/script/funcall'
+require 'sass/script'
 
 module Sass::Script
+  module Value
+    class Base
+      NO_CHILDREN = []
+      def children
+        NO_CHILDREN
+      end
+
+      def options=(opts)
+        @options = opts
+        children.each {|c| c.options = opts}
+        opts
+      end
+
+      def opts(value)
+        value.options = options
+        value
+      end
+    end
+
+    class List < Base
+      def children
+        value
+      end
+    end
+
+    class ArgList < List
+      def children
+        super + @keywords.values
+      end
+    end
+
+    class Map < Base
+      def children
+        to_a
+      end
+    end
+  end
   module HasSimpleCrossBrowserFunctionSupport
     def supports?(aspect)
       return true if Compass::BrowserSupport.supports?(name, aspect)
@@ -39,7 +74,7 @@ module Sass::Script
       s = "#{name}(#{args.join(", ")})"
     end
 
-    %w(webkit moz o ms svg pie css2).each do |prefix|
+    %w(webkit moz o ms svg css2).each do |prefix|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def to_#{prefix}(options = self.options)
           prefixed_args = args.map do |arg|
@@ -65,19 +100,13 @@ module Sass::Script
   class Funcall < Node
     include HasSimpleCrossBrowserFunctionSupport
 
-    if method_defined? :to_literal
-      alias sass_to_literal to_literal 
-    else
-      def sass_to_literal
-        Script::String.new("#{name}(#{args.join(', ')})")
-      end
-    end
+    alias sass_to_value to_value 
 
-    def to_literal(args)
+    def to_value(args)
       if has_aspect?(args)
         CrossBrowserFunctionCall.new(name, args)
       else
-        sass_to_literal(args)
+        sass_to_value(args)
       end
     end
   end