compass 0.11.alpha.1 → 0.11.alpha.3

data/frameworks/compass/templates/pie/manifest.rb

@@ -21,7 +21,7 @@ For more information see:
 
 CSS PIE is written by and copyright to: Jason Johnston
 
-Compass is using css3pie version 1.0-beta2. It can be upgraded by downloading
+Compass is using css3pie version 1.0-beta3. It can be upgraded by downloading
 a newer behavior file and replacing the one that comes with compass.
 }
 
@@ -36,4 +36,4 @@ Unfornately, due to the suckiness of IE, PIE does not work with relative assets.
 
 For more information see:
   http://css3pie.com/
-}
+}

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util sass_extensions core_ext version errors).each do |lib|
+%w(dependencies util sass_extensions core_ext version errors quick_cache).each do |lib|
   require "compass/#{lib}"
 end
 
@@ -13,8 +13,9 @@ module Compass
     File.expand_path(File.join(File.dirname(__FILE__)))
   end
   module_function :base_directory, :lib_directory
+  extend QuickCache
 end
 
-%w(configuration frameworks app_integration actions compiler).each do |lib|
+%w(configuration frameworks app_integration actions compiler sprites).each do |lib|
   require "compass/#{lib}"
 end

data/lib/compass/app_integration/stand_alone/installer.rb

@@ -61,7 +61,7 @@ This can be done in one of the following ways:
      compass watch [path/to/project]
 
 More Resources:
-  * Wiki: http://wiki.github.com/chriseppstein/compass
+  * Website: http://compass-style.org/
   * Sass: http://sass-lang.com
   * Community: http://groups.google.com/group/compass-users/
 

data/lib/compass/commands.rb

@@ -5,7 +5,7 @@ require 'compass/commands/registry'
 
 %w(base generate_grid_background help list_frameworks project_base
    update_project watch_project create_project imports installer_command
-   print_version project_stats stamp_pattern validate_project
+   print_version project_stats stamp_pattern sprite validate_project
    write_configuration interactive unpack_extension).each do |lib|
   require "compass/commands/#{lib}"
 end

data/lib/compass/commands/sprite.rb

