compass 0.12.0 → 0.12.7

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

@@ -1,7 +1,6 @@
 .single-transition-without-delay {
   -webkit-transition: all 0.6s ease-out;
   -moz-transition: all 0.6s ease-out;
-  -ms-transition: all 0.6s ease-out;
   -o-transition: all 0.6s ease-out;
   transition: all 0.6s ease-out; }
 
@@ -9,28 +8,30 @@
   -webkit-transition: all 0.6s ease-out;
   -webkit-transition-delay: 0.2s;
   -moz-transition: all 0.6s ease-out 0.2s;
-  -ms-transition: all 0.6s ease-out 0.2s;
   -o-transition: all 0.6s ease-out 0.2s;
   transition: all 0.6s ease-out 0.2s; }
 
 .transition-duration-string {
   -webkit-transition-duration: 0.2s, 0.5s, 0.2s;
   -moz-transition-duration: 0.2s, 0.5s, 0.2s;
-  -ms-transition-duration: 0.2s, 0.5s, 0.2s;
   -o-transition-duration: 0.2s, 0.5s, 0.2s;
   transition-duration: 0.2s, 0.5s, 0.2s; }
 
 .transition-duration-list {
   -webkit-transition-duration: 0.2s, 0.5s, 0.2s;
   -moz-transition-duration: 0.2s, 0.5s, 0.2s;
-  -ms-transition-duration: 0.2s, 0.5s, 0.2s;
+  -o-transition-duration: 0.2s, 0.5s, 0.2s;
+  transition-duration: 0.2s, 0.5s, 0.2s; }
+
+.multiple-transition-durations {
+  -webkit-transition-duration: 0.2s, 0.5s, 0.2s;
+  -moz-transition-duration: 0.2s, 0.5s, 0.2s;
   -o-transition-duration: 0.2s, 0.5s, 0.2s;
   transition-duration: 0.2s, 0.5s, 0.2s; }
 
 .single-transform-transition-without-delay {
   -webkit-transition: -webkit-transform 0.6s ease-out;
   -moz-transition: -moz-transform 0.6s ease-out;
-  -ms-transition: -ms-transform 0.6s ease-out;
   -o-transition: -o-transform 0.6s ease-out;
   transition: transform 0.6s ease-out; }
 
@@ -38,34 +39,90 @@
   -webkit-transition: -webkit-transform 0.6s ease-out;
   -webkit-transition-delay: 0.2s;
   -moz-transition: -moz-transform 0.6s ease-out 0.2s;
-  -ms-transition: -ms-transform 0.6s ease-out 0.2s;
   -o-transition: -o-transform 0.6s ease-out 0.2s;
   transition: transform 0.6s ease-out 0.2s; }
 
 .transform-transition {
   -webkit-transition: -webkit-transform 0.6s ease-out;
   -moz-transition: -moz-transform 0.6s ease-out;
-  -ms-transition: -ms-transform 0.6s ease-out;
   -o-transition: -o-transform 0.6s ease-out;
   transition: transform 0.6s ease-out; }
 
 .multiple-transitions {
   -webkit-transition: -webkit-transform 0.6s ease-out, opacity 0.2s ease-in;
   -moz-transition: -moz-transform 0.6s ease-out, opacity 0.2s ease-in;
-  -ms-transition: -ms-transform 0.6s ease-out, opacity 0.2s ease-in;
   -o-transition: -o-transform 0.6s ease-out, opacity 0.2s ease-in;
   transition: transform 0.6s ease-out, opacity 0.2s ease-in; }
 
 .transition-property {
   -webkit-transition-property: -webkit-transform;
   -moz-transition-property: -moz-transform;
-  -ms-transition-property: -ms-transform;
   -o-transition-property: -o-transform;
   transition-property: transform; }
 
