compass 0.13.alpha.12 → 1.0.0.alpha.13

data/lib/compass/sass_extensions.rb

@@ -6,5 +6,4 @@ module Compass::SassExtensions
 end
 
 require 'compass/sass_extensions/functions'
-require 'compass/sass_extensions/monkey_patches'
 require 'compass/sass_extensions/sprites'

data/lib/compass/sass_extensions/functions.rb

@@ -1,39 +1,15 @@
 module Compass::SassExtensions::Functions
   module SassDeclarationHelper
-    def register_sass_function(*args)
+    def declare(*args)
       Sass::Script::Functions.declare(*args)
     end
   end
 end
 
-%w(
-  selectors    enumerate  urls      display
-  inline_image image_size constants gradient_support
-  font_files   lists      colors    math
-  sprites      env        cross_browser_support
-).each do |func|
+%w(sprites).each do |func|
   require "compass/sass_extensions/functions/#{func}"
 end
 
 module Sass::Script::Functions
-  include Compass::SassExtensions::Functions::Selectors
-  include Compass::SassExtensions::Functions::Enumerate
-  include Compass::SassExtensions::Functions::Urls
-  include Compass::SassExtensions::Functions::Display
-  include Compass::SassExtensions::Functions::InlineImage
-  include Compass::SassExtensions::Functions::ImageSize
-  include Compass::SassExtensions::Functions::GradientSupport::Functions
-  include Compass::SassExtensions::Functions::FontFiles
-  include Compass::SassExtensions::Functions::Constants
-  include Compass::SassExtensions::Functions::Lists
-  include Compass::SassExtensions::Functions::Colors
-  include Compass::SassExtensions::Functions::Math
   include Compass::SassExtensions::Functions::Sprites
-  include Compass::SassExtensions::Functions::CrossBrowserSupport
-  include Compass::SassExtensions::Functions::Env
-end
-
-# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
-class Sass::Script::Functions::EvaluationContext
-  include Sass::Script::Functions
 end

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

@@ -21,8 +21,8 @@ module Compass::SassExtensions::Functions::Sprites
     width, _ = image_dimensions(file)
     Sass::Script::Number.new(width, ["px"])
   end
-  register_sass_function :sprite_width, [:map]
-  register_sass_function :sprite_width, [:map, :sprite]
+  declare :sprite_width, [:map]
+  declare :sprite_width, [:map, :sprite]
   
   # Returns the height of the generated sprite map
   def sprite_height(map, sprite=nil)
@@ -31,22 +31,22 @@ module Compass::SassExtensions::Functions::Sprites
     _, height = image_dimensions(file)
     Sass::Script::Number.new(height, ["px"])
   end
-  register_sass_function :sprite_height, [:map]
-  register_sass_function :sprite_height, [:map, :sprite]
+  declare :sprite_height, [:map]
+  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
-  register_sass_function :sprite_names, [:map]
+  declare :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
-  register_sass_function :sprite_path, [:map]
+  declare :sprite_path, [:map]
 
   # Returns the sprite file as an inline image
   #    @include "icon/*.png";
@@ -59,7 +59,7 @@ module Compass::SassExtensions::Functions::Sprites
     path = map.filename
     inline_image_string(data(path), compute_mime_type(path))
   end
-  register_sass_function :inline_sprite, [:map]
+  declare :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:
@@ -74,7 +74,7 @@ module Compass::SassExtensions::Functions::Sprites
     kwargs.extend VariableReader
     Compass::SassExtensions::Sprites::SpriteMap.from_uri(glob, self, kwargs)
   end
-  register_sass_function :sprite_map, [:glob], :var_kwargs => true
+  declare :sprite_map, [:glob], :var_kwargs => true
 
   # Returns the image and background position for use in a single shorthand property:
   #
@@ -98,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
-  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]
+  declare :sprite, [:map, :sprite]
+  declare :sprite, [:map, :sprite, :offset_x]
+  declare :sprite, [:map, :sprite, :offset_x, :offset_y]
+  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.
@@ -109,7 +109,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite-map-name")
     Sass::Script::String.new(map.name)
   end
-  register_sass_function :sprite_name, [:sprite]
+  declare :sprite_name, [:sprite]
 
   # Returns the path to the original image file for the sprite with the given name
   def sprite_file(map, sprite)
@@ -122,7 +122,7 @@ module Compass::SassExtensions::Functions::Sprites
       missing_image!(map, sprite)
     end
   end
-  register_sass_function :sprite_file, [:map, :sprite]
+  declare :sprite_file, [:map, :sprite]
 
   # Returns boolean if sprite has a parent
   def sprite_does_not_have_parent(map, sprite)
