compass 0.11.7 → 0.12.alpha.0

data/test/integrations/sprites_test.rb

@@ -11,6 +11,7 @@ class SpritesTest < Test::Unit::TestCase
     Compass.reset_configuration!
     @images_src_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'sprites', 'public', 'images')
     @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
     file = StringIO.new("images_path = #{@images_tmp_path.inspect}\n")
     Compass.add_configuration(file, "sprite_config")
@@ -20,6 +21,7 @@ class SpritesTest < Test::Unit::TestCase
   def teardown
     Compass.reset_configuration!
     ::FileUtils.rm_r @images_tmp_path
+    ::FileUtils.rm_rf @generated_images_tmp_path
   end
 
 
@@ -74,6 +76,35 @@ class SpritesTest < Test::Unit::TestCase
     assert_equal image_md5('squares-s*.png'), '7349a0f4e88ea80abddcf6ac2486abe3'
   end
 
+  it "should output and serve sprite files using the generated images directory" do
+    Compass.reset_configuration!
+    file = StringIO.new(<<-CONFIG)
+      images_path = #{@images_tmp_path.inspect}
+      generated_images_path = #{@generated_images_tmp_path.inspect}
+      http_generated_images_path = "/images/generated"
+    CONFIG
+    Compass.add_configuration(file, "sprite_config")
+    Compass.configure_sass_plugin!
+    css = render <<-SCSS
+      @import "squares/*.png";
+      @include all-squares-sprites;
+    SCSS
+    assert_not_nil Dir.glob("#{@generated_images_tmp_path}/squares-s*.png").first
+    assert_correct <<-CSS, css
+      .squares-sprite, .squares-ten-by-ten, .squares-twenty-by-twenty {
+        background: url('/images/generated/squares-s161c60ad78.png') no-repeat;
+      }
+      
+      .squares-ten-by-ten {
+        background-position: 0 0;
+      }
+      
+      .squares-twenty-by-twenty {
+        background-position: 0 -10px;
+      }
+    CSS
+  end
+
   it "should generate sprite classes with dimensions" do
     css = render <<-SCSS
       $squares-sprite-dimensions: true;
@@ -448,7 +479,7 @@ class SpritesTest < Test::Unit::TestCase
     CSS
   end
 
-  it "should render corret sprite with css selectors via issue#248" do
+  it "should render correct sprite with css selectors via issue#248" do
     css = render <<-SCSS
       @import "selectors/*.png";
       @include all-selectors-sprites;
@@ -472,8 +503,33 @@ class SpritesTest < Test::Unit::TestCase
       }
     CSS
   end
+  
+  it "should honor offsets when rendering selectors via issue#449" do
+    css = render <<-SCSS
+      @import "selectors/*.png";
+      @include all-selectors-sprites($offset-x: 20px, $offset-y: 20px);
+    SCSS
+    assert_correct css, <<-CSS
+      .selectors-sprite, .selectors-ten-by-ten {
+        background: url('/selectors-sedfef809e2.png') no-repeat;
+      }
+      
+      .selectors-ten-by-ten {
+        background-position: 20px 20px;
+      }
+      .selectors-ten-by-ten:hover, .selectors-ten-by-ten.ten-by-ten_hover, .selectors-ten-by-ten.ten-by-ten-hover {
+        background-position: 20px 0;
+      }
+      .selectors-ten-by-ten:target, .selectors-ten-by-ten.ten-by-ten_target, .selectors-ten-by-ten.ten-by-ten-target {
+        background-position: 20px -10px;
+      }
+      .selectors-ten-by-ten:active, .selectors-ten-by-ten.ten-by-ten_active, .selectors-ten-by-ten.ten-by-ten-active {
+        background-position: 20px 10px;
+      }
+    CSS
+  end
 