+.transition-properties {
+  -webkit-transition-property: -webkit-transform, opacity, width, height, left, top;
+  -moz-transition-property: -moz-transform, opacity, width, height, left, top;
+  -o-transition-property: -o-transform, opacity, width, height, left, top;
+  transition-property: transform, opacity, width, height, left, top; }
+
 .multiple-transition-properties {
   -webkit-transition-property: opacity, -webkit-transform, left;
   -moz-transition-property: opacity, -moz-transform, left;
-  -ms-transition-property: opacity, -ms-transform, left;
   -o-transition-property: opacity, -o-transform, left;
   transition-property: opacity, transform, left; }
+
+.transition-timing {
+  -webkit-transition-timing-function: ease-in;
+  -moz-transition-timing-function: ease-in;
+  -o-transition-timing-function: ease-in;
+  transition-timing-function: ease-in; }
+
+.transition-timings {
+  -webkit-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  -moz-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  -o-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0); }
+
+.transition-timings-list {
+  -webkit-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  -moz-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  -o-transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0);
+  transition-timing-function: ease-in, cubic-bezier(1, 0, 1, 0); }
+
+.transition-timings-string {
+  -webkit-transition-timing-function: ease-in, cubic-bezier(1,0,1,0);
+  -moz-transition-timing-function: ease-in, cubic-bezier(1,0,1,0);
+  -o-transition-timing-function: ease-in, cubic-bezier(1,0,1,0);
+  transition-timing-function: ease-in, cubic-bezier(1,0,1,0); }
+
+.transition-delay {
+  -webkit-transition-delay: 1s;
+  -moz-transition-delay: 1s;
+  -o-transition-delay: 1s;
+  transition-delay: 1s; }
+
+.transition-delays {
+  -webkit-transition-delay: 1s, 2s, 3s;
+  -moz-transition-delay: 1s, 2s, 3s;
+  -o-transition-delay: 1s, 2s, 3s;
+  transition-delay: 1s, 2s, 3s; }
+
+.transition-delays-list {
+  -webkit-transition-delay: 1s, 2s, 3s;
+  -moz-transition-delay: 1s, 2s, 3s;
+  -o-transition-delay: 1s, 2s, 3s;
+  transition-delay: 1s, 2s, 3s; }
+
+.transition-delays-string {
+  -webkit-transition-delay: 1s, 2s, 3s;
+  -moz-transition-delay: 1s, 2s, 3s;
+  -o-transition-delay: 1s, 2s, 3s;
+  transition-delay: 1s, 2s, 3s; }
+
+.regression-912 {
+  -webkit-transition: background-color 0.5s ease-in, width 0.5s ease-out, height 0.5s ease-in, top 0.5s ease-out;
+  -webkit-transition-delay: 0s, 0s, 0s, 0s;
+  -moz-transition: background-color 0.5s ease-in 0s, width 0.5s ease-out 0s, height 0.5s ease-in 0s, top 0.5s ease-out 0s;
+  -o-transition: background-color 0.5s ease-in 0s, width 0.5s ease-out 0s, height 0.5s ease-in 0s, top 0.5s ease-out 0s;
+  transition: background-color 0.5s ease-in 0s, width 0.5s ease-out 0s, height 0.5s ease-in 0s, top 0.5s ease-out 0s; }

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

@@ -1,45 +1,45 @@
-body {
-  font-size: 87.5%;
-  line-height: 1.143em; }
+* html {
+  font-size: 87.5%; }
 
