compass 0.13.alpha.0 → 0.13.alpha.2

data/lib/compass/compiler.rb

@@ -19,6 +19,12 @@ module Compass
       self.sass_options[:compass] ||= {}
       self.sass_options[:compass][:logger] = self.logger
       self.sass_options[:compass][:environment] = Compass.configuration.environment
+      reset_staleness_checker!
+    end
+
+    def reset_staleness_checker!
+      self.staleness_checker = nil
+      #Sass::Plugin::StalenessChecker.dependencies_cache = {}
       self.staleness_checker = Sass::Plugin::StalenessChecker.new(sass_options)
     end
 

data/lib/compass/configuration/data.rb

@@ -142,7 +142,7 @@ module Compass
 
       def watch(glob, &block)
         @watches ||= []
-        @watches << [glob, block]
+        @watches << Watcher::Watch.new(glob, block)
       end
       
       def watches

data/lib/compass/configuration/helpers.rb

@@ -33,6 +33,8 @@ module Compass
           nil
         elsif config.is_a?(Compass::Configuration::Data)
           config
+        elsif config.instance_of?(Hash)
+          Compass::Configuration::Data.new(filename, config)
         elsif config.respond_to?(:read)
           filename ||= config.to_s if config.is_a?(Pathname)
           Compass::Configuration::FileData.new_from_string(config.read, filename, defaults)

data/lib/compass/exec/global_options_parser.rb

@@ -26,7 +26,7 @@ module Compass::Exec::GlobalOptionsParser
         ::Compass.configuration.discover Pathname.new(frameworks_dir).realpath
       end
 
-    opts.on('-I IMPORT_PATH',
+    opts.on('-I IMPORT_PATH', '--import-path IMPORT_PATH',
             "Makes files under the IMPORT_PATH folder findable by Sass's @import directive."
       ) do |import_path|
         require 'pathname'

data/lib/compass/exec/project_options_parser.rb

@@ -35,6 +35,10 @@ module Compass::Exec::ProjectOptionsParser
     opts.on('--javascripts-dir JS_DIR', "The directory where you keep your javascripts.") do |javascripts_dir|
       set_dir_or_path(:javascripts, javascripts_dir)
     end
+    
+    opts.on('--fonts-dir FONTS_DIR', "The directory where you keep your fonts.") do |fonts_dir|
+      set_dir_or_path(:fonts, fonts_dir)
+    end
 
     opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',
             '  One of: development (default), production') do |env|

data/lib/compass/logger.rb

@@ -9,6 +9,7 @@ module Compass
     ACTION_COLORS = {
       :error     => :red,
       :warning   => :yellow,
+      :info      => :green,
       :compile   => :green,
       :overwrite => :yellow,
       :create    => :green,
@@ -76,6 +77,7 @@ module Compass
     # Emit a log message
     def log(msg)
       puts msg
+      $stdout.flush
     end
 
     # add padding to the left of an action that was performed.

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

@@ -32,6 +32,20 @@ module Compass::SassExtensions::Functions::Colors
     color.with(:saturation => scale_color_value(color.saturation, amount.value))
   end
 
+  def shade(color, percentage)
+    assert_type color, :Color
+    assert_type percentage, :Number
+    black = Sass::Script::Color.new([0, 0, 0])
+    mix(black, color, percentage)
+  end
+
+  def tint(color, percentage)
+    assert_type color, :Color
+    assert_type percentage, :Number
+    white = Sass::Script::Color.new([255, 255, 255])
+    mix(white, color, percentage)
+  end
+
   # returns an IE hex string for a color with an alpha channel
   # suitable for passing to IE filters.
   def ie_hex_str(color)

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

@@ -45,6 +45,15 @@ module Compass::SassExtensions::Functions::Constants
         position
       end
     end
+
+    def is_url(string)
+      if string.is_a?(Sass::Script::String)
+        is_url = !!(string.value =~ /^url\(.*\)$/)
+        Sass::Script::Bool.new(is_url)
+      else
+        Sass::Script::Bool.new(false)
+      end
+    end
   else
     # returns the opposite position of a side or corner.
     def opposite_position(position)

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 ms).freeze
+  GRADIENT_ASPECTS = %w(webkit moz svg pie css2 o owg).freeze
 
   class ColorStop < Sass::Script::Literal
     attr_accessor :color, :stop