@@ -132,7 +132,7 @@ module Compass::SassExtensions::Functions::Sprites
     Sass::Script::Bool.new map.image_for(sprite.value).parent.nil?
   end
   
-  register_sass_function :sprite_does_not_have_parent, [:map, :sprite]
+  declare :sprite_does_not_have_parent, [:map, :sprite]
 
   #return the name of the selector file
   def sprite_selector_file(map, sprite, selector)
@@ -145,7 +145,7 @@ module Compass::SassExtensions::Functions::Sprites
     raise Sass::SyntaxError, "Sprite: #{sprite.value} does not have a #{selector} state"
   end
 
-  register_sass_function :sprite_selector_file, [:map, :sprite, :selector]
+  declare :sprite_selector_file, [:map, :sprite, :selector]
 
   # Returns boolean if sprite has the selector
   def sprite_has_selector(map, sprite, selector)
@@ -158,7 +158,7 @@ module Compass::SassExtensions::Functions::Sprites
     Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value)
   end
   
-  register_sass_function :sprite_has_selector, [:map, :sprite, :selector]
+  declare :sprite_has_selector, [:map, :sprite, :selector]
 
   # Determines if the CSS selector is valid
   IDENTIFIER_RX = /\A#{Sass::SCSS::RX::IDENT}\Z/
@@ -175,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
-  register_sass_function :sprite_url, [:map]
+  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:
@@ -237,11 +237,11 @@ module Compass::SassExtensions::Functions::Sprites
     end
     Sass::Script::List.new([x, y],:space)
   end
-  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]
+  declare :sprite_position, [:map]
+  declare :sprite_position, [:map, :sprite]
+  declare :sprite_position, [:map, :sprite, :offset_x]
+  declare :sprite_position, [:map, :sprite, :offset_x, :offset_y]
+  declare :sprite_position, [:map, :sprite, :offset_x, :offset_y, :use_percentages]
 
 protected
 

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

@@ -13,20 +13,21 @@ module Compass
         NO_REPEAT = 'no-repeat'
 
         VALID_REPEATS = [REPEAT_Y, REPEAT_X, NO_REPEAT]
-        
-        attr_reader :relative_file, :options, :base
+
+        attr_reader :relative_file, :options, :base, :name
         attr_accessor :top, :left
 
         def initialize(base, relative_file, options)
           @base, @relative_file, @options = base, relative_file, options
           @left = @top = 0
+          @name = File.basename(relative_file, '.png')
         end
-        
+
         # The Full path to the image
         def file
           @file ||= find_file
         end
-        
+
         def find_file
           Compass.configuration.sprite_load_path.compact.each do |path|
             f = File.join(path, relative_file)
@@ -35,33 +36,28 @@ module Compass
             end
           end
         end
-        
+
         # Width of the image
         def width
           dimensions.first
         end
-        
+
         def size
           @size ||= File.size(file)
         end
-        
+
         # Height of the image
         def height
           dimensions.last
         end
-        
-        # Basename of the image
-        def name
-          @name ||= File.basename(relative_file, '.png')
-        end
 
         def get_var_file(var)
           options.get_var "#{base.name}_#{name}_#{var}"
         end
 
         # Value of <tt> $#{name}-repeat </tt> or <tt> $repeat </tt>
-        def repeat 
-          @repeat ||= begin 
+        def repeat
+          @repeat ||= begin
             rep = (get_var_file("repeat") || options.get_var("repeat") || Sass::Script::String.new(NO_REPEAT)).value
             unless VALID_REPEATS.include? rep
               raise SpriteException, "Invalid option for repeat \"#{rep}\" - valid options are #{VALID_REPEATS.join(', ')}"
@@ -85,14 +81,14 @@ module Compass
 
         # Value of <tt> $#{name}-position </tt> or <tt> $position </tt> defaults to <tt>0px</tt>
         def position
