compass 0.12.2 → 0.13.alpha.4

data/test/units/configuration_test.rb

@@ -53,6 +53,18 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_correct expected_lines, actual_lines
   end
 
+  def test_custom_watch
+    contents = StringIO.new(<<-CONFIG)
+      watch 'img/**/*' do
+        puts 'foobar'
+      end
+    CONFIG
+    Compass.add_configuration(contents, 'test_watch_config')
+    watch = Compass.configuration.watches.first
+    assert_equal 'img/**/*', watch.glob
+    assert watch.is_a?(Compass::Watcher::Watch)
+  end
+
   def test_serialization_warns_with_asset_host_set
     contents = StringIO.new(<<-CONFIG)
       asset_host do |path|

data/test/units/regressions_test.rb

@@ -4,12 +4,16 @@ require 'compass/exec'
 require 'stringio'
 
 class RegressionsTest < Test::Unit::TestCase
+  include SpriteHelper
   include Compass::CommandLineHelper
-  setup do
+
+  def setup
+    create_sprite_temp
     Compass.reset_configuration!
   end
   
-  after do
+  def teardown
+    clean_up_sprites
     Compass.reset_configuration!
   end
 
@@ -18,12 +22,8 @@ class RegressionsTest < Test::Unit::TestCase
       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
+      FileUtils.cp File.join(@images_tmp_path, 'nested/squares/ten-by-ten.png'), "issue911/images/sprites/a/foo.png"
+      FileUtils.cp File.join(@images_tmp_path, 'nested/squares/ten-by-ten.png'), "issue911/images/sprites/a/bar.png"
       Dir.chdir "issue911" do
         result = compile_for_project(<<-SCSS)
           @import "sprites/**/*.png";

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")})
@@ -75,24 +75,24 @@ class SassExtensionsTest < Test::Unit::TestCase
   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())")
@@ -103,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
@@ -176,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)")

data/test/units/sass_extenstions/gradients_test.rb

@@ -0,0 +1,33 @@
+class GradientTestClass
+  extend Compass::SassExtensions::Functions::Constants
+  extend Compass::SassExtensions::Functions::GradientSupport::Functions
+end
+
+require 'test_helper'
+require 'compass'
+
+class GradientsTest < Test::Unit::TestCase
+  
+  def klass
+    GradientTestClass
+  end
+
+  def sass_string(s)
+    Sass::Script::String.new(s)
+  end
+
+  def sass_list(array)
+    Sass::Script::List.new(array, :space)
+  end
+
+  test "should return correct angle" do
+    assert_equal Sass::Script::Number.new(330, ['deg']), klass.convert_angle_from_offical(Sass::Script::Number.new(120, ['deg']))
+  end
+
+  test "Should convert old to new" do
+    [:top => ['to', 'bottom'], :bottom => ['to', 'top'], :left => ['to', 'right'], :right => ['to', 'left']].each do |test_value|
+      assert_equal sass_string(test_value.keys.first.to_s), klass.convert_angle_from_offical(sass_list([sass_string(test_value.values[0].first), sass_string(test_value.values[0].last)]))
+    end
+  end
+
+end

data/test/units/sprites/image_test.rb

@@ -74,6 +74,11 @@ class SpritesImageTest < Test::Unit::TestCase
     assert img.repeat_x?
   end
 
+  test 'image repeat-y' do
+    img = test_image "selectors_ten_by_ten_repeat" => Sass::Script::String.new('repeat-y')
+    assert img.repeat_y?
+  end
+
   test 'image position' do
     image = test_image "selectors_ten_by_ten_position" => Sass::Script::Number.new(100, ["px"])
     assert_equal 100, image.position.value

data/test/units/sprites/images_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+require 'compass/sass_extensions/sprites/images'
+
+class ImagesTest < Test::Unit::TestCase
+
+  def setup
+    @images = Compass::SassExtensions::Sprites::Images.new
+    @images << OpenStruct.new(:foo => 1, :name => 'bob', :size => 1200, :width => 10)
+    @images << OpenStruct.new(:foo => 2, :name => 'bob', :size => 300, :width => 100)
+    @images << OpenStruct.new(:foo => 3, :name => 'aob', :size => 120, :width => 50)
+    @images << OpenStruct.new(:foo => 4, :name => 'zbob', :size => 600, :width => 55)
+  end
+
+
+  test "sort by size" do
+    @images.sort_by! :size
+    assert_equal [3, 2, 4, 1], @images.map(&:foo)
+  end
+
+  test "sort by !size" do
+    @images.sort_by! '!size'
+    assert_equal [3, 2, 4, 1].reverse, @images.map(&:foo)
+  end
+
+  test "sort by name" do
+    @images.sort_by! :name
+    assert_equal [3, 2, 1, 4], @images.map(&:foo)
+  end
+
+  test "sort by !name" do
+    @images.sort_by! '!name'
+    assert_equal [3, 2, 1, 4].reverse, @images.map(&:foo)
+  end
+
+  test "sort by width" do
+    @images.sort_by! :width
+    assert_equal [1, 3, 4, 2], @images.map(&:foo)
+  end
+
+    test "sort by !width" do
+    @images.sort_by! '!width'
+    assert_equal [1, 3, 4, 2].reverse, @images.map(&:foo)
+  end
+
+end
+  