@@ -0,0 +1,87 @@
+require 'compass/commands/project_base'
+require 'compass/commands/update_project'
+
+module Compass
+  module Commands
+    module SpriteOptionsParser
+      def set_options(opts)
+        opts.on("-f SPRITE_FILE") do |output_file|
+          self.options[:output_file] = output_file
+        end
+        opts.banner = %Q{
+          Usage: compass sprite [options] "images/path/to/sprites/*.png"
+
+          Description:
+            Generate a sprite import based on the given sprite directory.
+            Alternatively, you can simply do this in your sass files:
+
+                @import "sprite-folder/*.png"
+
+            And a magical, custom made sprite file will be imported.
+
+          Options:
+        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
+
+        super
+      end
+    end
+    class Sprite < ProjectBase
+
+      register :sprite
+
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        sprites = Compass::Sprites.new
+        relative_uri = options[:uri].gsub(/^#{Compass.configuration.images_dir}\//, '')
+        sprite_images = Compass::Sprites.discover_sprites(relative_uri)
+        image_names = sprite_images.map{|i| File.basename(i, '.png')}
+        sprites.path, sprites.name = Compass::Sprites.path_and_name(relative_uri)
+        options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{sprites.name}.#{Compass.configuration.preferred_syntax}")
+        contents = sprites.content_for_images(relative_uri, sprites.name, image_names)
+        if options[:output_file][-4..-1] != "scss"
+          contents = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => :scss)).to_tree.to_sass
+        end
+        directory File.dirname(options[:output_file])
+        write_file options[:output_file], contents
+      end
+
+      class << self
+
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(SpriteOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def description(command)
+          "Generate an import for your sprites."
+        end
+
+        def parse!(arguments)
+          parser = option_parser(arguments)
+          parser.parse!
+          parse_arguments!(parser, arguments)
+          parser.options
+        end
+
+        def parse_arguments!(parser, arguments)
+          parser.options[:uri] = arguments.shift
+          unless arguments.size == 0
+            raise Compass::Error, "Please specify at least one image to sprite."
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/compass/configuration/adapters.rb

@@ -22,6 +22,8 @@ module Compass
         plugin_opts[:cache] = cache unless cache.nil?
         plugin_opts[:cache_location] = cache_path unless cache_path.nil?
         plugin_opts.merge!(sass_options || {})
+        plugin_opts[:load_paths] ||= []
+        plugin_opts[:load_paths] << Compass::Sprites.new
         plugin_opts
       end
 
@@ -57,6 +59,7 @@ module Compass
           load_paths << framework.stylesheets_directory if File.exists?(framework.stylesheets_directory)
         end
         load_paths += resolve_additional_import_paths
+        load_paths << Compass::Sprites.new
         load_paths
       end
     end

data/lib/compass/dependencies.rb

@@ -2,5 +2,11 @@ begin
   require 'sass'
 rescue LoadError
   require 'rubygems'
-  require 'sass'
+  begin
+    require 'sass'
+  rescue LoadError
+    puts "Unable to load Sass. Please install it with one of the following commands:"
+    puts "  gem install sass --pre"
+    raise
+  end
 end

data/lib/compass/installers/bare_installer.rb

@@ -47,7 +47,7 @@ This can be done in one of the following ways:
      compass watch [path/to/project]
 
 More Resources:
-  * Wiki: http://wiki.github.com/chriseppstein/compass
+  * Website: http://compass-style.org/
   * Sass: http://sass-lang.com
   * Community: http://groups.google.com/group/compass-users/
 NEXTSTEPS

data/lib/compass/quick_cache.rb

@@ -0,0 +1,15 @@
+module QuickCache
+
+  # cache a value in memory for just a few seconds
+  # This can speed up reads of values that change relatively infrequently
+  # but might be read many times in a short burst of reads.
+  def quick_cache(key, ttl = 1)
+    @quick_cache ||= {}
+    if @quick_cache[key] && @quick_cache[key].first > Time.now - ttl
+      @quick_cache[key].last
+    else
+      (@quick_cache[key] = [Time.now, yield]).last
+    end
+  end
+
+end

data/lib/compass/sass_extensions/functions.rb

@@ -2,9 +2,9 @@ module Compass::SassExtensions::Functions
 end
 
 %w(
-  selectors enumerate urls display if
+  selectors enumerate urls display
   inline_image image_size constants gradient_support
-  font_files lists colors trig
+  font_files lists colors trig sprites
 ).each do |func|
   require "compass/sass_extensions/functions/#{func}"
 end
@@ -22,7 +22,7 @@ module Sass::Script::Functions
   include Compass::SassExtensions::Functions::Lists
   include Compass::SassExtensions::Functions::Colors
   include Compass::SassExtensions::Functions::Trig
-  include Compass::SassExtensions::Functions::If
+  include Compass::SassExtensions::Functions::Sprites
 end
 
 # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?

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

@@ -138,21 +138,29 @@ module Compass::SassExtensions::Functions::GradientSupport
       Sass::Script::Bool.new(args.any?{|a| a.respond_to?(method)})
     end
 
-    %w(webkit moz o ms svg pie).each do |prefix|
+    %w(webkit moz o ms svg pie css2).each do |prefix|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def _#{prefix}(*args)
-          List.new(*args.map! do |a|
-                      if a.is_a?(List)
-                        a.class.new(*a.values.map{|v| v.respond_to?(:to_#{prefix}) ? v.to_#{prefix} : v})
-                      else
-                        a.respond_to?(:to_#{prefix}) ? a.to_#{prefix} : a
-                      end
-                    end)
+          List.new(*args.map! {|a| add_prefix(:to_#{prefix}, a)})
         end
       RUBY
     end
 
     protected
+
+    def add_prefix(prefix_method, object)
+      if object.is_a?(List)
+        object.class.new(object.value.map{|e|
+          add_prefix(prefix_method, e)
+        })
+      elsif object.respond_to?(prefix_method)
+        object.options = options
+        object.send(prefix_method)
+      else
+        object
+      end
+    end
+
     def color_stop?(arg)
       parse_color_stop(arg)
     rescue
@@ -219,7 +227,12 @@ module Compass::SassExtensions::Functions::GradientSupport
 
     # Returns a comma-delimited list after removing any non-true values
     def compact(*args)
-      Sass::Script::List.new(args.reject{|a| !a.to_bool}, :comma)
+      sep = :comma
+      if args.size == 1 && args.first.is_a?(Sass::Script::List)
+        args = args.first.value
+        sep = args.first.separator
+      end
+      Sass::Script::List.new(args.reject{|a| !a.to_bool}, sep)
     end
 
     # Returns a list object from a value that was passed.
@@ -259,28 +272,35 @@ module Compass::SassExtensions::Functions::GradientSupport
     # Check if any of the arguments passed have a tendency towards vendor prefixing.
     def prefixed(prefix, *args)
       method = prefix.value.sub(/^-/,"to_").to_sym
-      args.map!{|a| a.is_a?(Sass::Script::List) ? a.value : a}.flatten!
+      2.times do
+        args.map!{|a| a.is_a?(Sass::Script::List) ? a.value : a}.flatten!
+      end
       Sass::Script::Bool.new(args.any?{|a| a.respond_to?(method)})
     end
 
-    %w(webkit moz o ms svg pie).each do |prefix|
+    %w(webkit moz o ms svg pie css2).each do |prefix|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def _#{prefix}(*args)
-          Sass::Script::List.new(args.map! do |a|
-            a.options = options
-            if a.is_a?(Sass::Script::List)
-              Sass::Script::List.new(a.value.map do |v|
-                v.respond_to?(:to_#{prefix}) ? v.to_#{prefix} : v
-              end, a.separator)
-            else
-              a.respond_to?(:to_#{prefix}) ? a.to_#{prefix} : a
-            end
-          end, :comma)
+          Sass::Script::List.new(args.map! {|a| add_prefix(:to_#{prefix}, a)}, :comma)
         end
       RUBY
     end
 
     protected
+
+    def add_prefix(prefix_method, object)
+      if object.is_a?(Sass::Script::List)
+        Sass::Script::List.new(object.value.map{|e|
+          add_prefix(prefix_method, e)
+        }, object.separator)
+      elsif object.respond_to?(prefix_method)
+        object.options = options
+        object.send(prefix_method)
+      else
+        object
+      end
+    end
+
     def color_stop?(arg)
       arg.is_a?(ColorStop) ||
       (arg.is_a?(Sass::Script::List) && ColorStop.new(*arg.value)) ||
@@ -375,6 +395,9 @@ module Compass::SassExtensions::Functions::GradientSupport
       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
   end
 
   class LinearGradient < Sass::Script::Literal
@@ -417,6 +440,9 @@ module Compass::SassExtensions::Functions::GradientSupport
       # 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
   end
 
   module Functions
@@ -562,6 +588,19 @@ module Compass::SassExtensions::Functions::GradientSupport
       end
     end
 
+    def blank(obj)
+      case obj
+      when Sass::Script::Bool
+        Sass::Script::Bool.new !obj.to_bool
+      when Sass::Script::String
+        Sass::Script::Bool.new obj.value.strip.size == 0
+      when Sass::Script::List
+        Sass::Script::Bool.new obj.value.size == 0 || obj.value.all?{|el| blank(el).to_bool}
+      else
+        Sass::Script::Bool.new false
+      end
+    end
+
     private
 
     # After using the sass script parser to parse a string, this reconstructs

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

@@ -13,17 +13,6 @@ module Compass::SassExtensions::Functions::ImageSize
     Sass::Script::Number.new(height, ["px"])
   end
 
-private
-  def real_path(image_file)
-    path = image_file.value
-    # Compute the real path to the image on the file stystem if the images_dir is set.
-    if Compass.configuration.images_path
-      File.join(Compass.configuration.images_path, path)
-    else
-      File.join(Compass.configuration.project_path, path)
-    end
-  end
-
   class ImageProperties
     def initialize(file)
       @file = file
@@ -55,6 +44,17 @@ private
     end
   end
 
+private
+  def real_path(image_file)
+    path = image_file.value
+    # Compute the real path to the image on the file stystem if the images_dir is set.
+    if Compass.configuration.images_path
+      File.join(Compass.configuration.images_path, path)
+    else
+      File.join(Compass.configuration.project_path, path)
+    end
+  end
+
   class JPEG
     attr_reader :width, :height, :bits
 

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

@@ -0,0 +1,357 @@
+require 'digest/md5'
+
+module Compass::SassExtensions::Functions::Sprites
+  ZERO = Sass::Script::Number::new(0)
+  
+  # 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.
+  module VariableReader
+    def get_var(variable_name)
+      self[variable_name.to_s.gsub(/-/,"_")]
+    end
+  end
+
+  class SpriteMap < Sass::Script::Literal
+
+    # Changing this string will invalidate all previously generated sprite images.
+    # We should do so only when the packing algorithm changes
+    SPRITE_VERSION = "1"
+
+    attr_accessor :image_names, :path, :name, :options
+    attr_accessor :images, :width, :height
+
+    def self.from_uri(uri, context, kwargs)
+      path, name = Compass::Sprites.path_and_name(uri.value)
+      sprites = Compass::Sprites.discover_sprites(uri.value).map do |sprite|
+        sprite.gsub(Compass.configuration.images_path+"/", "")
+      end
+      new(sprites, path, name, context, kwargs)
+    end
+
+    def initialize(image_names, path, name, context, options)
+      @image_names, @path, @name, @options = image_names, path, name, options
+      @images = nil
+      @width = nil
+      @height = nil
+      @evaluation_context = context
+      validate!
+      compute_image_metadata!
+    end
+
+    def sprite_names
+      image_names.map{|f| Compass::Sprites.sprite_name(f) }
+    end
+
+    def validate!
+      for sprite_name in sprite_names
+        unless sprite_name =~ /\A#{Sass::SCSS::RX::IDENT}\Z/
+          raise Sass::SyntaxError, "#{sprite_name} must be a legal css identifier"
+        end
+      end
+    end
+
+    # Calculates the overal image dimensions
+    # collects image sizes and input parameters for each sprite
+    def compute_image_metadata!
+      @images = []
+      @width = 0
+      image_names.each do |relative_file|
+        file = File.join(Compass.configuration.images_path, relative_file)
+        width, height = Compass::SassExtensions::Functions::ImageSize::ImageProperties.new(file).size
+        sprite_name = Compass::Sprites.sprite_name(relative_file)
+        @width = [@width, width].max
+        @images << {
+          :name => sprite_name,
+          :file => file,
+          :relative_file => relative_file,
+          :height => height,
+          :width => width,
+          :repeat => repeat_for(sprite_name),
+          :spacing => spacing_for(sprite_name),
+          :position => position_for(sprite_name),
+          :digest => MD5.file(file).hexdigest
+        }
+      end
+      @images.each_with_index do |image, index|
+        if index == 0
+          image[:top] = 0
+        else
+          last_image = @images[index-1]
+          image[:top] = last_image[:top] + last_image[:height] + [image[:spacing],  last_image[:spacing]].max
+        end
+        if image[:position].unit_str == "%"
+          image[:left] = (@width - image[:width]) * (image[:position].value / 100)
+        else
+          image[:left] = image[:position].value
+        end
+      end
+      @height = @images.last[:top] + @images.last[:height]
+    end
+
+    def position_for(name)
+      options.get_var("#{name}-position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
+    end
+
+    def repeat_for(name)
+      if (var = options.get_var("#{name}-repeat"))
+        var.value
+      elsif (var = options.get_var("repeat"))
+        var.value
+      else
+        "no-repeat"
+      end
+    end
+
+    def spacing_for(name)
+      (options.get_var("#{name}-spacing") ||
+       options.get_var("spacing") ||
+       ZERO).value
+    end
+
+    def image_for(name)
+      @images.detect{|img| img[:name] == name}
+    end
+
+    # Calculate the size of the sprite
+    def size
+      [width, height]
+    end
+
+    # Generate a sprite image if necessary
+    def generate
+      if generation_required?
+        save!(construct_sprite)
+      end
+    end
+
+    def generation_required?
+      !File.exists?(filename) || outdated?
+    end
+
+    def require_png_library!
+      begin
+        require 'oily_png'
+      rescue LoadError
+        require 'chunky_png'
+      end
+    end
+
+    # Returns a PNG object
+    def construct_sprite
+      require_png_library!
+      output_png = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
+      images.each do |image|
+        input_png  = ChunkyPNG::Image.from_file(image[:file])
+        if image[:repeat] == "no-repeat"
+          output_png.replace input_png, image[:left], image[:top]
+        else
+          x = image[:left] - (image[:left] / image[:width]).ceil * image[:width]
+          while x < width do
+            output_png.replace input_png, x, image[:top]
+            x += image[:width]
+          end
+        end
+      end
+      output_png 
+    end
+
+    # The on-the-disk filename of the sprite
+    def filename
+      File.join(Compass.configuration.images_path, "#{path}-#{uniqueness_hash}.png")
+    end
+
+    def uniqueness_hash
+      @uniqueness_hash ||= begin
+        sum = MD5.md5(SPRITE_VERSION)
+        sum << path
+        images.each do |image|
+          [:relative_file, :height, :width, :repeat, :spacing, :position, :digest].each do |attr|
+            sum << image[attr].to_s
+          end
+        end
+        sum.hexdigest[0...10]
+      end
+      @uniqueness_hash
+    end
+
+    # saves the sprite for later retrieval
+    def save!(output_png)
+      output_png.save filename
+    end
+
+    # All the full-path filenames involved in this sprite
+    def image_filenames
+      image_names.map do |image_name|
+        File.join(Compass.configuration.images_path, image_name)
+      end
+    end
+
+    # Checks whether this sprite is outdated
+    def outdated?
+      last_update = self.mtime
+      image_filenames.each do |image|
+        return true if File.mtime(image) > last_update
+      end
+      false
+    end
+
+    def mtime
+      File.mtime(filename)
+    end
+
+    def inspect
+      to_s
+    end
+
+    def to_s(options = self.options)
+      sprite_url(self).value
+    end
+
+    def respond_to?(meth)
+      super || @evaluation_context.respond_to?(meth)
+    end
+
+    def method_missing(meth, *args, &block)
+      if @evaluation_context.respond_to?(meth)
+        @evaluation_context.send(meth, *args, &block)
+      else
+        super
+      end
+    end
+
+  end
+
+  # Creates a SpriteMap object. A sprite map, when used in a property is the same
+  # as calling sprite-url. So the following background properties are equivalent:
+  #
+  #     $icons: sprite-map("icons/*.png");
+  #     background: sprite-url($icons) no-repeat;
+  #     background: $icons no-repeat;
+  #
+  # The sprite map object will generate the sprite map image, if necessary,
+  # the first time it is converted to a url. Simply constructing it has no side-effects.
+  def sprite_map(glob, kwargs = {})
+    kwargs.extend VariableReader
+    SpriteMap.from_uri(glob, self, kwargs)
+  end
+  Sass::Script::Functions.declare :sprite_map, [:glob], :var_kwargs => true
+
+  # Returns the image and background position for use in a single shorthand property:
+  #
+  #     $icons: sprite-map("icons/*.png"); // contains icons/new.png among others.
+  #     background: sprite($icons, new) no-repeat;
+  #
+  # Becomes:
+  #
+  #     background: url('/images/icons.png?12345678') 0 -24px no-repeat;
+  def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO)
+    unless map.is_a?(SpriteMap)
+      missing_sprite!("sprite")
+    end
+    unless sprite.is_a?(Sass::Script::String)
+      raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
+    end
+    url = sprite_url(map)
+    position = sprite_position(map, sprite, offset_x, offset_y)
+    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]
+
+  # Returns the name of a sprite map
+  # The name is derived from the folder than contains the sprites.
+  def sprite_map_name(map)
+    unless map.is_a?(SpriteMap)
+      missing_sprite!("sprite-map-name")
+    end
+    Sass::Script::String.new(map.name)
+  end
+  Sass::Script::Functions.declare :sprite_name, [:sprite]
+
+  # Returns the path to the original image file for the sprite with the given name
+  def sprite_file(map, sprite)
+    unless map.is_a?(SpriteMap)
+      missing_sprite!("sprite-file")
+    end
+    if image = map.image_for(sprite.value)
+      Sass::Script::String.new(image[:relative_file])
+    else
+      missing_image!(map, sprite)
+    end
+  end
+  Sass::Script::Functions.declare :sprite_file, [:map, :sprite]
+    
+  # Returns a url to the sprite image.
+  def sprite_url(map)
+    unless map.is_a?(SpriteMap)
+      missing_sprite!("sprite-url")
+    end
+    map.generate
+    image_url(Sass::Script::String.new("#{map.path}-#{map.uniqueness_hash}.png"),
+              Sass::Script::Bool.new(false),
+              Sass::Script::Bool.new(false))
+  end
+  Sass::Script::Functions.declare :sprite_url, [:map]
+
+  # Returns the position for the original image in the sprite.
+  # This is suitable for use as a value to background-position:
+  #
+  #     $icons: sprite-map("icons/*.png");
+  #     background-position: sprite-position($icons, new);
+  #
+  # Might generate something like:
+  #
+  #     background-position: 0 -34px;
+  #
+  # You can adjust the background relative to this position by passing values for
+  # `$offset-x` and `$offset-y`:
+  #
+  #     $icons: sprite-map("icons/*.png");
+  #     background-position: sprite-position($icons, new, 3px, -2px);
+  #
+  # Would change the above output to:
+  #
+  #     background-position: 3px -36px;
+  def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO)
+    unless map.is_a?(SpriteMap)
+      missing_sprite!("sprite-position")
+    end
+    unless sprite && sprite.is_a?(Sass::Script::String)
+      raise Sass::SyntaxError, %Q(The second argument to sprite-position must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
+    end
+    image = map.image_for(sprite.value)
+    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?
+    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"])
+    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]
+
+  def sprite_image(*args)
+    raise Sass::SyntaxError, %Q(The sprite-image() function has been replaced by sprite(). See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
+  end
+
+protected
+
+  def missing_image!(map, sprite)
+    raise Sass::SyntaxError, "No sprite called #{sprite} found in sprite map #{map.path}/#{map.name}. Did you mean one of: #{map.sprite_names.join(", ")}"
+  end
+
+  def missing_sprite!(function_name)
+    raise Sass::SyntaxError, %Q(The first argument to #{function_name}() must be a sprite map. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
+  end
+
+end