-          @position||= get_var_file("position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
+          @position ||= get_var_file("position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
         end
-        
+
         # Offset within the sprite
         def offset
           @offset ||= (position.unitless? || position.unit_str == "px") ? position.value : 0
         end
-               
+
         # Spacing between this image and the next
         def spacing
           @spacing ||= (get_var_file("spacing") || options.get_var("spacing") || Sass::Script::Number.new(0, ['px'])).value
@@ -102,37 +98,37 @@ module Compass
         def digest
           Digest::MD5.file(file).hexdigest
         end
-        
+
         # mtime of this file
         def mtime
           File.mtime(file)
         end
-        
+
         # Is hover selector
         def hover?
           name =~ HOVER
         end
-        
+
         # Hover selector Image object if exsists
         def hover
           base.get_magic_selector_image(name, 'hover')
         end
-        
+
         # Is target selector
         def target?
           name =~ TARGET
         end
-        
+
         # Target selector Image object if exsists
         def target
           base.get_magic_selector_image(name, 'target')
         end
-        
+
         # Is active selector
         def active?
           name =~ ACTIVE
         end
-        
+
         # Active selector Image object if exsists
         def active
           base.get_magic_selector_image(name, 'active')
@@ -142,23 +138,22 @@ module Compass
         def focus?
           name =~ FOCUS
         end
-        
+
         # Active selector Image object if exsists
         def focus
           base.get_magic_selector_image(name, 'focus')
         end
-        
+
         def parent
           if [hover?, target?, active?, focus?].any?
             PARENT.match name
             base.image_for($1)
           end
         end
-        
-                
+
         private
           def dimensions
-            @dimensions ||= Compass::SassExtensions::Functions::ImageSize::ImageProperties.new(file).size
+            @dimensions ||= Compass::Core::SassExtensions::Functions::ImageSize::ImageProperties.new(file).size
           end
       end
     end

data/lib/compass/sprite_importer/content.erb

@@ -48,7 +48,7 @@ $<%= name %>-sprite-base-class : ".<%= name %>#{$<%= name %>-class-separator}spr
   } 
 } @else {
   #{$<%= name %>-sprite-base-class} {
-    background-image: $<%= name %>-sprites;
+    background-image: sprite-url($<%= name %>-sprites);
     background-repeat: no-repeat;
   }
 }

data/lib/compass/util.rb

@@ -2,7 +2,7 @@ module Compass::Util
   extend self
 
   def compass_warn(*args)
-    Sass::Util.warn(*args)
+    Sass::Util.sass_warn(*args)
   end
 
   def blank?(value)

data/lib/compass/version.rb

@@ -1,17 +1,14 @@
 module Compass
   module Version
-    # Returns a hash representing the version.
-    # The :major, :minor, and :teeny keys have their respective numbers.
-    # The :string key contains a human-readable string representation of the version.
-    # The :rev key will have the current revision hash.
+    # Returns a hash representing the semantic version of the current compass release.
+    # See http://semver.org/ for more details.
     #
-    # This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum
+    # The :major, :minor, and :patch keys have their respective release numbers.
+    # The :string key contains a human-readable string representation of the version.
+    # The :prerelease key will have the current pre-release state
+    # The :build key will have the current pre-release build
     def version
-      if defined?(@version)
-        @version
-      else
-        read_version
-      end
+      @version ||= read_version
     end
 
     protected
@@ -21,34 +18,20 @@ module Compass
     end
 
     def read_version
-      require 'yaml'
-      @version = YAML::load(File.read(scope('VERSION.yml')))
-      @version[:teeny]  = @version[:patch]
-      @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
-      @version[:string] << ".#{@version[:patch]}" if @version[:patch]
-      @version[:string] << ".#{@version[:build]}" if @version[:build]
-      @version[:string] << ".#{@version[:state]}" if @version[:state]
-      @version[:string] << ".#{@version[:iteration]}" if @version[:iteration]
-      if !ENV['OFFICIAL'] && r = revision
-        @version[:string] << ".#{r[0..6]}"
-      end
-      @version
+      v = File.read(scope('VERSION')).strip
+      segments = v.split(".")
+      version_hash = {:string => v}
+      version_hash[:major] = segments.shift
+      version_hash[:minor] = segments.shift
+      version_hash[:patch] = segments.shift
+      version_hash[:prerelease] = segments.shift
+      version_hash[:build] = segments.shift
+      version_hash
     end
-
-    def revision
-      revision_from_git
-    end
-
-    def revision_from_git
-      if File.exists?(scope('.git/HEAD'))
-        Dir.chdir scope(".") do
-          `git rev-parse HEAD`
-        end
-      end
-    end
-
   end
+
   extend Compass::Version
+
   def self.const_missing(const)
     # This avoid reading from disk unless the VERSION is requested.
     if const == :VERSION

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

@@ -1,4 +1,4 @@
 @font-face {
   font-family: "font1";
-  src: url('/tmp/fonts/font1.eot');
-  src: url('/tmp/fonts/font1.eot?#iefix') format('embedded-opentype'), url('/tmp/fonts/font1.woff') format('woff'); }
+  src: url('/fonts/font1.eot');
+  src: url('/fonts/font1.eot?#iefix') format('embedded-opentype'), url('/fonts/font1.woff') format('woff'); }

data/test/fixtures/stylesheets/envtest/tmp/env.css

@@ -2,10 +2,10 @@
   env: production; }
 
 .time {
-  time: 2013-11-21; }
+  time: 2013-11-27; }
 
 .date {
-  date: 2013-11-21; }
+  date: 2013-11-27; }
 
 .filename {
   file: env.scss; }