-html > body {
-  font-size: 14px; }
+html {
+  font-size: 14px;
+  line-height: 1.14286em; }
 
 .small {
-  font-size: 0.857em;
-  line-height: 1.333em; }
+  font-size: 0.85714em;
+  line-height: 1.33333em; }
 
 .padded {
-  margin-top: 1.143em;
-  padding-top: 1.143em;
-  padding-bottom: 1.143em;
-  margin-bottom: 1.143em; }
+  margin-top: 1.14286em;
+  padding-top: 1.14286em;
+  padding-bottom: 1.14286em;
+  margin-bottom: 1.14286em; }
 
 .small-padded {
-  font-size: 0.857em;
-  line-height: 1.333em;
-  margin-top: 1.333em;
-  padding-top: 1.333em;
-  padding-bottom: 1.333em;
-  margin-bottom: 1.333em; }
+  font-size: 0.85714em;
+  line-height: 1.33333em;
+  margin-top: 1.33333em;
+  padding-top: 1.33333em;
+  padding-bottom: 1.33333em;
+  margin-bottom: 1.33333em; }
 
 .borders {
   border-top-style: solid;
-  border-top-width: 0.071em;
-  padding-top: 1.071em;
+  border-top-width: 0.07143em;
+  padding-top: 1.07143em;
   border-bottom-style: solid;
-  border-bottom-width: 0.071em;
-  padding-bottom: 1.071em; }
+  border-bottom-width: 0.07143em;
+  padding-bottom: 1.07143em; }
 
 .large-borders {
-  font-size: 1.714em;
+  font-size: 1.71429em;
   line-height: 2em;
   border-top-style: solid;
   border-top-width: 0.25em;
-  padding-top: 0.417em;
+  padding-top: 0.41667em;
   border-bottom-style: solid;
   border-bottom-width: 0.25em;
-  padding-bottom: 0.417em; }
+  padding-bottom: 0.41667em; }
 
 .reset {
-  line-height: 1.143em; }
+  line-height: 1.14286em; }

data/test/fixtures/stylesheets/compass/sass/columns.scss

@@ -1,10 +1,29 @@
 @import "compass/css3/columns";
 
+.columns            { @include columns(20em 5);               }
 .column-count       { @include column-count(5);               }
 .column-gap         { @include column-gap(10px);              }
 .column-width       { @include column-width(90px);            }
+.column-span        { @include column-span(all);              }
 .column-rule-width  { @include column-rule-width(1px);        }
 .column-rule-style  { @include column-rule-style(dotted);     }
 .column-rule-color  { @include column-rule-color(blue);       }
 .column-rule        { @include column-rule(1px, solid, blue); }
 .column-rule-spaced { @include column-rule(1px solid blue);   }
+.column-break-before{ @include column-break('before', always);}
+.column-break-after { @include column-break('after', always); }
+.column-break-inside{ @include column-break('inside');        }
+.column-count       			{ @include column-count(5);               }
+.column-gap         			{ @include column-gap(10px);              }
+.column-width       			{ @include column-width(90px);            }
+.column-rule-width  			{ @include column-rule-width(1px);        }
+.column-rule-style  			{ @include column-rule-style(dotted);     }
+.column-rule-color  			{ @include column-rule-color(blue);       }
+.column-rule        			{ @include column-rule(1px, solid, blue); }
+.column-rule-spaced 			{ @include column-rule(1px solid blue);   }
+.column-break-before 			{ @include column-break-before(always);   }
+.column-break-after 			{ @include column-break-after(always);    }
+.column-break-inside 			{ @include column-break-inside();         }
+.column-break-before-shortcut 	{ @include column-break('before', always);}
+.column-break-after-shortcut 	{ @include column-break('after', always); }
+.column-break-inside-shortcut 	{ @include column-break('inside');        }

data/test/fixtures/stylesheets/compass/sass/filters.scss

@@ -0,0 +1,24 @@
+@import "compass/css3/filter";
+
+.blur {
+  @include filter(blur(5px));
+}
+.brightness {
+  @include filter(brightness(0.2));
+}
+// We can enable this test case when sass commit 38f3c4be8bc15c130c5b1cc5880c9131e1bcb08f is released.
+// .saturate {
+//   @include filter(saturate(50%));
+// }
+.hue-rotate {
+  @include filter(hue-rotate(20deg));
+}
+.contrast {
+  @include filter(contrast(150%));
+}
+.grayscale {
+  @include filter(grayscale(150%));
+}
+.sepia {
+  @include filter(sepia(150%));
+}

data/test/fixtures/stylesheets/compass/sass/gradients.sass

@@ -15,7 +15,7 @@ $experimental-support-for-svg: true
 
 .bg-linear-gradient-angle2-svg
   +background-image(linear-gradient(top left, blue, black))