data/test/units/sprites/layout_test.rb

@@ -44,20 +44,20 @@ class LayoutTest < Test::Unit::TestCase
     sprite_map_test(opts)
   end
 
-  def horizontal(options= {})
+  def horizontal(options= {}, uri=URI)
     opts = @options.merge("layout" => Sass::Script::String.new('horizontal'))
     opts.merge!(options)
 
-    sprite_map_test(opts)
+    sprite_map_test(opts, uri)
   end
 
   # REPEAT_X
 
   test 'repeat-x layout single image' do
-    opts = {"repeat_x_three_repeat" => Sass::Script::String.new('repeat-x')}
+    opts = {"repeat_x_three_repeat" => Sass::Script::String.new('repeat-x'), 'sort_by' => Sass::Script::String.new('width')}
     map = sprite_map_test(@options.merge(opts), 'repeat_x/*.png')
     assert_equal 6, map.width
-    assert_equal [0, 4, 7, 9, 14, 4, 4], map.images.map(&:top)
+    assert_equal [0, 1, 3, 6, 10, 3, 3], map.images.map(&:top)
     assert_equal [0, 0, 0, 0, 0, 0, 3], map.images.map(&:left)
   end
 
@@ -67,6 +67,22 @@ class LayoutTest < Test::Unit::TestCase
     assert_equal 12, map.width
   end
 
+  test "repeat-y layout single image" do
+    opts = {"layout" => Sass::Script::String.new('horizontal'), "squares_ten_by_ten_repeat" => Sass::Script::String.new('repeat-y')}
+    map = sprite_map_test(@options.merge(opts), 'squares/*.png')
+    assert_equal 30, map.width
+    assert_equal 20, map.height
+    assert_equal 3, map.images.size
+    assert_equal [[0,0], [0,10], [10,0]], map.images.map { |img| [img.top, img.left] }
+    assert map.horizontal?
+  end
+
+  test "repeat-y layout multi image" do
+    opts = {"layout" => Sass::Script::String.new('horizontal'), "repeat_x_three_repeat" => Sass::Script::String.new('repeat-y'), "repeat_x_four_repeat" => Sass::Script::String.new('repeat-y')}
+    map = sprite_map_test(@options.merge(opts), 'repeat_x/*.png')
+    assert_equal [[0, 0], [0, 5], [0, 9], [0, 10], [0, 13], [4, 5], [8, 5], [3, 10], [6, 10], [9, 10]], map.images.map { |img| [img.top, img.left] }
+  end
+
   # VERTICAL LAYOUT
 
   it "should have a vertical layout" do
@@ -139,10 +155,19 @@ class LayoutTest < Test::Unit::TestCase
     assert_equal [0, 0, 0, 0], base.images.map(&:top)
     assert_equal 80, base.width
   end
+
+  it "should layout horizontaly with spacing and and position" do
+    base = horizontal({"spacing" => Sass::Script::Number.new(10, ['px']), "position" => Sass::Script::Number.new(50, ['%'])}, 'squares/*.png')
+    assert_equal [0, 20], base.images.map(&:left)
+    assert_equal [5, 0], base.images.map(&:top)
+    assert_equal 50, base.width
+  end
   
   it "should layout horizontaly with position" do
     base = horizontal("selectors_ten_by_ten_active_position" => Sass::Script::Number.new(10, ['px']))
     assert_equal [0, 10, 0, 0], base.images.map(&:top)
+    assert_equal 40, base.width
+    assert_equal 20, base.height
   end
   
   it "should generate a horrizontal sprite" do