@@ -10,6 +10,7 @@ module Compass::SassExtensions::Functions::GradientSupport
     def initialize(color, stop = nil)
       unless Sass::Script::Color === color ||
              Sass::Script::Funcall === color ||
+             (Sass::Script::String === color && color.value == "currentColor")||
              (Sass::Script::String === color && color.value == "transparent")
         raise Sass::SyntaxError, "Expected a color. Got: #{color}"
       end
@@ -21,6 +22,31 @@ module Compass::SassExtensions::Functions::GradientSupport
     def inspect
       to_s
     end
+
+    def self.color_to_svg_s(c)
+      # svg doesn't support the "transparent" keyword; we need to manually
+      # refactor it into "transparent black"
+      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+        "black"
+      elsif c.is_a?(Sass::Script::String)
+        c.value.dup
+      else
+        self.color_to_s(c.with(:alpha => 1))
+      end
+    end
+
+    def self.color_to_svg_alpha(c)
+      # svg doesn't support the "transparent" keyword; we need to manually
+      # refactor it into "transparent black"
+      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+        0
+      elsif c.is_a?(Sass::Script::String) && c.value == "currentColor"
+        1
+      else
+        c.alpha
+      end
+    end
+
     def self.color_to_s(c)
       if c.is_a?(Sass::Script::String)
         c.value.dup
@@ -112,7 +138,6 @@ module Compass::SassExtensions::Functions::GradientSupport
     standardized_prefix :webkit
     standardized_prefix :moz
     standardized_prefix :o
-    standardized_prefix :ms
     
     def to_owg(options = self.options)
       args = [
@@ -168,8 +193,16 @@ module Compass::SassExtensions::Functions::GradientSupport
     standardized_prefix :webkit
     standardized_prefix :moz
     standardized_prefix :o
-    standardized_prefix :ms
-    
+
+    def supports?(aspect)
+      # 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 svg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Number) && position_or_angle.numerator_units.include?("deg")
+        false
+      else
+        super
+      end
+    end
+
     # Output the original webkit gradient syntax
     def to_owg(options = self.options)
       args = []
@@ -245,6 +278,8 @@ module Compass::SassExtensions::Functions::GradientSupport
           ColorStop.new(*arg.value)
         elsif Sass::Script::String === arg && arg.value == "transparent"
           ColorStop.new(arg)
+        elsif Sass::Script::String === arg && arg.value == "currentColor"
+          ColorStop.new(arg)
         else
           raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
         end
@@ -488,7 +523,11 @@ module Compass::SassExtensions::Functions::GradientSupport
     # color_stops = array of: [stop, color]
     def color_stops_svg(color_stops)
       color_stops.each.map{ |stop, color|
-          %{<stop offset="#{stop.to_s}" stop-color="#{color.inspect}"/>}
+        s = %{<stop offset="#{stop.to_s}"}
+        s << %{ stop-color="#{ColorStop.color_to_svg_s(color)}"}
+        alpha = ColorStop.color_to_svg_alpha(color)
+        s << %{ stop-opacity="#{alpha}"} if alpha != 1
+        s << "/>"
       }.join
     end
 

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

@@ -45,9 +45,10 @@ module Compass::SassExtensions::Functions::ImageSize
 private
 
   def image_dimensions(image_file)
+    image_file = image_file.respond_to?(:value) ? image_file.value : image_file
     options[:compass] ||= {}
     options[:compass][:image_dimensions] ||= {}
-    options[:compass][:image_dimensions][image_file.value] = ImageProperties.new(image_path_for_size(image_file.value)).size
+    options[:compass][:image_dimensions][image_file] = ImageProperties.new(image_path_for_size(image_file)).size
   end
   
   def image_path_for_size(image_file)

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

@@ -5,6 +5,18 @@ module Compass::SassExtensions::Functions::Math
   end
   Sass::Script::Functions.declare :pi, []
 
+  def random(*args)
+    value = if args.length == 1
+      rand(args.pop.value)
+    else
+      range = (args.first.value..args.last.value).to_a
+      range[rand(range.length)]
+    end
+    Sass::Script::Number.new(value)
+  end
+  Sass::Script::Functions.declare :random, [:limit]
+  Sass::Script::Functions.declare :random, [:start, :limit]
+
   def sin(number)
     trig(:sin, number)
   end
@@ -20,10 +32,10 @@ module Compass::SassExtensions::Functions::Math
   end
   Sass::Script::Functions.declare :tan, [:number]
 
-  def e()
+  def e
     Sass::Script::Number.new(Math::E)
   end
-  Sass::Script::Functions.declare :pi, []
+  Sass::Script::Functions.declare :e, []
 
   def logarithm(number, base = e )
     assert_type number, :Number

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

@@ -1,5 +1,6 @@
 module Compass::SassExtensions::Functions::Sprites
   ZERO = Sass::Script::Number::new(0)
+  BOOL_FALSE = Sass::Script::Bool::new(false)
   VALID_SELECTORS = %w(hover active target)
   # Provides a consistent interface for getting a variable in ruby
   # from a keyword argument hash that accounts for underscores/dash equivalence
@@ -10,15 +11,45 @@ module Compass::SassExtensions::Functions::Sprites
     end
   end
 
-  #Returns a list of all sprite names
+  # Returns the width of the generated sprite map
+  def sprite_width(map, sprite=nil)
+    verify_map(map, 'sprite-width')
+    file = if sprite
+      map.image_for(sprite).file
+    else
+      map.filename
+    end
+    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]
+  
+  # Returns the height of the generated sprite map
+  def sprite_height(map, sprite=nil)
+    verify_map(map, 'sprite-height')
+    file = if sprite
+      map.image_for(sprite).file
+    else
+      map.filename
+    end
+    _, 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]
+
+  # 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]
 
   # Returns the system path of the sprite file
   def sprite_path(map)
