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

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

@@ -2,13 +2,13 @@
   env: production; }
 
 .time {
-  time: "2012-05-06"; }
+  time: "2013-02-07"; }
 
 .date {
-  date: "2012-05-06"; }
+  date: "2013-02-07"; }
 
 .filename {
-  file: /Users/crispee/Projects/compass/test/fixtures/stylesheets/envtest/sass/env.scss; }
+  file: /Users/sdavis/Work/compass/test/fixtures/stylesheets/envtest/sass/env.scss; }
 
 .output {
-  output: /Users/crispee/Projects/compass/test/fixtures/stylesheets/envtest/tmp/env.css; }
+  output: /Users/sdavis/Work/compass/test/fixtures/stylesheets/envtest/tmp/env.css; }

data/test/fixtures/stylesheets/valid/css/simple.css

@@ -0,0 +1,4 @@
+/* line 1, ../sass/simple.sass */
+div {
+  color: red;
+}

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/compass_test.rb

@@ -11,7 +11,7 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def teardown
-    [:blueprint, :empty, :compass, :image_urls, :relative].each do |project_name|
+    [:empty, :compass, :image_urls, :relative].each do |project_name|
       ::FileUtils.rm_rf tempfile_path(project_name)
     end
   end
@@ -23,7 +23,7 @@ class CompassTest < Test::Unit::TestCase
     before_compile = Proc.new do |config|
       config.on_stylesheet_saved {|filepath| path = filepath; saved = true }
     end
-    within_project(:blueprint, before_compile)
+    within_project(:compass, before_compile)
     assert saved, "Stylesheet callback didn't get called"
     assert path.is_a?(String), "Path is not a string. Got: #{path.class.name}"
   end
@@ -51,17 +51,6 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
-  def test_blueprint
-    within_project(:blueprint) do |proj|
-      each_css_file(proj.css_path) do |css_file|
-        assert_no_errors css_file, :blueprint
-      end
-      each_sass_file do |sass_file|
-        assert_renders_correctly sass_file, :ignore_charset => true
-      end
-    end
-  end
-
   def test_compass
     within_project('compass') do |proj|
       each_css_file(proj.css_path) do |css_file|
@@ -95,6 +84,17 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
+  def test_busted_font_urls
+    within_project('busted_font_urls') do |proj|
+      each_css_file(proj.css_path) do |css_file|
+        assert_no_errors css_file, 'busted_font_urls'
+      end
+      each_sass_file do |sass_file|
+        assert_renders_correctly sass_file
+      end
+    end
+  end
+
   def test_busted_image_urls
     within_project('busted_image_urls') do |proj|
       each_css_file(proj.css_path) do |css_file|

data/test/integrations/sprites_test.rb

@@ -13,6 +13,7 @@ class SpritesTest < Test::Unit::TestCase
     @images_tmp_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'sprites', 'public', 'images-tmp')
     @generated_images_tmp_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'sprites', 'public', 'generated-images-tmp')
     ::FileUtils.cp_r @images_src_path, @images_tmp_path
+    ::FileUtils.mkdir_p @generated_images_tmp_path
     file = StringIO.new("images_path = #{@images_tmp_path.inspect}\n")
     Compass.add_configuration(file, "sprite_config")
     Compass.configure_sass_plugin!
@@ -34,7 +35,7 @@ class SpritesTest < Test::Unit::TestCase
   end
 
   def image_size(file)
-    IO.read(map_location(file))[0x10..0x18].unpack('NN')
+    Compass::SassExtensions::Functions::ImageSize::ImageProperties.new(map_location(file)).size
   end
 
   def image_md5(file)
@@ -474,6 +475,123 @@ class SpritesTest < Test::Unit::TestCase
     CSS
   end
  
