compass 0.11.3 → 0.11.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 11
-:patch: 3
+:patch: 4
 :name: Antares

data/features/command_line.feature

@@ -63,6 +63,15 @@ Feature: Command Line
     And I am told that I can place stylesheets in the sass subdirectory
     And I am told how to compile my sass stylesheets
 
+  Scenario: Compiling a project with errors
+    Given I am using the existing project in test/fixtures/stylesheets/compass
+    And the project has a file named "sass/error.scss" containing:
+      """
+        .broken {
+      """
+    When I run: compass compile
+    Then the command exits with a non-zero error code
+
   Scenario: Creating a bare project with a framework
     When I create a project using: compass create bare_project --using blueprint --bare
     Then an error message is printed out: A bare project cannot be created when a framework is specified.

data/features/step_definitions/command_line_steps.rb

@@ -53,6 +53,13 @@ Given /^I should clean up the directory: (\w+)$/ do |directory|
   @cleanup_directories << directory
 end
 
+Given %r{^the project has a file named "([^"]*)" containing:$} do |arg1, string|
+  File.open(arg1, "w") do |f|
+    f << string
+  end
+end
+
+
 # When Actions are performed
 When /^I create a project using: compass create ([^\s]+) ?(.+)?$/ do |dir, args|
   @cleanup_directories << dir

data/frameworks/blueprint/stylesheets/blueprint/_debug.scss

@@ -1,5 +1,5 @@
 @import "compass/layout/grid-background";
-@import "blueprint/grid";
+@import "grid", "typography";
 
 // Shows a background that can be used to check grid alignment.
 // By default this is a pure css version that only works in browsers
@@ -14,7 +14,7 @@
       $total    : $blueprint-grid-columns,
       $column   : $blueprint-grid-width,
       $gutter   : $blueprint-grid-margin,
-      $baseline : 20px
+      $baseline : $blueprint-font-size * 1.5
     );
   }
 }

data/frameworks/blueprint/stylesheets/blueprint/_form.scss

@@ -59,7 +59,7 @@
     background-color:#fff;
     border: 1px solid $unfocused-border-color;
     &:focus {
-      border: 1px solid $focus-border-color;
+      border-color: $focus-border-color;
     }
   }
   select { background-color:#fff; border-width:1px; border-style:solid; }

data/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss

@@ -24,7 +24,10 @@ $default-box-shadow-spread : false !default;
 // The default shadow inset: inset or false (for standard shadow).
 $default-box-shadow-inset : false !default;
 
-// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box shadows are needed.
+// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box
+// shadows are needed.
+// Each shadow argument should adhere to the standard css3 syntax for the
+// box-shadow property.
 @mixin box-shadow(
   $shadow-1 : default,
   $shadow-2 : false,

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

@@ -15,7 +15,7 @@
 //
 // Example:
 //
-//     +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot")
+//     @include font-face("this name", font-files("this.woff", woff, "this.otf", opentype), "this.eot")
 @mixin font-face(
   $name, 
   $font-files, 

data/frameworks/compass/stylesheets/compass/css3/_images.scss

@@ -83,10 +83,7 @@
 @mixin filter-gradient($start-color, $end-color, $orientation: vertical) {
   @include has-layout;
   $gradient-type: if($orientation == vertical, 0, 1);
-  @if $legacy-support-for-ie8 {
-    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}')";
-  }
-  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
     filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}');
   }
 }

data/frameworks/compass/stylesheets/compass/css3/_opacity.scss

@@ -6,10 +6,7 @@
 //         A number between 0 and 1, where 0 is transparent and 1 is opaque.
 
 @mixin opacity($opacity) {
-  @if $legacy-support-for-ie8 {
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})";
-  }
-  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
     filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
   }
   opacity: $opacity;

data/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss

@@ -9,6 +9,8 @@ $default-text-shadow-v-offset: 0px  !default;
 $default-text-shadow-blur:     1px  !default;
 
 // Provides cross-browser text shadows when one or more shadows are needed.
