merge

Gemfile

@@ -6,7 +6,7 @@ gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "3.0.0"
 gem "css_parser", "~> 1.0.1"
-gem "sass", ">= 3.1.0.alpha.218"
+gem "sass", "3.1.0.alpha.249"
 gem "haml", "~> 3.1.0.alpha"
 gem "rcov"
 gem "rubyzip"

Gemfile.lock

@@ -1,9 +1,13 @@
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     compass (0.11.beta.2.a486129)
+=======
+    compass (0.11.beta.2.0d29379)
+>>>>>>> 51e21b08b957a7156235dfdb93c40122873d68e0
       chunky_png (~> 0.12.0)
-      sass (>= 3.1.0.alpha.218)
+      sass (>= 3.1.0.alpha.249)
 
 GEM
   remote: http://rubygems.org/
@@ -105,7 +109,7 @@ GEM
     ruby-json (1.1.2)
     ruby-prof (0.9.2)
     rubyzip (0.9.4)
-    sass (3.1.0.alpha.221)
+    sass (3.1.0.alpha.249)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
@@ -128,4 +132,4 @@ DEPENDENCIES
   rspec (~> 2.0.0)
   ruby-prof
   rubyzip
-  sass (>= 3.1.0.alpha.218)
+  sass (= 3.1.0.alpha.249)

VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :state: beta
-:build: 2
+:build: 3

compass.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gemspec|
   gemspec.rubygems_version = "1.3.5"
   gemspec.summary = %q{A Real Stylesheet Framework}
 
-  gemspec.add_dependency 'sass', '>= 3.1.0.alpha.218'
+  gemspec.add_dependency 'sass', '>= 3.1.0.alpha.249'
   gemspec.add_dependency 'chunky_png', '~> 0.12.0'
 
   gemspec.files = %w(README.markdown LICENSE.markdown VERSION.yml Rakefile)

doc-src/Gemfile

@@ -8,7 +8,7 @@ gem 'mime-types'
 gem 'serve', "1.0.0"
 gem 'nokogiri'
 gem 'coderay'
-gem 'sass', ">= 3.1.0.alpha.50"
+gem 'sass', ">= 3.1.0.alpha.249"
 gem 'fssm', '0.1.2'
 gem 'haml', ">= 3.1.0.alpha.36"
 gem 'rake'

doc-src/Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 PATH
   remote: ..
   specs:
-    compass (0.11.beta.2.65cf2f9)
+    compass (0.11.beta.2.0d29379)
       chunky_png (~> 0.12.0)
-      sass (>= 3.1.0.alpha.218)
+      sass (>= 3.1.0.alpha.249)
 
 GEM
   remote: http://rubygems.org/
@@ -34,7 +34,7 @@ GEM
     rake (0.8.7)
     rdiscount (1.6.5)
     ruby-prof (0.9.2)
-    sass (3.1.0.alpha.221)
+    sass (3.1.0.caring.0)
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)
@@ -62,6 +62,6 @@ DEPENDENCIES
   rake
   rdiscount
   ruby-prof
-  sass (>= 3.1.0.alpha.50)
+  sass (>= 3.1.0.alpha.249)
   serve (= 1.0.0)
   thor

doc-src/content/CHANGELOG.markdown