-    Sass::Script::String.new(map.name_and_hash)
+    verify_map(map, 'sprite-path')
+    Sass::Script::String.new(map.filename)
   end
   Sass::Script::Functions.declare :sprite_path, [:map]
 
@@ -30,7 +61,8 @@ module Compass::SassExtensions::Functions::Sprites
   def inline_sprite(map)
     verify_map(map, "sprite-url")
     map.generate
-    inline_image(sprite_path(map))
+    path = map.filename
+    inline_image_string(data(path), compute_mime_type(path))
   end
   Sass::Script::Functions.declare :inline_sprite, [:map]
 
@@ -57,17 +89,24 @@ module Compass::SassExtensions::Functions::Sprites
   # Becomes:
   #
   #     background: url('/images/icons.png?12345678') 0 -24px no-repeat;
-  def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO)
-    sprite = convert_sprite_name(sprite)    
+  #
+  # If the `use_percentages` parameter is passed as true, percentages will be
+  # used to position the sprite. Example output:
+  #     
+  #     background: url('/images/icons.png?12345678') 0 50% no-repeat;
+  #
+  def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO, use_percentages = BOOL_FALSE)
+    sprite = convert_sprite_name(sprite)
     verify_map(map)
     verify_sprite(sprite)
     url = sprite_url(map)
-    position = sprite_position(map, sprite, offset_x, offset_y)
+    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]
 
   # Returns the name of a sprite map
   # The name is derived from the folder than contains the sprites.
@@ -148,7 +187,17 @@ module Compass::SassExtensions::Functions::Sprites
   # Would change the above output to:
   #
   #     background-position: 3px -36px;
-  def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO)
+  #
+  # If you set the `use_percentages` parameter to true, the position will be
+  # expressed in percentages. An example:
+  #
+  #     background-position: sprite-position($icons, new, 0, 0, true);
+  #
+  # Would result in something like this:
+  #
+  #     background-position: 0 42%;
+  # 
+  def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO, use_percentages = BOOL_FALSE)
     assert_type offset_x, :Number
     assert_type offset_y, :Number
     sprite = convert_sprite_name(sprite)