-  it "should render corret sprite with css selectors via magic mixin" do
+  it "should render correct sprite with css selectors via magic mixin" do
     css = render <<-SCSS
       @import "selectors/*.png";
       a {
@@ -499,6 +555,7 @@ class SpritesTest < Test::Unit::TestCase
       }
     CSS
   end
+
   
   it "should not render corret sprite with css selectors via magic mixin" do
     css = render <<-SCSS
@@ -518,6 +575,33 @@ class SpritesTest < Test::Unit::TestCase
       }
     CSS
   end
+
+  it "should render corret sprite with css selectors via magic mixin with the correct offsets" do
+    css = render <<-SCSS
+      @import "selectors/*.png";
+      a {
+        @include selectors-sprite(ten-by-ten, false, 5, -5)
+      }
+    SCSS
+    assert_correct css, <<-CSS
+      .selectors-sprite, a {
+        background: url('/selectors-sedfef809e2.png') no-repeat;
+      }
+      
+      a {
+        background-position: 5px -5px;
+      }
+      a:hover, a.ten-by-ten_hover, a.ten-by-ten-hover {
+        background-position: 5px -25px;
+      }
+      a:target, a.ten-by-ten_target, a.ten-by-ten-target {
+        background-position: 5px -35px;
+      }
+      a:active, a.ten-by-ten_active, a.ten-by-ten-active {
+        background-position: 5px -15px;
+      }
+    CSS
+  end
   
   it "should raise error on filenames that are not valid sass syntax" do
     assert_raise(Compass::Error) do
@@ -603,5 +687,33 @@ class SpritesTest < Test::Unit::TestCase
       }
     CSS
   end
+    
+  it "should create horizontal sprite" do
+    css = render <<-SCSS
+      $squares-layout:horizontal;
+      @import "squares/*.png";
+      .foo {
+        @include sprite-background-position($squares-sprites, "twenty-by-twenty");
+      }
+      .bar {
+        @include sprite-background-position($squares-sprites, "ten-by-ten");
+      }
+    SCSS
+    assert_equal [30, 20], image_size('squares-s*.png')
+    other_css = <<-CSS
+      .squares-sprite {
+        background: url('/squares-s161c60ad78.png') no-repeat;
+      }
+
+      .foo {
+        background-position: -10px 0;
+      }
+
+      .bar {
+        background-position: 0 0;
+      }
+    CSS
+    assert_correct css.gsub("\n", '').gsub(' ', ''), other_css.gsub("\n", '').gsub(' ', '')
+  end
 
-end
+end

data/test/test_helper.rb

@@ -34,4 +34,32 @@ class Test::Unit::TestCase
   include Compass::IoHelper
   extend Compass::TestCaseHelper::ClassMethods
   
-end 
+end 
+
+module SpriteHelper
+  URI = "selectors/*.png"
+  
+  def init_sprite_helper
+    @images_src_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images')
+    @images_tmp_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images-tmp')
+  end
+  
+  def sprite_map_test(options)
+    importer = Compass::SpriteImporter.new
+    path, name = Compass::SpriteImporter.path_and_name(URI)
+    sprite_names = Compass::SpriteImporter.sprite_names(URI)
+    sass_engine = Compass::SpriteImporter.sass_engine(URI, name, importer, options)
+    Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| "selectors/#{n}.png"}, path, name, sass_engine, options)
+  end
+  
+  def create_sprite_temp
+     init_sprite_helper
+    ::FileUtils.cp_r @images_src_path, @images_tmp_path
+  end
+
+  def clean_up_sprites
+     init_sprite_helper
+    ::FileUtils.rm_r @images_tmp_path
+  end
+  
+end

data/test/units/configuration_test.rb

@@ -19,7 +19,6 @@ class ConfigurationTest < Test::Unit::TestCase
 
       project_type = :stand_alone
       
-      # Set this to the root of your project when deployed:
       http_path = "/"
       css_dir = "css"
       sass_dir = "sass"