-  
+
 .bg-all-gradient-types-with-simplification
   +background-with-css2-fallback(image-url("4x6.png"), linear-gradient(top left, #ddd, #aaa), radial-gradient(center center, #ddd, #aaa 100px), #ffcc00)
 
@@ -34,10 +34,8 @@ $experimental-support-for-svg: true
 .transparent-in-linear-gradient
   +background-image(#fff linear-gradient(top left, transparent, #aaa))
 
-.transparent-in-linear-gradient
-  +background-image(radial-gradient(center center, #ddd, transparent 100px))
-
 .bg-radial-gradient
+  +background-image(radial-gradient(center center, #ddd, transparent 100px))
 
 .bg-linear-gradient-with-angle
   +background-image(linear-gradient(-45deg, #ddd, #aaa))

data/test/fixtures/stylesheets/compass/sass/hyphenation.scss

@@ -0,0 +1,11 @@
+@import "compass/css3/hyphenation";
+
+.word-break {
+	@include word-break(keep-all);
+}
+.hyphens {
+	@include hyphens(manual);
+}
+.hyphenate {
+	@include hyphenation;
+}

data/test/fixtures/stylesheets/compass/sass/regions.scss

@@ -0,0 +1,4 @@
+@import "compass/css3/regions";
+
+.source   { @include flow-into(target); }
+.new-container { @include flow-from(target); }

data/test/fixtures/stylesheets/compass/sass/replacement.scss

@@ -0,0 +1,22 @@
+@import "compass/typography/text/replacement";
+.basic {
+  @include replace-text("4x6.png");
+}
+.with-dimensions {
+  @include replace-text-with-dimensions("4x6.png");
+}
+.with-dimensions-inline {
+  @include replace-text-with-dimensions("4x6.png", $inline: true);
+}
+.with-position {
+  @include replace-text("4x6.png", 10px, top);
+}
+.with-arbitrary-url {
+  @include replace-text(url(http://google.com/logo.gif), 10px, top);
+}
+.with-inline-url {
+  @include replace-text(inline-image("4x6.png"), 10px, top);
+}
+.with-image-url {
+  @include replace-text(image-url("4x6.png"), 10px, top);
+}

data/test/fixtures/stylesheets/compass/sass/text_shadow.scss

@@ -1,6 +1,11 @@
 @import "compass/css3/text-shadow";
 
-.single-text-shadow { @include single-text-shadow;}
+.default-single-text-shadow { @include single-text-shadow;}
+.none { @include single-text-shadow(none);}
+.color-only { @include single-text-shadow(#ccc);}
+.color-first-with-params { @include single-text-shadow(#ccc, 2px, 2px, 5px, 2px);}
+.color-last-with-params { @include single-text-shadow(2px, 2px, 5px, 2px, #ccc);}
 .default-text-shadow { @include text-shadow;}
 .multiple-text-shadows-with-default { @include text-shadow(default, 2px 2px 5px #222);}
 .multiple-text-shadows { @include text-shadow(4px 4px 10px #444, 2px 2px 5px #222);}
+.multiple-text-shadows-with-spread { @include text-shadow(4px 4px 10px 1px #444, 2px 2px 5px 3px #222);}

data/test/fixtures/stylesheets/compass/sass/transition.scss

@@ -4,9 +4,21 @@
 .single-transition-with-delay     { @include single-transition(all, 0.6s, ease-out, 0.2s); }
 .transition-duration-string { @include transition-duration("0.2s, 0.5s, 0.2s"); }
 .transition-duration-list { @include transition-duration((0.2s, 0.5s, 0.2s)); }
+.multiple-transition-durations { @include transition-duration(0.2s, 0.5s, 0.2s); }
 .single-transform-transition-without-delay  { @include single-transition(transform, 0.6s, ease-out); }
 .single-transform-transition-with-delay     { @include single-transition(transform, 0.6s, ease-out, 0.2s); }
 .transform-transition { @include transition(transform 0.6s ease-out) }
 .multiple-transitions { @include transition(transform 0.6s ease-out, opacity 0.2s ease-in) }
 .transition-property { @include transition-property(transform); }
+.transition-properties { @include transition-property(transform, opacity, width, height, left, top); }
 .multiple-transition-properties { @include transition-property((opacity, transform, left)); }
+.transition-timing { @include transition-timing-function(ease-in); }
+.transition-timings { @include transition-timing-function(ease-in, cubic-bezier(1,0,1,0)); }
+.transition-timings-list { @include transition-timing-function((ease-in, cubic-bezier(1,0,1,0))); }
+.transition-timings-string { @include transition-timing-function("ease-in, cubic-bezier(1,0,1,0)"); }
+.transition-delay { @include transition-delay(1s); }
+.transition-delays { @include transition-delay(1s, 2s, 3s); }
+.transition-delays-list { @include transition-delay((1s, 2s, 3s)); }
+.transition-delays-string { @include transition-delay("1s, 2s, 3s"); }
+.regression-912 { @include transition((background-color 0.5s ease-in 0s, width 0.5s ease-out 0s, height 0.5s ease-in 0s, top 0.5s ease-out 0s)); }
+

data/test/helpers/test_case.rb

@@ -9,7 +9,14 @@ module Compass
         File.join(File.expand_path('../../', __FILE__), path)
       end
     end
-    
+
+    # compile a Sass string in the context of a project in the current working directory.
+    def compile_for_project(contents, options = {})
+      Compass.add_project_configuration
+      options[:syntax] ||= :scss
+      Sass::Engine.new(contents, Compass.configuration.to_sass_engine_options.merge(options)).render
+    end
+
     def assert_correct(before, after)
       if before == after
         assert(true)

data/test/integrations/sprites_test.rb

@@ -34,7 +34,7 @@ class SpritesTest < Test::Unit::TestCase
   end
 
   def image_size(file)
-    IO.read(map_location(file))[0x10..0x18].unpack('NN')
+    open(map_location(file), "rb").read[0x10..0x18].unpack('NN')
   end
 
   def image_md5(file)
@@ -773,18 +773,18 @@ class SpritesTest < Test::Unit::TestCase
         background:url('/colors-s58671cb5bb.png') no-repeat;
       }
       .blue { 
-        text-indent:110%;
-        white-space:nowrap;
+        text-indent:-119988px;
         overflow:hidden;
+        text-align:left;
         background-position:0 0;
         background-image:url('/colors-s58671cb5bb.png');
         background-repeat:no-repeat;
       }
       
       .yellow { 
-        text-indent:110%;
-        white-space:nowrap;
+        text-indent:-119988px;
         overflow:hidden;
+        text-align:left;
         background-position:0 -10px;
         height:10px;
         width:10px;

data/test/test_helper.rb

@@ -21,6 +21,7 @@ require 'rubygems' if need_gems
 require 'compass'
 
 require 'test/unit'
+require "mocha/test_unit"
 
 
 class String
@@ -71,4 +72,4 @@ module SpriteHelper
   rescue Errno::ENOENT => e  
   end
   
-end
+end

data/test/units/compass_module_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require "test_helper"
 
 class CompassModuleTest < Test::Unit::TestCase
 

data/test/units/configuration_test.rb

@@ -240,6 +240,21 @@ EXPECTED
     assert_correct expected_serialization.split("\n"), Compass.configuration.serialize.split("\n")
   end
 
+  def test_additional_import_paths_can_be_importers
+    contents = StringIO.new(<<-CONFIG)
+      http_path = "/"
+      project_path = "/home/chris/my_compass_project"
+      css_dir = "css"
+      additional_import_paths = ["../foo"]
+      add_import_path Sass::Importers::Filesystem.new("/tmp/foo")
+    CONFIG
+
+    Compass.add_configuration(contents, "test_additional_import_paths")
+
+    assert Compass.configuration.sass_load_paths.find{|p| p.is_a?(Sass::Importers::Filesystem) && p.root == "/tmp/foo"}
+    assert Compass.configuration.to_sass_plugin_options[:load_paths].find{|p| p.is_a?(Sass::Importers::Filesystem) && p.root == "/tmp/foo"}
+  end
+
   def test_config_with_pathname
     contents = StringIO.new(<<-CONFIG)
       http_path = "/"