+  it "should use percentage positions when use_percentages is true" do
+    css = render <<-SCSS
+      @import "squares/*.png";
+      $squares-use-percentages: true;
+      .foo {
+        @include squares-sprite-position("twenty-by-twenty");
+      }
+      .bar {
+        @include squares-sprite-position("ten-by-ten");
+        @include squares-sprite-dimensions("ten-by-ten");
+      }
+    SCSS
+    assert_correct css, <<-CSS
+      .squares-sprite {
+        background: url('/squares-sbbc18e2129.png') no-repeat;
+      }
+      
+      .foo {
+        background-position: 0 100%;
+      }
+      
+      .bar {
+        background-position: 0 0;
+        height: 10px;
+        width: 10px;
+      }
+    CSS
+  end
+  
+  it "should use correct percentages when use_percentages is with horizontal layout" do
+    css = render <<-SCSS
+      $squares-layout: horizontal;
+      @import "squares/*.png";
+      $squares-use-percentages: true;
+      .foo {
+        @include squares-sprite-position("twenty-by-twenty");
+      }
+      .bar {
+        @include squares-sprite-position("ten-by-ten");
+      }
+    SCSS
+    assert_correct css, <<-CSS
+      .squares-sprite {
+        background: url('/squares-s4bd95c5c56.png') no-repeat;
+      }
+      
+      .foo {
+        background-position: 100% 0;
+      }
+      
+      .bar {
+        background-position: 0 0;
+      }
+    CSS
+  end
+
+  it "should use correct percentages when use_percentages is true with smart layout" do
+    css = render <<-SCSS
+      $image_row-layout: smart;
+      @import "image_row/*.png";
+      $image_row-use-percentages: true;
+      .foo {
+        @include image_row-sprite-position("medium");
+      }
+      .bar {
+        @include image_row-sprite-position("large_square");
+      }
+    SCSS
+    assert_correct css, <<-CSS
+      .image_row-sprite {
+        background: url('/image_row-sc5082a6b9f.png') no-repeat;
+      }
+      
+      .foo {
+        background-position: 0 50%;
+      }
+      
+      .bar {
+        background-position: 33.33333% 100%;
+      }
+    CSS
+  end
+
+  it "should use correct percentages when use_percentages is true" do
+    css = render <<-SCSS
+      $image_row-use-percentages: true;
+      $image_row-sort-by : '!width';
+      @import "image_row/*.png";
+      @include all-image_row-sprites;
+    SCSS
+    assert_correct css, <<-CSS
+      .image_row-sprite, .image_row-large, .image_row-large_square, .image_row-medium, .image_row-small, .image_row-tall {
+        background: url('/image_row-sdf383d45a3.png') no-repeat;
+      }
+      
+      .image_row-large {
+        background-position: 0 0;
+      }
+      
+      .image_row-large_square {
+        background-position: 0 40%;
+      }
+      
+      .image_row-medium {
+        background-position: 0 16.66667%;
+      }
+      
+      .image_row-small {
+        background-position: 0 100%;
+      }
+      
+      .image_row-tall {
+        background-position: 0 80%;
+      }
+    CSS
+  end
+  
   it "should calculate corret sprite demsions when givin spacing via issue#253" do
     css = render <<-SCSS
       $squares-spacing: 10px;
@@ -627,6 +745,7 @@ class SpritesTest < Test::Unit::TestCase
   
   it "should not raise error on filenames that are invalid classnames if the selector generation is not used" do
     css = render <<-SCSS
