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

data/frameworks/compass/stylesheets/compass/typography/lists/_horizontal-list.scss

@@ -19,6 +19,7 @@
 @import "compass/utilities/general/clearfix";
 @import "compass/utilities/general/reset";
 @import "compass/utilities/general/float";
+@import "compass/support";
 
 // Can be mixed into any selector that target a ul or ol that is meant
 // to have a horizontal layout. Used to implement +horizontal-list.
@@ -31,7 +32,7 @@
 //
 // :last-child is not fully supported
 // see http://www.quirksmode.org/css/contents.html#t29 for the support matrix
-// 
+//
 // IE8 ignores rules that are included on the same line as :last-child
 // see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
 //
@@ -45,9 +46,10 @@
       left: $padding;
       right: $padding;
     }
-    &:first-child, &.first { padding-#{$direction}: 0; }
+    &:first-child #{if($legacy-support-for-ie6, ', &.first', '')} { padding-#{$direction}: 0; }
     &:last-child { padding-#{opposite-position($direction)}: 0; }
-    &.last { padding-#{opposite-position($direction)}: 0; }
+    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+      &.last { padding-#{opposite-position($direction)}: 0; } }
   }
 }
 

data/frameworks/compass/stylesheets/compass/typography/lists/_inline-list.scss

@@ -1,5 +1,6 @@
-// makes a list inline.
+@import "compass/support";
 
+// makes a list inline.
 @mixin inline-list {
   list-style-type: none;
   &, & li {
@@ -30,8 +31,10 @@
     &:last-child {
       &:after { content: ""; }
     }
-    &.last {
-      &:after { content: ""; }
+    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+      &.last {
+        &:after { content: ""; }
+      }
     }
   }
 }

data/frameworks/compass/stylesheets/compass/typography/text/_ellipsis.scss

@@ -19,7 +19,7 @@ $use-mozilla-ellipsis-binding: false !default;
     not -khtml,
     official
   );
-  @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
+  @if $legacy-support-for-mozilla and $use-mozilla-ellipsis-binding {
     -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));    
   }
 }

data/frameworks/compass/stylesheets/compass/typography/text/_replacement.scss

@@ -1,16 +1,27 @@
+// Indicates the direction you prefer to move your text
+// when hiding it.
+//
+// `left` is more robust, especially in older browsers.
+// `right` seems have better runtime performance.
+$hide-text-direction: left !default;
+
 // Hides html text and replaces it with an image.
 // If you use this on an inline element, you will need to change the display to block or inline-block.
 // Also, if the size of the image differs significantly from the font size, you'll need to set the width and/or height.
 //
 // Parameters:
 //