+// Each shadow argument should adhere to the standard css3 syntax for the
+// text-shadow property.
 @mixin text-shadow(
   $shadow-1 : default,
   $shadow-2 : false,

data/frameworks/compass/stylesheets/compass/css3/_transition.scss

@@ -72,7 +72,7 @@ $default-transition-delay: false !default;
 
 // Transition all-in-one shorthand
 
-@mixin transition(
+@mixin single-transition(
   $properties: $default-transition-property,
   $duration: $default-transition-duration,
   $function: $default-transition-function,
@@ -83,3 +83,37 @@ $default-transition-delay: false !default;
   @if $function { @include transition-timing-function($function); }
   @if $delay { @include transition-delay($delay); }
 }
+
+@mixin transition(
+  $transition-1 : default,
+  $transition-2 : false,
+  $transition-3 : false,
+  $transition-4 : false,
+  $transition-5 : false,
+  $transition-6 : false,
+  $transition-7 : false,
+  $transition-8 : false,
+  $transition-9 : false,
+  $transition-10: false
+) {
+  $legacy: (type-of($transition-1) == string and type-of(if($transition-2, $transition-2, 0)) == number and type-of(if($transition-3, $transition-3, '')) == string and type-of(if($transition-4, $transition-4, 0)) == number and ($transition-2 or $transition-3 or $transition-4));
+  @if $legacy {
+    @warn "Passing separate arguments for a single transition to transition is deprecated. " +
+          "Pass the values as a single space-separated list, or use the single-transition mixin.";
+    @include single-transition(
+      if($transition-1, $transition-1, $default-transition-property),
+      if($transition-2, $transition-2, $default-transition-duration),
+      if($transition-3, $transition-3, $default-transition-funciton),
+      if($transition-4, $transition-4, $default-transition-delay)
+    );
+  }
+  @else {
+    @if $transition-1 == default {
+      $transition-1 : -compass-space-list(compact($default-transition-property, $default-transition-duration, $default-transition-function, $default-transition-delay));
+    }
+    $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
+    @include experimental(transition, $transition,
+      -moz, -webkit, -o, not -ms, not -khtml, official
+    );
+  }
+}

data/frameworks/compass/stylesheets/compass/typography/_text.scss

@@ -1,3 +1,4 @@
 @import "text/ellipsis";
 @import "text/nowrap";
 @import "text/replacement";
+@import "text/force-wrap";

data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss

@@ -10,22 +10,47 @@ $default-rhythm-border-style: solid !default;
 // The IE font ratio is a fact of life. Deal with it.
 $ie-font-ratio: 16px / 100%;
 
+// Set to false if you want to use absolute pixes in sizing your typography.
+$relative-font-sizing: true !default;
+
+// Ensure there is at least this many pixels
+// of vertical padding above and below the text.
+$min-line-padding: 2px;
+
+// $base-font-size but in your output unit of choice.
+// Defaults to 1em when `$relative-font-sizing`
+$font-unit: if($relative-font-sizing, 1em, $base-font-size) !default;
+
 // The basic unit of font rhythm
-$base-rhythm-unit: $base-line-height / $base-font-size * 1em;
+$base-rhythm-unit: $base-line-height / $base-font-size * $font-unit;
 
 // The leader is the amount of whitespace in a line.
 // It might be useful in your calculations
-$base-leader: ($base-line-height - $base-font-size) * 1em / $base-font-size;
+$base-leader: ($base-line-height - $base-font-size) * $font-unit / $base-font-size;
 
 // The half-leader is the amount of whitespace above and below a line.
 // It might be useful in your calculations
 $base-half-leader: $base-leader / 2;
 
+// True if a number has a relative unit
+@function relative-unit($number) {
+  @return unit($number) == "%" or unit($number) == "em" or unit($number) == "rem"
+}
+
+// True if a number has an absolute unit
+@function absolute-unit($number) {
+  @return not (relative-unit($number) or unitless($number));
+}
+
+@if $relative-font-sizing and not relative-unit($font-unit) {
+  @warn "$relative-font-sizing is true but $font-unit is set to #{$font-unit} which is not a relative unit.";
+}
+
 // Establishes a font baseline for the given font-size in pixels
 @mixin establish-baseline($font-size: $base-font-size) {
   body {
     font-size: $font-size / $ie-font-ratio;
-    @include adjust-leading-to(1, $font-size);
+    @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
   }
   html>body {
     font-size: $font-size;
@@ -42,13 +67,19 @@ $base-half-leader: $base-leader / 2;
 // font size should use up. Does not have to be an integer, but it defaults
 // to the smallest integer that is large enough to fit the font.
 // Use $from_size to adjust from a non-base font-size.
-@mixin adjust-font-size-to($to-size, $lines: ceil($to-size / $base-line-height), $from-size: $base-font-size) {
-  font-size: 1em * $to-size / $from-size;
-  @include adjust-leading-to($lines, $to-size);
+@mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) {
+  @if $relative-font-sizing and $from-size != $base-font-size {
+    @warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to";
+  }
+  font-size: $font-unit * $to-size / $from-size;
+  @include adjust-leading-to($lines, if($relative-font-sizing, $to-size, $base-font-size));
 }
 
 @mixin adjust-leading-to($lines, $font-size: $base-font-size) {
-  line-height: 1em * $lines * $base-line-height / $font-size;
+  @if $relative-font-sizing and $font-size != $base-font-size {
+    @warn "$relative-font-sizing is false but a relative font size was passed to adjust-leading-to";
+  }
+  line-height: $font-unit * $lines * $base-line-height / $font-size;
 }
 
 // Calculate rhythm units
@@ -56,32 +87,55 @@ $base-half-leader: $base-leader / 2;
   $lines: 1,
   $font-size: $base-font-size
 ) {
-  $rhythm: 1em * $lines * $base-line-height / $font-size;
+  @if $relative-font-sizing and $font-size != $base-font-size {
+    @warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function";
+  }
+  $rhythm: $font-unit * $lines * $base-line-height / $font-size;
   @return $rhythm;
 }
 
+@function lines-for-font-size($font-size) {
+  $lines: ceil($font-size / $base-line-height);
+  @if $lines * $base-line-height - $font-size < $min-line-padding * 2 {
+    $lines: $lines + 1;
+  }
+  @return $lines;
+}
+
 // Apply leading whitespace
 @mixin leader($lines: 1, $font-size: $base-font-size, $property: margin) {
-  #{$property}-top: rhythm($lines, $font-size);
+  $leader: rhythm($lines, $font-size);
+  @if unit($leader) == px {
+    $leader: floor($leader)
+  }
+  #{$property}-top: $leader;
 }
 
+// Apply leading whitespace as padding
 @mixin padding-leader($lines: 1, $font-size: $base-font-size) {
   @include leader($lines, $font-size, padding);
 }
 
+// Apply leading whitespace as margin
 @mixin margin-leader($lines: 1, $font-size: $base-font-size) {
   @include leader($lines, $font-size, margin);
 }
 
 // Apply trailing whitespace
 @mixin trailer($lines: 1, $font-size: $base-font-size, $property: margin) {
-  #{$property}-bottom: rhythm($lines, $font-size);
+  $leader: rhythm($lines, $font-size);
+  @if unit($leader) == px {
+    $leader: ceil($leader)
+  }
+  #{$property}-bottom: $leader;
 }
 
+// Apply trailing whitespace as padding
 @mixin padding-trailer($lines: 1, $font-size: $base-font-size) {
   @include trailer($lines, $font-size, padding);
 }
 
+// Apply trailing whitespace as margin
 @mixin margin-trailer($lines: 1, $font-size: $base-font-size) {
   @include trailer($lines, $font-size, margin);
 }
@@ -97,19 +151,25 @@ $base-half-leader: $base-leader / 2;
 
 // Apply a border width to any side without destroying the vertical rhythm
 @mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
+  @if $relative-font-sizing and $font-size != $base-font-size {
+    @warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border";
+  }
   border-#{$side}: {
     style: $border-style;
-    width: 1em * $width / $font-size;
+    width: $font-unit * $width / $font-size;
   };
-  padding-#{$side}: 1em / $font-size * ($lines * $base-line-height - $width);
+  padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width);
 }
 
 // Aplly rhythm borders equally to all sides
 @mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