@@ -14,25 +14,40 @@ The Documentation for the [latest stable release](http://compass-style.org/docs/
 
 The Documentation for the [latest preview release](http://beta.compass-style.org/)
 
-0.11.beta.3 (UNRELEASED)
+0.11.beta.3 (3/15/2011)
 ------------------------
-* There is a new typography module: Vertical Rhythm.
-  This makes it easier to align the typography of your page to a common rhythm.
+
+### Compass CSS3
+
+* A new CSS3 mixin for [appearance](/reference/compass/css3/appearance/) was added.
+* The font-face mixin has been updated again with the [syntax recommendations
+  from font-spring](http://www.fontspring.com/blog/the-new-bulletproof-font-face-syntax).
+  The API has not changed.
+
+### Compass Typography
+
 * Some text-based mixins have been moved from utilities to the new
   typography module. The old imports are deprecated now.
   Affected modules: utilities/links, utilities/lists, and utilities/text and
   their sub-modules.
-* You can now register callbacks for compilation events so that you can take
-  custom actions when they occur. For instance, you might want to notify
-  Growl when a stylesheet compilation error occurs.
+* There is a new typography module: [Vertical Rhythm](/reference/compass/typography/vertical_rhythm/).
+  This makes it easier to align the typography of your page to a common rhythm.
+
+### Compass Utilities
+
+* A new mixin `reset-float` is available in the [float module](/reference/compass/utilities/general/float/#mixin-reset-float) that makes it easier to reset the floats introduced from that module.
 * A new mixin `reset-float` is available in the [float module](/reference/compass/utilities/general/float/#mixin-reset-float) that makes it easier to reset the floats introduced from that module.
-* Reset mixins have been updated based on [Eric Meyer's CSS Reset v2.0](http://meyerweb.com/eric/tools/css/reset/index.html). HTML5 support is included by default.
-  For the legacy projects, you can adjust your imports to reference the the [legacy reset](/reference/compass/reset/) or [legacy reset utilities](/reference/compass/reset/utilities/).
 * A new module has been added to create readable text against an arbitrary background color based on the lightness of the background: [compass/utilities/color/contrast](/reference/compass/utilities/color/contrast/).
 * The comma-delimited-list has been renamed to delimited-list and
   generalized to accept a delimiter which defaults to a comma.
   The old function continues to exist, but is deprecated.
-* A new CSS3 mixin for [appearance](/reference/compass/css3/appearance/) was added.
+
+### Compass Internals
+
+* You can now register callbacks for compilation events so that you can take
+  custom actions when they occur. For instance, you might want to notify
+  Growl when a stylesheet compilation error occurs.
+* Bug fixes & performance improvements.
 
 0.11.beta.2 (02/01/2011)
 ------------------------

frameworks/compass/stylesheets/compass/css3/_font-face.scss

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 @import "shared";
 
 // Cross-browser support for @font-face. Supports IE, Gecko, Webkit, Opera.
@@ -14,19 +13,20 @@
 // If you need to generate other formats check out the Font Squirrel
 // [font generator](http://www.fontsquirrel.com/fontface/generator)
 
-@mixin font-face($name, $font-files, $eot: false) {
+@mixin font-face(
+  $name, 
+  $font-files, 
+  $eot: false
+) {
+  $iefont: unquote("#{$eot}?iefix");
   @font-face {
     font-family: quote($name);
-    @if $eot { src: font-url($eot); }
-    src: local("☺"), $font-files; 
-  }
-  @media screen and (max-device-width: 480px) {
-    @font-face {
-      font-family: quote($name);   
-      src: $font-files;
+    @if $eot {
+      src: font-url($eot);
+      $font-files: font-url($iefont) unquote("format('eot')"), $font-files; 
     }
+    src: $font-files; 
   }
- 
 }
 
 // EXAMPLE

frameworks/compass/stylesheets/compass/css3/_transform.scss

@@ -198,10 +198,10 @@ $default-skew-y      : 5deg                  !default;
 //
 //      @include transform-style( [ style ] )
 //
-// where `style` can be either `flat` or `preserves-3d`
-// browsers default to `flat`, mixin defaults to `preserves-3d`
-@mixin transform-style($style: preserves-3d) {
-  @include experimental(perspective-origin, $style,
+// where `style` can be either `flat` or `preserve-3d`
+// browsers default to `flat`, mixin defaults to `preserve-3d`
+@mixin transform-style($style: preserve-3d) {
+  @include experimental(transform-style, $style,
     not -moz, -webkit, not -o, not -ms, not -khtml, official
   );
 }

lib/compass/compiler.rb

@@ -3,7 +3,7 @@ module Compass
 
     include Actions
 
-    attr_accessor :working_path, :from, :to, :options
+    attr_accessor :working_path, :from, :to, :options, :staleness_checker, :importer
 
     def initialize(working_path, from, to, options)
       self.working_path = working_path
@@ -12,6 +12,8 @@ module Compass
       self.options = options
       self.options[:cache_location] ||= determine_cache_location
       Compass.configure_sass_plugin!
+      self.importer = Sass::Importers::Filesystem.new(from)
+      self.staleness_checker = Sass::Plugin::StalenessChecker.new(options)
     end
 
     def determine_cache_location
@@ -23,6 +25,10 @@ module Compass
       @sass_files = self.options[:sass_files] || Dir.glob(separate("#{from}/**/#{'[^_]' if exclude_partials}*.s[ac]ss"))
     end
 
+    def relative_stylesheet_name(sass_file)
+      sass_file[("#{from}/".length)..-1]
+    end
+
     def stylesheet_name(sass_file)
       sass_file[("#{from}/".length)..-6]
     end
@@ -42,11 +48,15 @@ module Compass
     # Returns the sass file that needs to be compiled, if any.
     def out_of_date?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
+        return sass_filename if needs_update?(css_filename, sass_filename)
       end
       false
     end
 
+    def needs_update?(css_filename, sass_filename)
+      staleness_checker.stylesheet_needs_update?(css_filename, relative_stylesheet_name(sass_filename), importer)
+    end
+
     # Determines if the configuration file is newer than any css file
     def new_config?
       config_file = Compass.detect_configuration_file
@@ -123,7 +133,7 @@ module Compass
     end
 
     def should_compile?(sass_filename, css_filename)
-      options[:force] || Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
+      options[:force] || needs_update?(css_filename, sass_filename)
     end
 
     # A sass engine for compiling a single file.

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

@@ -1,9 +1,5 @@
 @charset "UTF-8";
 @font-face {
   font-family: "font1";
-  src: local("☺"), url('/tmp/fonts/font1.woff') format('woff'); }
-
-@media screen and (max-device-width: 480px) {
-  @font-face {
-    font-family: "font1";
-    src: url('/tmp/fonts/font1.woff') format('woff'); } }
+  src: url('/tmp/fonts/font1.eot');
+  src: url('/tmp/fonts/font1.eot?iefix') format('eot'), url('/tmp/fonts/font1.woff') format('woff'); }

test/fixtures/stylesheets/compass/css/transform.css

@@ -40,8 +40,8 @@
   perspective-origin: 25% 25%; }
 
 .transform-style {
-  -webkit-perspective-origin: preserves-3d;
-  perspective-origin: preserves-3d; }
+  -webkit-transform-style: preserve-3d;
+  transform-style: preserve-3d; }
 
 .backface-visibility {
   -webkit-backface-visibility: hidden;

test/fixtures/stylesheets/compass/sass/fonts.sass

@@ -1,3 +1,3 @@
 @import compass/css3/font-face
 
-+font-face("font1", font-files("font1.woff", woff))
++font-face("font1", font-files("font1.woff", woff), "font1.eot")