@@ -160,20 +209,30 @@ module Compass::SassExtensions::Functions::Sprites
     unless image
       missing_image!(map, sprite)
     end
-    if offset_x.unit_str == "%"
-      x = offset_x # CE: Shouldn't this be a percentage of the total width?
+    if use_percentages.value
+      xdivis = map.width - image.width;
+      x = (offset_x.value + image.left.to_f) / (xdivis.nonzero? || 1) * 100
+      x = Sass::Script::Number.new(x, x == 0 ? [] : ["%"])
+      ydivis = map.height - image.height;
+      y = (offset_y.value + image.top.to_f) / (ydivis.nonzero? || 1) * 100
+      y = Sass::Script::Number.new(y, y == 0 ? [] : ["%"])
     else
-      x = offset_x.value - image.left
-      x = Sass::Script::Number.new(x, x == 0 ? [] : ["px"])
+      if offset_x.unit_str == "%"
+        x = offset_x # CE: Shouldn't this be a percentage of the total width?
+      else
+        x = offset_x.value - image.left
+        x = Sass::Script::Number.new(x, x == 0 ? [] : ["px"])
+      end
+      y = offset_y.value - image.top
+      y = Sass::Script::Number.new(y, y == 0 ? [] : ["px"])
     end
-    y = offset_y.value - image.top
-    y = Sass::Script::Number.new(y, y == 0 ? [] : ["px"])
     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]
 
   def sprite_image(*args)
     raise Sass::SyntaxError, %Q(The sprite-image() function has been replaced by sprite(). See http://compass-style.org/help/tutorials/spriting/ for more information.)
@@ -181,10 +240,18 @@ module Compass::SassExtensions::Functions::Sprites
 
 protected
 
+  def reversed_color_names
+    if Sass::Script::Color.const_defined?(:HTML4_COLORS_REVERSE)
+      Sass::Script::Color::HTML4_COLORS_REVERSE
+    else
+      Sass::Script::Color::COLOR_NAMES_REVERSE
+    end
+  end
+
   def convert_sprite_name(sprite)
     case sprite
       when Sass::Script::Color
-        Sass::Script::String.new(Sass::Script::Color::COLOR_NAMES_REVERSE[sprite.rgb])
+        Sass::Script::String.new(reversed_color_names[sprite.rgb])
       when Sass::Script::Bool
         Sass::Script::String.new(sprite.to_s)
       else

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

@@ -44,9 +44,10 @@ module Compass::SassExtensions::Functions::Urls
       if base.respond_to?(:declare)
         base.declare :font_url,       [:path]
         base.declare :font_url,       [:path, :only_path]
+        base.declare :font_url,       [:path, :only_path, :cache_buster]
       end
     end
-    def font_url(path, only_path = Sass::Script::Bool.new(false))
+    def font_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(false))
       path = path.value # get to the string value of the literal.
 
       # Short curcuit if they have provided an absolute url.
@@ -62,7 +63,33 @@ module Compass::SassExtensions::Functions::Urls
                           Compass.configuration.http_fonts_path
                         end
 
-      path = "#{http_fonts_path}/#{path}"
+      # Compute the real path to the font on the file system if the fonts_dir is set.
+      real_path = if Compass.configuration.fonts_dir
+        File.join(Compass.configuration.project_path, Compass.configuration.fonts_dir, path)
+      end
+
+      # prepend the path to the font if there's one
+      if http_fonts_path
+        http_fonts_path = "#{http_fonts_path}/" unless http_fonts_path[-1..-1] == "/"
+        path = "#{http_fonts_path}#{path}"
+      end
+
+      # Compute the asset host unless in relative mode.
+      asset_host = if !relative? && Compass.configuration.asset_host
+        Compass.configuration.asset_host.call(path)
+      end
+
+      # Compute and append the cache buster if there is one.
+      if cache_buster.to_bool
+        if cache_buster.is_a?(Sass::Script::String)
+          path += "?#{cache_buster.value}"
+        else
+          path = cache_busted_path(path, real_path)
+        end
+      end
+
+      # prepend the asset host if there is one.
+      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
       if only_path.to_bool
         Sass::Script::String.new(clean_path(path))