+  @if $relative-font-sizing and $font-size != $base-font-size {
+    @warn "$relative-font-sizing is false but a relative font size was passed to rhythm-borders";
+  }
   border: {
     style: $border-style;
-    width: 1em * $width / $font-size; };
-  padding: 1em / $font-size * ($lines * $base-line-height - $width);
+    width: $font-unit * $width / $font-size; };
+  padding: $font-unit / $font-size * ($lines * $base-line-height - $width);
 }
 
 // Apply a leading rhythm border

data/frameworks/compass/stylesheets/compass/typography/text/_force-wrap.scss

@@ -0,0 +1,12 @@
+// Prevent long urls and text from breaking layouts
+// [originally from perishablepress.com](http://perishablepress.com/press/2010/06/01/wrapping-content/)
+@mixin force-wrap {
+  white-space: pre;           // CSS 2.0
+  white-space: pre-wrap;      // CSS 2.1
+  white-space: pre-line;      // CSS 3.0
+  white-space: -pre-wrap;     // Opera 4-6
+  white-space: -o-pre-wrap;   // Opera 7
+  white-space: -moz-pre-wrap; // Mozilla
+  white-space: -hp-pre-wrap;  // HP Printers
+  word-wrap: break-word;      // IE 5+
+}

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util browser_support sass_extensions version errors quick_cache).each do |lib|
+%w(dependencies util browser_support sass_extensions version errors quick_cache logger).each do |lib|
   require "compass/#{lib}"
 end
 