@@ -101,7 +100,7 @@ class ConfigurationTest < Test::Unit::TestCase
 
     plugin_opts = Compass.configuration.to_sass_plugin_options
 
-    assert load_paths.include?("/home/chris/foo")
+    assert load_paths.include?("/home/chris/foo"), "Expected to find /home/chris/foo in #{load_paths.inspect}"
     assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
     assert_equal "/home/chris/my_compass_project/css/framework", plugin_opts[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
     assert_equal "/home/chris/my_compass_project/css/foo", plugin_opts[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
@@ -110,7 +109,6 @@ class ConfigurationTest < Test::Unit::TestCase
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
 
-# Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "css"
 
@@ -141,7 +139,7 @@ EXPECTED
 
     load_paths = load_paths_as_strings(Compass.configuration.to_sass_engine_options[:load_paths])
 
-    assert load_paths.include?("/home/chris/foo")
+    assert load_paths.include?("/home/chris/foo"), "Expected to find /home/chris/foo in #{load_paths.inspect}"
     assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
     assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
     assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
@@ -150,7 +148,6 @@ EXPECTED
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
 
-# Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "css"
 

data/test/units/rails_configuration_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+require 'compass'
+require 'stringio'
+
+class ConfigurationTest < Test::Unit::TestCase
+
+  setup do
+    Compass.reset_configuration!
+  end
+  
+  after do
+    Compass.reset_configuration!
+  end
+
+  def test_defaults
+    contents = StringIO.new(<<-CONFIG)
+      project_type = :rails
+    CONFIG
+    config = Compass.configuration_for(contents, "config/compass.rb")
+
+    Compass.add_project_configuration(config, :project_type => "rails")
+
+    assert_equal 'public/images', Compass.configuration.images_dir
+    assert_equal 'public/stylesheets', Compass.configuration.css_dir
+    assert_equal 'public/fonts', Compass.configuration.fonts_dir
+
+    assert_equal '/', Compass.configuration.http_path
+    assert_equal '/images', Compass.configuration.http_images_path
+    assert_equal '/stylesheets', Compass.configuration.http_stylesheets_path
+    assert_equal '/fonts', Compass.configuration.http_fonts_path
+
+    # Other default values must wait until I have a better idea of how to mock Sass::Util.app_geq
+  end
+
+  def test_http_path_change
+    contents = StringIO.new(<<-CONFIG)
+      project_type = :rails
+
+      http_path = "/test/alternative_path"
+    CONFIG
+    config = Compass.configuration_for(contents, "config/compass.rb")
+
+    Compass.add_project_configuration(config, :project_type => "rails")
+
+    assert_equal '/test/alternative_path', Compass.configuration.http_path
+    assert_equal '/test/alternative_path/images', Compass.configuration.http_images_path
+    assert_equal '/test/alternative_path/stylesheets', Compass.configuration.http_stylesheets_path
+    assert_equal '/test/alternative_path/fonts', Compass.configuration.http_fonts_path
+  end
+end

data/test/units/sass_extensions_test.rb

@@ -65,18 +65,21 @@ class SassExtensionsTest < Test::Unit::TestCase
   end
 
   def test_trig_functions
+    assert_equal "0.841", evaluate("sin(1)")
     assert_equal "0.841px", evaluate("sin(1px)")
     assert_equal "0.0", evaluate("sin(pi())")
     assert_equal "1",   evaluate("sin(pi() / 2)")
-    assert_equal "1",   evaluate("sin(180deg)")
+    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 "1", evaluate("cos(360deg)")
+    assert_equal "-0.176", 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 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)")
   end
@@ -95,9 +98,18 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "true", evaluate("prefixed(-css2, css2-fallback(css3, css2))")
   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)")