+      $prefix-sort-by : 'width';
       @import "prefix/*.png";
       a {
         @include prefix-sprite("20-by-20");
@@ -796,18 +915,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;
@@ -819,7 +938,14 @@ class SpritesTest < Test::Unit::TestCase
    end
    
    it "should inline the sprite file" do
-     css = render <<-SCSS
+    Compass.reset_configuration!
+    file = StringIO.new(<<-CONFIG)
+      images_path = #{@images_tmp_path.inspect}
+      generated_images_path = #{@generated_images_tmp_path.inspect}
+    CONFIG
+    Compass.add_configuration(file, "sprite_config")
+    Compass.configure_sass_plugin!
+    css = render <<-SCSS
       $colors-inline:true;
       @import "colors/*.png";
       @include all-colors-sprites;
@@ -840,7 +966,6 @@ class SpritesTest < Test::Unit::TestCase
 
   it "should have a sprite_name function that returns the names of the sprites in a sass list" do
     css = render <<-SCSS
-      $colors-inline:true;
       @import "colors/*.png";
       @each $color in sprite_names($colors-sprites) {
         .\#{$color} {
@@ -850,7 +975,7 @@ class SpritesTest < Test::Unit::TestCase
     SCSS
     other_css = <<-CSS
       .colors-sprite {
-        background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAUCAAAAACRhfOKAAAAHElEQVR42mM5wQADLP8JMRlIUIvE/IdgctLTNgCHDhEQVD4ceAAAAABJRU5ErkJggg==');
+        background: url('/colors-s58671cb5bb.png') no-repeat;
       }
       .blue { 
         width:0px;
@@ -883,4 +1008,44 @@ class SpritesTest < Test::Unit::TestCase
     assert_correct clean(css), clean(other_css)
   end
 
+  it "should return width and height of the map" do
+    css = render <<-SCSS
+      @import "colors/*.png";
+      .height { height : sprite_height($colors-sprites); }
+      .width { width : sprite_width($colors-sprites); }
+    SCSS
+    other_css = <<-CSS
+      .colors-sprite {
+        background: url('/colors-s58671cb5bb.png') no-repeat;
+      }
+      .height {
+        height : 20px;
+      }
+      .width {
+        width : 10px;
+      }
+    CSS
+    assert_correct clean(css), clean(other_css)
+  end
+
+    it "should return width and height of a sprite" do
+    css = render <<-SCSS
+      @import "colors/*.png";
+      .height { height : sprite_height($colors-sprites, blue); }
+      .width { width : sprite_width($colors-sprites, blue); }
+    SCSS
+    other_css = <<-CSS
+      .colors-sprite {
+        background: url('/colors-s58671cb5bb.png') no-repeat;
+      }
+      .height {
+        height : 10px;
+      }
+      .width {
+        width : 10px;
+      }
+    CSS
+    assert_correct clean(css), clean(other_css)
+  end
+
 end

data/test/test_helper.rb

@@ -40,6 +40,10 @@ class Test::Unit::TestCase
   include Compass::IoHelper
   extend Compass::TestCaseHelper::ClassMethods
   
+  def fixture_path
+    File.join(File.expand_path('../', __FILE__), 'fixtures')
+  end
+
 end 
 
 module SpriteHelper

data/test/units/command_line_test.rb

@@ -22,10 +22,8 @@ class CommandLineTest < Test::Unit::TestCase
     within_tmp_directory do
       compass "create", "--boring", "basic"
       assert File.exists?("basic/sass/screen.scss")
-      assert File.exists?("basic/stylesheets/screen.css")
       assert_action_performed :directory, "basic/"
       assert_action_performed    :create, "basic/sass/screen.scss"
-      assert_action_performed    :create, "basic/stylesheets/screen.css"
     end
   end
 

data/test/units/regressions_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+require 'compass'
+require 'compass/exec'
+require 'stringio'
+
+class RegressionsTest < Test::Unit::TestCase
+  include Compass::CommandLineHelper
+  setup do
+    Compass.reset_configuration!
+  end
+  
+  after do
+    Compass.reset_configuration!
+  end
+
+  def test_issue911_sprites_with_globbing_and_line_comments
+    within_tmp_directory do
+      compass "create --bare issue911"
+      FileUtils.mkdir_p "issue911/images/sprites/a"
+      FileUtils.mkdir_p "issue911/images/sprites/b"
+      open "issue911/images/sprites/a/foo.png", "wb" do |f|
+        f.write(Compass::PNG.new(5,10, [255,0,255]).to_blob)
+      end
+      open "issue911/images/sprites/b/bar.png", "wb" do |f|
+        f.write(Compass::PNG.new(5,10, [255,255,0]).to_blob)
+      end
+      Dir.chdir "issue911" do
+        result = compile_for_project(<<-SCSS)
+          @import "sprites/**/*.png";
+        SCSS
+        Sass::Engine.new(result, :syntax => :scss).render # raises an error if we generated invalid css
+      end
+    end
+  end
+end

data/test/units/sass_extensions_test.rb

@@ -23,7 +23,7 @@ class SassExtensionsTest < Test::Unit::TestCase
   def test_enumerate
     assert_equal ".grid-1, .grid-2, .grid-3", evaluate(%Q{enumerate(".grid", 1, 3, "-")})
   end
-  
+
   def test_append_selector
     assert_equal "div.bar", evaluate(%Q{append_selector("div", ".bar")})
     assert_equal ".foo1.bar1, .foo1.bar2, .foo2.bar1, .foo2.bar2", evaluate(%Q{append_selector(".foo1, .foo2", ".bar1, .bar2")})
@@ -59,30 +59,40 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "25%", evaluate("saturation(adjust-saturation(hsl(50deg, 50%, 50%), -25%))")
   end
 
+  def test_shade
+    assert_equal evaluate("mix(black, #ff0, 25%)"), evaluate("shade(#ff0, 25%)")
+    assert_equal evaluate("mix(black, #ff0, 0%)"), evaluate("shade(#ff0, 0%)")
+  end
+
+  def test_tint
+    assert_equal evaluate("mix(white, #ff0, 75%)"), evaluate("tint(#ff0, 75%)")
+    assert_equal evaluate("mix(white, #ff0, 100%)"), evaluate("tint(#ff0, 100%)")
+  end
+
   def test_if_function
     assert_equal "no", evaluate("if(false, yes, no)")
     assert_equal "yes", evaluate("if(true, yes, no)")
   end
 
   def test_math_functions
-    assert_equal "0.841", evaluate("sin(1)")
-    assert_equal "0.841px", evaluate("sin(1px)")
+    assert_equal "0.84147", evaluate("sin(1)")
+    assert_equal "0.84147px", evaluate("sin(1px)")
     assert_equal "0.0", evaluate("sin(pi())")
     assert_equal "1",   evaluate("sin(pi() / 2)")
     assert_equal "0.0",   evaluate("sin(180deg)")
     assert_equal "-1",  evaluate("sin(3* pi() / 2)")
     assert_equal "-1", evaluate("cos(pi())")
     assert_equal "1", evaluate("cos(360deg)")
-    assert_equal "-0.176", evaluate("sin(270)")
+    assert_equal "-0.17605", evaluate("sin(270)")
     assert_equal "1", evaluate("cos(2*pi())")
     assert_equal "0.0",   evaluate("cos(pi() / 2)")
     assert_equal "0.0",  evaluate("cos(3* pi() / 2)")
     assert_equal "0.0",  evaluate("tan(pi())")
     assert_equal "0.0", evaluate("tan(360deg)")
-    assert_equal "0.959", evaluate("sin(360)")
+    assert_equal "0.95892", evaluate("sin(360)")
     assert evaluate("tan(pi()/2 - 0.0001)").to_f > 1000, evaluate("tan(pi()/2 - 0.0001)")
     assert evaluate("tan(pi()/2 + 0.0001)").to_f < -1000, evaluate("tan(pi()/2 - 0.0001)")
-    assert_equal "0.693px", evaluate("logarithm(2px)")
+    assert_equal "0.69315px", evaluate("logarithm(2px)")
     assert_equal "0", evaluate("logarithm(1)")
     assert_equal "1", evaluate("logarithm(e())")
     assert_equal "1", evaluate("logarithm($number: e())")
@@ -93,7 +103,9 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "5px", evaluate("square-root($number: 25px)")
     assert_equal "25px", evaluate("pow(5px, 2)")
     assert_equal "25px", evaluate("pow($number: 5px, $exponent: 2)")
-    assert_equal "79.432px", evaluate("pow(5px, e())")
+    assert_equal "79.43236px", evaluate("pow(5px, e())")
+    assert (0..2).include?(evaluate("random(2)").to_i)
+    assert (4..16).include?(evaluate("random(4, 16)").to_i)
   end
 
   def test_blank
@@ -166,16 +178,16 @@ class SassExtensionsTest < Test::Unit::TestCase
     base64_string = File.read(File.join(Compass.configuration.fonts_path, "bgrove.base64.txt")).chomp
     assert_equal "url('data:font/truetype;base64,#{base64_string}') format('truetype')", evaluate("inline_font_files('bgrove.ttf', truetype)")
   end
-  
-  
+
+
   def test_image_size_should_respond_to_to_path
     object = mock()
     object.expects(:to_path).returns('foo.jpg')
     object.expects(:respond_to?).with(:to_path).returns(true)
-    
+
     Compass::SassExtensions::Functions::ImageSize::ImageProperties.new(object)
   end
-  
+
   def test_reject
     assert_equal "b d", evaluate("reject(a b c d, a, c)")
     assert_equal "a b c d", evaluate("reject(a b c d, e)")