-// * `img` -- the relative path from the project image directory to the image.
+// * `img` -- the relative path from the project image directory to the image, or a url literal.
 // * `x` -- the x position of the background image.
 // * `y` -- the y position of the background image.
 @mixin replace-text($img, $x: 50%, $y: 50%) {
   @include hide-text;
   background: {
-    image: image-url($img);
+    @if is-url($img) {
+      image: $img;
+    } @else {
+      image: image-url($img);
+    }
     repeat: no-repeat;
     position: $x $y;
   };
@@ -18,18 +29,33 @@
 
 // Like the `replace-text` mixin, but also sets the width
 // and height of the element according the dimensions of the image.
-@mixin replace-text-with-dimensions($img, $x: 50%, $y: 50%) {
-  @include replace-text($img, $x, $y);
+//
+// If you set `$inline` to true, then an inline image (data uri) will be used.
+@mixin replace-text-with-dimensions($img, $x: 50%, $y: 50%, $inline: false) {
+  @include replace-text(if($inline, inline-image($img), $img), $x, $y);
   width: image-width($img);
   height: image-height($img);
 }
 
 // Hides text in an element so you can see the background.
-@mixin hide-text {
-  // slightly wider than the box prevents issues with inline-block elements
-  text-indent: 110%;
-  white-space: nowrap;
-  overflow: hidden;
+//
+// The direction indicates how the text should be moved out of view.
+//
+// See `$hide-text-direction` for more information and to set this globally
+// for your application.
+@mixin hide-text($direction: $hide-text-direction) {
+  @if $direction == left {
+    $approximate-em-value: 12px / 1em;
+    $wider-than-any-screen: -9999em;
+    text-indent: $wider-than-any-screen * $approximate-em-value;
+    overflow: hidden;
+    text-align: left;
+  } @else {
+    // slightly wider than the box prevents issues with inline-block elements
+    text-indent: 110%;
+    white-space: nowrap;
+    overflow: hidden;
+  }
 }
 
 // Hides text in an element by squishing the text into oblivion.

data/frameworks/compass/stylesheets/compass/utilities/general/_float.scss

@@ -1,3 +1,5 @@
+@import "compass/support";
+
 // Implementation of float:left with fix for the
 // [double-margin bug in IE5/6](http://www.positioniseverything.net/explorer/doubled-margin.html)
 @mixin float-left {
@@ -11,8 +13,9 @@
 // Direction independent float mixin that fixes the
 // [double-margin bug in IE5/6](http://www.positioniseverything.net/explorer/doubled-margin.html)
 @mixin float($side: left) {
-  display: inline;
-  float: unquote($side); }
+  float: unquote($side);
+  @if $legacy-support-for-ie6 {
+    display: inline; } }
 
 // Resets floated elements back to their default of `float: none` and defaults
 // to `display: block` unless you pass `inline` as an argument
@@ -27,4 +30,5 @@
 //         +reset-float
 @mixin reset-float($display: block) {
   float: none;
-  display: $display; }
+  @if $legacy-support-for-ie6 {
+    display: $display; } }

data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss

@@ -9,7 +9,7 @@ $default-has-layout-approach: zoom !default;
 // to gain the "hasLayout" property in internet explorer.
 // More information on [hasLayout](http://reference.sitepoint.com/css/haslayout).
 @mixin has-layout($approach: $default-has-layout-approach) {
-  @if $legacy-support-for-ie {
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
     @if $approach == zoom {
       @include has-layout-zoom;
     } @else if $approach == block {
@@ -28,7 +28,7 @@ $default-has-layout-approach: zoom !default;
 }
 
 @mixin has-layout-block {
-  @if $legacy-support-for-ie {
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
     // This makes ie6 get layout
     display: inline-block;
     // and this puts it back to block

data/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss

@@ -11,8 +11,12 @@ $sprite-selectors: hover, target, active !default;
 // Set the background position of the given sprite `$map` to display the
 // sprite of the given `$sprite` name. You can move the image relative to its
 // natural position by passing `$offset-x` and `$offset-y`.
-@mixin sprite-background-position($map, $sprite, $offset-x: 0, $offset-y: 0) {
-  background-position: sprite-position($map, $sprite, $offset-x, $offset-y);  
+// The background-position will be returned in pixels. By passing `true
+// for `$use_percentages`, you get percentages instead.
+@mixin sprite-background-position($map, $sprite, $offset-x: 0, $offset-y: 0,
+$use-percentages: false) {
+  background-position: sprite-position($map, $sprite, $offset-x, $offset-y,
+  $use-percentages);
 }
 
 
@@ -24,25 +28,31 @@ $disable-magic-sprite-selectors:false !default;
 // class or you can specify the `sprite-url` explicitly like this:
 //
 //     background: $map no-repeat;
-@mixin sprite($map, $sprite, $dimensions: false, $offset-x: 0, $offset-y: 0) {
-  @include sprite-background-position($map, $sprite, $offset-x, $offset-y);
+@mixin sprite($map, $sprite, $dimensions: false, $offset-x: 0, $offset-y: 0,
+$use-percentages: false) {
+  @include sprite-background-position($map, $sprite, $offset-x, $offset-y,
+  $use-percentages);
   @if $dimensions {
     @include sprite-dimensions($map, $sprite);
   }
   @if not $disable-magic-sprite-selectors {
-    @include sprite-selectors($map, $sprite, $sprite, $offset-x, $offset-y);
+    @include sprite-selectors($map, $sprite, $sprite, $offset-x, $offset-y,
+    $use-percentages);
   }
 }
 
 // Include the selectors for the `$sprite` given the `$map` and the 
 // `$full-sprite-name`
 // @private
-@mixin sprite-selectors($map, $sprite-name, $full-sprite-name, $offset-x: 0, $offset-y: 0) {
+@mixin sprite-selectors($map, $sprite-name, $full-sprite-name, $offset-x: 0,
+$offset-y: 0, $use-percentages: false) {
   @each $selector in $sprite-selectors {
     @if sprite_has_selector($map, $sprite-name, $selector) {
       @if sprite_has_valid_selector("#{$full-sprite-name}-#{$selector}") {
         &:#{$selector}, &.#{$full-sprite-name}-#{$selector} {
-            @include sprite-background-position($map, "#{$sprite-name}_#{$selector}", $offset-x, $offset-y);
+            @include sprite-background-position($map,
+            "#{$sprite-name}_#{$selector}", $offset-x, $offset-y, 
+            $use-percentages);
         }
       }
     }
@@ -55,16 +65,21 @@ $disable-magic-sprite-selectors:false !default;
 // If a base class is provided, then each class will extend it.
 //
 // If `$dimensions` is `true`, the sprite dimensions will specified.
-@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false, $prefix: sprite-map-name($map), $offset-x: 0, $offset-y: 0) {
+// Positions are returned in pixel units. Set `$use_percentages` to true to
+// instead get percentages.
+@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false,
+$prefix: sprite-map-name($map), $offset-x: 0, $offset-y: 0, $use-percentages:
+false) {
   @each $sprite-name in $sprite-names {
     @if sprite_does_not_have_parent($map, $sprite-name) {
       $full-sprite-name: "#{$prefix}-#{$sprite-name}";
       @if sprite_has_valid_selector($full-sprite-name) {
         .#{$full-sprite-name} {
           @if $base-class { @extend #{$base-class}; }
-          @include sprite($map, $sprite-name, $dimensions, $offset-x, $offset-y);
+          @include sprite($map, $sprite-name, $dimensions, $offset-x, $offset-y, 
+          $use-percentages);
         }
       }
     }
   }
-}
+}

data/frameworks/compass/stylesheets/compass/utilities/tables/_borders.scss

@@ -1,3 +1,5 @@
+@import "compass/support";
+
 @mixin outer-table-borders($width: 2px, $color: black) {
   border: $width solid $color;
   thead {
@@ -7,7 +9,7 @@
     th, td {
       border-top: $width solid $color; } }
   th {
-    &:first-child {
+    &:first-child #{if($legacy-support-for-ie6, ', &.first', '')} {
       border-right: $width solid $color; } } }
 
 @mixin inner-table-borders($width: 2px, $color: black) {
@@ -17,17 +19,20 @@
       bottom: $width solid $color;
       left-width: 0px;
       top-width: 0px; };
-    &:last-child,
-    &.last {
-      border-right-width: 0px; } }
+    &:last-child {
+      border-right-width: 0px; }
 
-// IE8 ignores rules that are included on the same line as :last-child
-// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
+    // IE8 ignores rules that are included on the same line as :last-child
+    // see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
+    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
+      &.last {
+        border-right-width: 0px; } } }
 
   tbody, tfoot {
     tr:last-child {
       th, td {
         border-bottom-width: 0px; } }
-    tr.last {
-      th, td {
-        border-bottom-width: 0px; } } } }
+    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
+      tr.last {
+        th, td {
+          border-bottom-width: 0px; } } } } }

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util browser_support sass_extensions version errors quick_cache logger).each do |lib|
+%w(dependencies util browser_support sass_extensions version errors quick_cache logger actions).each do |lib|
   require "compass/#{lib}"
 end
 