+  %w(stylesheet_url font_url image_url generated_image_url).each do |helper|
+    class_eval %Q{
+      def test_#{helper}_helper_defers_to_existing_helper
+        c = Class.new do
+          def #{helper}(*args)
+            :original
+          end
+        end
+        c.send(:include, Compass::SassExtensions::Functions::Urls)
+        assert_equal :original, c.new.#{helper}("logo.png")
+      end
+    }
   end
 
 protected

data/test/units/sprites/image_row_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+class ImageRowTest < Test::Unit::TestCase
+  include SpriteHelper
+  def setup
+    create_sprite_temp
+    file = StringIO.new("images_path = #{@images_src_path.inspect}\n")
+    Compass.add_configuration(file, "sprite_config")
+    @filenames = %w(large.png large_square.png medium.png tall.png small.png)
+    @image_files = Dir["#{@images_src_path}/image_row/*.png"].sort
+    @images = @image_files.map do |img|
+      img.gsub!("#{@images_src_path}/", '')
+      Compass::SassExtensions::Sprites::Image.new(nil, img, {})
+    end
+    image_row(1000)
+  end
+  
+  def teardown
+    clean_up_sprites
+  end
+  
+  def image_row(max)
+    @image_row = Compass::SassExtensions::Sprites::ImageRow.new(max)
+  end
+  
+  def populate_row
+    @images.each do |image|
+      assert @image_row.add(image)
+    end
+  end
+  
+  it "should return false if image will not fit in row" do
+    image_row(100)
+    img = Compass::SassExtensions::Sprites::Image.new(nil, File.join('image_row', 'large.png'), {})
+    assert !@image_row.add(img)
+  end
+  
+  it "should have 5 images" do
+    populate_row
+    assert_equal 5, @image_row.images.size
+  end
+  
+  it "should return max image width" do
+    populate_row
+    assert_equal 400, @image_row.width
+  end
+  
+  it "should return max image height" do
+    populate_row
+    assert_equal 40, @image_row.height
+  end
+  
+  it "should have an efficiency rating" do
+    populate_row
+    assert_equal 1 - (580.0 / 1000.0), @image_row.efficiency
+  end
+end

data/test/units/sprites/image_test.rb

@@ -1,49 +1,41 @@
 require 'test_helper'
 require 'mocha'
 require 'ostruct'
-class SpritesImageTest < Test::Unit::TestCase
-
 
+class SpritesImageTest < Test::Unit::TestCase
+  include SpriteHelper
   def setup
-    @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images')
-    file = StringIO.new("images_path = #{@images_src_path.inspect}\n")
-    Compass.add_configuration(file, "sprite_config")
-    @repeat = 'no-repeat'
-    @spacing = 0
-    @position = 100
-    @offset = 100
+    create_sprite_temp
   end
 
-  let(:sprite_filename) { 'squares/ten-by-ten.png' }
-  let(:sprite_path) { File.join(@images_src_path, sprite_filename) }
-  let(:sprite_name) { File.basename(sprite_filename, '.png') }
+  SPRITE_FILENAME =  'selectors/ten-by-ten.png'
   
-  def parent
-    importer = Compass::SpriteImporter.new(:uri => "selectors/*.png", :options => options)
-    @parent ||= Compass::SassExtensions::Sprites::SpriteMap.new(importer.sprite_names.map{|n| "selectors/#{n}.png"}, importer.path, importer.name, importer.sass_engine, importer.options)
+  def sprite_path 
+    File.join(@images_tmp_path, SPRITE_FILENAME)
   end
   
-  let(:options) do
-    options = {:offset => @offset}
-    options.stubs(:get_var).with(anything).returns(nil)
-    ::OpenStruct.any_instance.stubs(:unitless?).returns(true)
-    options.stubs(:get_var).with("#{sprite_name}-repeat").returns(::OpenStruct.new(:value => @repeat))
-    options.stubs(:get_var).with("#{sprite_name}-spacing").returns(::OpenStruct.new(:value => @spacing))
-    options.stubs(:get_var).with("#{sprite_name}-position").returns(::OpenStruct.new(:value => @position))
-    options
+  def sprite_name
+    File.basename(SPRITE_FILENAME, '.png')
   end
   