data/lib/compass/commands/base.rb

@@ -10,7 +10,7 @@ module Compass
       attr_accessor :working_path, :options
 
       def initialize(working_path, options)
-        self.working_path = working_path
+        self.working_path = working_path.to_s
         self.options = options
       end
       
@@ -22,6 +22,14 @@ module Compass
         raise StandardError.new("Not Implemented")
       end
 
+      def successful?
+        !@failed
+      end
+
+      def failed!
+        @failed = true
+      end
+
       protected
 
       def framework

data/lib/compass/commands/project_base.rb

@@ -84,8 +84,8 @@ module Compass
       end
 
       def absolute_path?(path)
-        # This is only going to work on unix, gonna need a better implementation.
-        path.index(File::SEPARATOR) == 0
+        # Pretty basic implementation
+        path.index(File::SEPARATOR) == 0 || path.index(':') == 1
       end
 
       def skip_extension_discovery?

data/lib/compass/commands/update_project.rb

@@ -34,7 +34,8 @@ module Compass
         compiler = new_compiler_instance
         check_for_sass_files!(compiler)
         compiler.clean! if compiler.new_config?
-        compiler.run
+        error_count = compiler.run
+        failed! if error_count > 0
       end
 
       def check_for_sass_files!(compiler)

data/lib/compass/compiler.rb

@@ -6,7 +6,7 @@ module Compass
     attr_accessor :working_path, :from, :to, :options, :sass_options, :staleness_checker, :importer
 
     def initialize(working_path, from, to, options)
-      self.working_path = working_path
+      self.working_path = working_path.to_s
       self.from, self.to = from.gsub('./', ''), to
       self.logger = options.delete(:logger)
       sass_opts = options.delete(:sass) || {}
@@ -82,9 +82,10 @@ module Compass
     end
 
     def run
+      failure_count = 0
       if new_config?
         # Wipe out the cache and force compilation if the configuration has changed.
-        remove options[:cache_location]
+        remove options[:cache_location] if options[:cache_location]
         options[:force] = true
       end
 
@@ -97,6 +98,7 @@ module Compass
           begin
             compile_if_required sass_filename, css_filename
           rescue Sass::SyntaxError => e
+            failure_count += 1
             handle_exception(sass_filename, css_filename, e)
           end
         end
@@ -104,6 +106,7 @@ module Compass
       if options[:time]
         puts "Compilation took #{(result.__duration * 1000).round / 1000.0}s"
       end
+      return failure_count
     end
 
     def compile_if_required(sass_filename, css_filename)

data/lib/compass/configuration.rb

@@ -38,7 +38,8 @@ module Compass
       :color_output,
       :preferred_syntax,
       :disable_warnings,
-      :sprite_engine
+      :sprite_engine,
+      :chunky_png_options
     ].flatten
 
     # Registers a new configuration property.