@@ -29,7 +29,7 @@ module Compass
   extend QuickCache
 end
 
-%w(configuration frameworks app_integration actions compiler).each do |lib|
+%w(watcher configuration frameworks app_integration compiler).each do |lib|
   require "compass/#{lib}"
 end
 

data/lib/compass/actions.rb

@@ -10,7 +10,11 @@ module Compass
     # copy/process a template in the compass template directory to the project directory.
     def copy(from, to, options = nil, binary = false)
       options ||= self.options if self.respond_to?(:options)
-      contents = File.new(from).read
+      if binary
+        contents = File.new(from,"rb").read
+      else
+        contents = File.new(from).read
+      end  
       write_file to, contents, options, binary
     end
 

data/lib/compass/commands/project_base.rb

@@ -28,7 +28,13 @@ module Compass
       end
 
       def add_project_configuration
-        Compass.add_project_configuration(options[:configuration_file], :defaults => Compass.configuration_for(options, "cli_defaults")) do
+        defaults = Compass.configuration_for(options, "cli_defaults")
+        if options[:project_type]
+          project_type_config = Compass.configuration_for(options[:project_type])
+          project_type_config.inherit_from!(Compass.default_configuration)
+          defaults.inherit_from!(project_type_config)
+        end
+        Compass.add_project_configuration(options[:configuration_file], :defaults => defaults) do
           options[:project_type]
         end
       end