-
+  def digest
+    Digest::MD5.file(sprite_path).hexdigest
+  end
   
-  let(:digest) { Digest::MD5.file(sprite_path).hexdigest }
-
-
-  let(:image) { Compass::SassExtensions::Sprites::Image.new(parent, File.join(sprite_filename), options)}
+  def test_map(options ={})
+    options = {'cleanup' => Sass::Script::Bool.new(true), 'layout' => Sass::Script::String.new('vertical')}.merge(options)
+    map = sprite_map_test(options)
+  end
+  
+  def test_image(options ={})
+    test_map(options).images.first
+  end
 
   test 'initialize' do
+    image = test_image
     assert_equal sprite_name, image.name
     assert_equal sprite_path, image.file
-    assert_equal sprite_filename, image.relative_file
+    assert_equal SPRITE_FILENAME, image.relative_file
     assert_equal 10, image.width
     assert_equal 10, image.height
     assert_equal digest, image.digest
@@ -52,46 +44,62 @@ class SpritesImageTest < Test::Unit::TestCase
   end
 
   test 'hover' do
-    assert_equal 'ten-by-ten_hover', image.hover.name
+    assert_equal 'ten-by-ten_hover', test_image.hover.name
   end
 
   test 'no parent' do
-    assert_nil image.parent
-  end
-
-  test 'image type is nil' do
-    @repeat = nil
-    assert_nil image.repeat
+    assert_nil test_image.parent
   end
-
   
   test 'image type is "global"' do
-    @repeat = 'global'
-    assert_equal @repeat, image.repeat
+    image = test_image "ten_by_ten_repeat" => Sass::Script::String.new('global')
+    assert_equal 'global', image.repeat
   end
   
   test 'image type is "no-repeat"' do
-    assert_equal 'no-repeat', image.repeat
+    assert_equal 'no-repeat', test_image.repeat
   end
 
   test 'image position' do
-    assert_equal Sass::Script::Number.new(100, ["px"]).value, image.position.value
+    image = test_image "ten_by_ten_position" => Sass::Script::Number.new(100, ["px"])
+    assert_equal 100, image.position.value
   end
 
   test 'image spacing' do
     @spacing = 10
-    assert_equal @spacing, image.spacing
+    image = test_image "spacing" => Sass::Script::Number.new(100, ["px"])
+    assert_equal 100, image.spacing
   end
   
   test 'offset' do
-    assert_equal @offset, image.offset
+    image = test_image "ten_by_ten_position" => Sass::Script::Number.new(100, ["px"])
+    assert_equal 100, image.offset
   end
 
   test 'neither, uses 0' do
-    @offset = 0
-    img = image
+    img = test_image
     img.position.stubs(:unitless?).returns(false)
     assert_equal 0, img.offset
   end
 
+
+  test 'gets name for sprite in search path' do
+    Compass.reset_configuration!
+    uri = 'foo/*.png'
+    other_folder = File.join(@images_tmp_path, '../other-temp')
+    FileUtils.mkdir_p other_folder
+    FileUtils.mkdir_p File.join(other_folder, 'foo')
+    %w(my bar).each do |file|
+      FileUtils.touch(File.join(other_folder, "foo/#{file}.png"))
+    end
+    config = Compass::Configuration::Data.new('config')
+    config.images_path = @images_tmp_path
+    config.sprite_load_path = [@images_tmp_path, other_folder]
+    Compass.add_configuration(config, "sprite_config")
+    image = Compass::SassExtensions::Sprites::Image.new(test_map, "foo/my.png", {})
+    assert_equal File.join(other_folder, 'foo/my.png'), image.file
+    assert_equal 0, image.size
+    FileUtils.rm_rf other_folder
+  end
+
 end