data/test/units/watcher/compiler_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+require 'compass'
+
+class WatcherCompilerTest < Test::Unit::TestCase
+
+  def setup
+    @working_path = File.join(fixture_path, 'stylesheets', 'valid')
+    @to = File.join(@working_path, 'css')
+    remove_to
+    Compass.add_configuration({:sass_path => File.join(@working_path, 'sass'), :css_path => @to }, 'test')
+  end
+
+  test "it sould create a new instance of a compass compiler" do
+    watch_compiler = Compass::Watcher::Compiler.new(@working_path, {})
+    assert watch_compiler.compiler.is_a?(Compass::Compiler)
+  end
+
+  test "debug info gets passed into sass options" do
+    watch_compiler = Compass::Watcher::Compiler.new(@working_path, {:debug_info => true})
+    assert watch_compiler.compiler_options[:sass][:debug_info]
+  end
+  
+  test "should run compiler" do
+    watch_compiler = Compass::Watcher::Compiler.new(@working_path, {})
+    watch_compiler.compiler.expects(:reset_staleness_checker!).once
+    watch_compiler.compiler.expects(:run).once
+    watch_compiler.expects(:log_action).once
+    watch_compiler.compile
+  end
+
+  def remove_to
+    ::FileUtils.rm_r @to if File.exists?(@to)
+  end
+
+  def teardown
+    remove_to
+  end
+
+end

data/test/units/watcher/project_watcher_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+require 'compass'
+
+class ProjectWatcherTest < Test::Unit::TestCase
+
+  FOO = ['foo.scss']
+
+  def setup
+    @working_path = File.join(fixture_path, 'stylesheets', 'valid')
+    @to = File.join(@working_path, 'css')
+    remove_to
+    Compass.add_configuration({:sass_path => File.join(@working_path, 'sass'), :css_path => @to }, 'test')
+    @project_watcher = Compass::Watcher::ProjectWatcher.new(@working_path)
+  end
+
+  test "should initalize correctly" do
+    assert @project_watcher.listener.is_a?(Listen::Listener)
+    assert_equal 2, @project_watcher.sass_watchers.size
+  end
+
+  test "should have 3 watchers" do
+    Dir.chdir File.join(@working_path, 'sass') do
+      @project_watcher = Compass::Watcher::ProjectWatcher.new(Dir.pwd)
+      assert_equal 3, @project_watcher.sass_watchers.size
+    end
+  end
+
+  test "compiler" do
+    assert @project_watcher.compiler.is_a?(Compass::Compiler)
+  end
+
+  test "sass callback add" do
+    @project_watcher.expects(:sass_added).with(FOO).once
+    @project_watcher.send(:sass_callback, @working_path, FOO, :added)
+  end
+
+  test "sass callback modified" do
+    @project_watcher.expects(:sass_modified).with(FOO).once
+    @project_watcher.send(:sass_callback, @working_path, FOO, :modified)
+  end
+
+  test "sass callback removed" do
+    @project_watcher.expects(:sass_removed).with(FOO).once
+    @project_watcher.send(:sass_callback, @working_path, FOO, :removed)
+  end
+
+  SAMPLE = ['sass/sample.scss']
+
+  test "listen callback modified" do
+    @project_watcher.expects(:sass_modified).with(SAMPLE[0]).once
+    @project_watcher.send(:listen_callback, SAMPLE, [], [])
+  end
+
+  test "listen callback added" do
+    @project_watcher.expects(:sass_added).with(SAMPLE[0]).once
+    @project_watcher.send(:listen_callback, [], SAMPLE, [])
+  end
+
+  test "listen callback removed" do
+    @project_watcher.expects(:sass_removed).with(SAMPLE[0]).once
+    @project_watcher.send(:listen_callback, [], [], SAMPLE)
+  end
+
+  def remove_to
+    ::FileUtils.rm_r @to if File.exists?(@to)
+  end
+
+  def teardown
+    remove_to
+  end
+
+
+end

data/test/units/watcher/watch_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+require 'compass'
+
+class WatcherWatchTest < Test::Unit::TestCase
+
+  test "should throw exception if given absolute path" do
+    begin 
+      watcher = Compass::Watcher::Watch.new('/images/*.png') do
+        puts "something"
+      end
+    rescue Compass::Watcher::AbsolutePathError
+      assert true, "Compass::Watcher::AbsolutePathError was not raised"
+    end
+  end
+
+  test "should throw exception if not given a block" do
+    begin 
+      watcher = Compass::Watcher::Watch.new('images/*.png')
+    rescue Compass::Watcher::NoCallbackError
+      assert true, "Compass::Watcher::NoCallbackError was not raised"
+    end
+  end
+
+  test "changed path matches glob" do
+    watcher = Compass::Watcher::Watch.new('images/*.png') { }
+    assert watcher.match?('images/baz.png'), "Path does not match"
+  end
+
+  test "changed path doesn't matches glob" do
+    watcher = Compass::Watcher::Watch.new('images/*.png') { }
+    assert !watcher.match?('foo/baz.png'), "Path does match and it shouldn't"
+  end
+
+  test "can run callback" do
+    test = 0
+    watcher = Compass::Watcher::Watch.new('images/*.png') { test = 1}
+    watcher.run_callback(:project, :local, :action)
+    assert_equal 1, test
+  end
+
+
+end