data/lib/compass/commands/update_project.rb

@@ -9,7 +9,7 @@ module Compass
           Usage: compass compile [path/to/project] [path/to/project/src/file.sass ...] [options]
 
           Description:
-          compile project at the path specified or the current director if not specified.
+          compile project at the path specified or the current directory if not specified.
 
           Options:
         }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
@@ -22,7 +22,7 @@ module Compass
           self.options[:debug_info]= true
         end
 
-        opts.on("--no-debug-info", "Turns on sass's debuging information") do
+        opts.on("--no-debug-info", "Turns off sass's debuging information") do
           self.options[:debug_info]= false
         end
         super

data/lib/compass/commands/watch_project.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'compass/commands/base'
 require 'compass/commands/update_project'
+require 'compass/watcher'
 require 'sass/plugin'
 
 module Compass
@@ -59,97 +60,16 @@ module Compass
       include MemoryDebugger
 
       def perform
-        Signal.trap("INT") do
-          puts ""
-          exit 0
-        end
-
-        check_for_sass_files!(new_compiler_instance)
-        recompile
-
-        require 'fssm'
-
-
-        if options[:poll]
-          require "fssm/backends/polling"
-          # have to silence the ruby warning about chaning a constant.
-          stderr, $stderr = $stderr, StringIO.new
-          FSSM::Backends.const_set("Default", FSSM::Backends::Polling)
-          $stderr = stderr
-        end
 
-        action = FSSM::Backends::Default.to_s == "FSSM::Backends::Polling" ? "polling" : "watching"
+        project_watcher = Compass::Watcher::ProjectWatcher.new(Compass.configuration.project_path, Compass.configuration.watches, options, options[:poll])
 
-        puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop."
+        puts ">>> Compass is watching for changes. Press Ctrl-C to Stop."
         $stdout.flush
+        
+        project_watcher.compile
+        project_watcher.watch!
 
-        begin
-        FSSM.monitor do |monitor|
-          Compass.configuration.sass_load_paths.each do |load_path|
-            load_path = load_path.root if load_path.respond_to?(:root)
-            next unless load_path.is_a? String
-            monitor.path load_path do |path|
-              path.glob '**/*.s[ac]ss'
-
-              path.update &method(:recompile)
-              path.delete {|base, relative| remove_obsolete_css(base,relative); recompile(base, relative)}
-              path.create &method(:recompile)
-            end
-          end
-          Compass.configuration.watches.each do |glob, callback|
-            monitor.path Compass.configuration.project_path do |path|
-              path.glob glob
-              path.update do |base, relative|
-                puts ">>> Change detected to: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-              path.create do |base, relative|
-                puts ">>> New file detected: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-              path.delete do |base, relative|
-                puts ">>> File Removed: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-            end
-          end
-
-        end
-      rescue FSSM::CallbackError => e
-        # FSSM catches exit? WTF.
-        if e.message =~ /exit/
-          exit
-        end
-      end
-      end
 
-      def remove_obsolete_css(base = nil, relative = nil)
-        compiler = new_compiler_instance(:quiet => true)
-        sass_files = compiler.sass_files
-        deleted_sass_files = (last_sass_files || []) - sass_files
-        deleted_sass_files.each do |deleted_sass_file|
-          css_file = compiler.corresponding_css_file(deleted_sass_file)
-          remove(css_file) if File.exists?(css_file)
-        end
-        self.last_sass_files = sass_files
-      end
-
-      def recompile(base = nil, relative = nil)
-        @memory_cache.reset! if @memory_cache
-        compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create])
-        if file = compiler.out_of_date?
-          begin
-            puts ">>> Change detected at "+Time.now.strftime("%T")+" to: #{relative || compiler.relative_stylesheet_name(file)}"
-            $stdout.flush
-            compiler.run
-            GC.start
-          rescue StandardError => e
-            ::Compass::Exec::Helpers.report_error(e, options)
-          end
-        end
       end
 
       class << self