compass 0.12.alpha.2 → 0.12.alpha.3

data/VERSION.yml

@@ -2,5 +2,5 @@
 :major: 0
 :minor: 12
 :state: alpha
-:build: 2
+:build: 3
 :name: Alnilam

data/examples/compass/compass_app_log.txt

@@ -0,0 +1,6 @@
+2011-12-22 23:55:48 overwrite stylesheets/bp_layout.css 
+2011-12-22 23:55:48 identical stylesheets/compass.css 
+2011-12-22 23:55:49 overwrite stylesheets/pie.css 
+2011-12-22 23:59:05 identical stylesheets/bp_layout.css 
+2011-12-22 23:59:05 identical stylesheets/compass.css 
+2011-12-22 23:59:05 identical stylesheets/pie.css 

data/features/extensions.feature

@@ -15,7 +15,7 @@ Feature: Extensions
   @listframeworks
   Scenario: Extensions directory for rails projects
     Given ruby supports fork
-    And I'm in a newly created rails project: my_rails_project
+    And I'm in a newly created rails project: extension_test_rails_project
     And I run: compass init rails
     And the "vendor/plugins/compass_extensions" directory exists
     And and I have a fake extension at vendor/plugins/compass_extensions/testing

data/features/step_definitions/command_line_steps.rb

@@ -42,10 +42,11 @@ Given %r{^I am in the parent directory$} do
 end
 
 Given %r{^I'm in a newly created rails project: (.+)$} do |project_name|
-  @cleanup_directories << project_name
+  dir = File.join(Dir.pwd, project_name)
+  @cleanup_directories << dir
   begin
-    generate_rails_app project_name
-    Dir.chdir project_name
+    generate_rails_app project_name, Dir.pwd
+    Dir.chdir dir
   rescue LoadError
     pending "Missing Ruby-on-rails gems: sudo gem install rails"
   end
@@ -136,13 +137,13 @@ end
 Then "the following files are reported removed:" do |table|
   table.rows.each do |css_file|
     #need to find a better way but this works for now
-    Then %Q{a css file #{css_file.first} is reported removed}
+    step %Q{a css file #{css_file.first} is reported removed}
   end
 end
 
 Then "the following files are removed:" do |table|
   table.rows.each do |css_file|
-    Then %Q{a css file #{css_file.first} is removed}
+    step %Q{a css file #{css_file.first} is removed}
   end
 end
 
@@ -258,7 +259,7 @@ end
 Then /^I should see the following "([^"]+)" commands:$/ do |kind, table|
 
 
-  Then %Q{I should be shown a list of "#{kind}" commands}
+  step %Q{I should be shown a list of "#{kind}" commands}
 
   commands = @last_command_list.map{|c| c =~ /^\s+\* ([^ ]+)\s+- [A-Z].+$/; [$1]}
   table.diff!(commands)

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

@@ -45,7 +45,7 @@ $default-box-shadow-inset : false !default;
   }
   $shadow : compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10);
   @include experimental(box-shadow, $shadow,
-    -moz, -webkit, -o, not -ms, not -khtml, official
+    -moz, -webkit, not -o, not -ms, not -khtml, official
   );
 }
 

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

@@ -91,12 +91,12 @@
 
 // Border image property support for vendor prefixing properties and values.
 @mixin border-image($value) {
-  @if $experimental-support-for-mozilla      {    -moz-border-image:    -moz(-compass-list($value)); }
-  @if $support-for-original-webkit-gradients { -webkit-border-image:    -owg(-compass-list($value)); }
-  @if $experimental-support-for-webkit       { -webkit-border-image: -webkit(-compass-list($value)); }
-  @if $experimental-support-for-opera        {      -o-border-image:      -o(-compass-list($value)); }
-  @if $experimental-support-for-svg          {         border-image:    -svg(-compass-list($value)); }
-                                                       border-image:                       $value;
+  @if $experimental-support-for-mozilla      {    -moz-border-image:    -moz(reject(-compass-list($value), fill)); }
+  @if $support-for-original-webkit-gradients { -webkit-border-image:    -owg(reject(-compass-list($value), fill)); }
+  @if $experimental-support-for-webkit       { -webkit-border-image: -webkit(reject(-compass-list($value), fill)); }
+  @if $experimental-support-for-opera        {      -o-border-image:      -o(reject(-compass-list($value), fill)); }
+  @if $experimental-support-for-svg          {         border-image:    -svg(reject(-compass-list($value), fill)); }
+                                                       border-image:                              $value;
 }
 
 // List style image property support for vendor prefixing within values.

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

@@ -15,9 +15,14 @@ $ie-font-ratio: 16px / 100%;
 // Set to false if you want to use absolute pixes in sizing your typography.
 $relative-font-sizing: true !default;
 
+// Allows the `adjust-font-size-to` mixin and the `lines-for-font-size` function
+// to round the line height to the nearest half line height instead of the
+// nearest integral line height to avoid large spacing between lines.
+$round-to-nearest-half-line: false !default;
+
 // Ensure there is at least this many pixels
 // of vertical padding above and below the text.
-$min-line-padding: 2px;
+$min-line-padding: 2px !default;
 
 // $base-font-size but in your output unit of choice.
 // Defaults to 1em when `$relative-font-sizing`
@@ -59,6 +64,11 @@ $base-half-leader: $base-leader / 2;
   }
 }
 
+// resets the baseline to 1 leading unit
+@mixin reset-baseline {
+  @include adjust-leading-to(1, if($relative-font-sizing, $base-font-size, $base-font-size));
+}
+
 // Show a background image that can be used to debug your alignments.
 // include the $img argument if you would rather use your own image than the
 // Compass default gradient image.
@@ -103,9 +113,11 @@ $base-half-leader: $base-leader / 2;
 }
 
 @function lines-for-font-size($font-size) {
-  $lines: ceil($font-size / $base-line-height);
+  $lines: if($round-to-nearest-half-line,
+              ceil(2 * $font-size / $base-line-height) / 2,
+              ceil($font-size / $base-line-height));
   @if $lines * $base-line-height - $font-size < $min-line-padding * 2 {
-    $lines: $lines + 1;
+    $lines: $lines + if($round-to-nearest-half-line, 0.5, 1);
   }
   @return $lines;
 }

data/lib/compass/configuration/helpers.rb

@@ -67,12 +67,19 @@ module Compass
           end
         end
         unless @callbacks_loaded
-          Sass::Plugin.on_updating_stylesheet do |sass_file, css_file|
-            Compass.configuration.run_stylesheet_saved(css_file)
+          on_saved = Proc.new do |sass_file, css_file|
+                       Compass.configuration.run_stylesheet_saved(css_file)
+                     end
+          if Sass::Plugin.respond_to?(:on_updated_stylesheet)
+            Sass::Plugin.on_updated_stylesheet(&on_saved)
+          else
+            Sass::Plugin.on_updating_stylesheet(&on_saved)
           end
+          
           Sass::Plugin.on_compilation_error do |e, filename, css|
             Compass.configuration.run_stylesheet_error(filename, e.message)
           end
+          
           @callbacks_loaded = true
         end
       end
@@ -92,6 +99,16 @@ module Compass
       def add_project_configuration(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         configuration_file_path = args.shift || detect_configuration_file
+        
+        # TODO make this better i don't think it belongs here but it gets the job done
+        # This will allow compass to boot rails and load the config if its configured in the application.rb file via railtie
+        # if File.exists?(projectize('config/boot.rb')) && configuration_file_path.nil?
+        #   require 'rails'
+        #   require projectize('config/application.rb')
+        #   options[:project_type] = :rails
+        # end
+
+        
         raise ArgumentError, "Too many arguments" if args.any?
         if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type

data/lib/compass/sass_extensions/functions/image_size.rb

@@ -1,13 +1,13 @@
 module Compass::SassExtensions::Functions::ImageSize
   # Returns the width of the image relative to the images directory
   def image_width(image_file)
-    width, _ = image_demensions(image_file)
+    width, _ = image_dimensions(image_file)
     Sass::Script::Number.new(width,["px"])
   end
   
   # Returns the height of the image relative to the images directory
   def image_height(image_file)
-    _, height = image_demensions(image_file)
+    _, height = image_dimensions(image_file)
     Sass::Script::Number.new(height, ["px"])
   end
 
@@ -44,7 +44,7 @@ module Compass::SassExtensions::Functions::ImageSize
 
 private
 
-  def image_demensions(image_file)
+  def image_dimensions(image_file)
     options[:compass] ||= {}
     options[:compass][:image_dimensions] ||= {}
     options[:compass][:image_dimensions][image_file.value] = ImageProperties.new(image_path_for_size(image_file.value)).size

data/lib/compass/sass_extensions/functions/lists.rb

@@ -74,6 +74,11 @@ module Compass::SassExtensions::Functions::Lists
     Sass::Script::List.new list.values[start_index..end_index], list.separator
   end
 
+  # removes the given values from the list.
+  def reject(list, *values)
+    Sass::Script::List.new(list.value.reject{|v| values.any?{|o| v == o}}, list.separator)
+  end
+
   # returns the first value of a space delimited list.
   def first_value_of(list)
     if list.is_a?(Sass::Script::String)

data/lib/compass/sass_extensions/sprites.rb

@@ -2,11 +2,13 @@ require 'digest/md5'
 require 'compass/sprite_importer'
 
 module Compass
+  class SpriteException < Exception; end
   module SassExtensions
     module Sprites
     end
   end
 end
+
 require 'compass/sass_extensions/sprites/image_row'
 require 'compass/sass_extensions/sprites/row_fitter'
 require 'compass/sass_extensions/sprites/image'

data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb

@@ -13,19 +13,7 @@ module Compass
           @canvas = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
           images.each do |image|
             input_png  = ChunkyPNG::Image.from_file(image.file)
-            if image.repeat == "no-repeat"
-              canvas.replace! input_png, image.left, image.top
-            else
-              x = image.left - (image.left / image.width).ceil * image.width
-              while x < width do
-                begin
-                  canvas.replace! input_png, x, image.top
-                  x += image.width 
-                rescue ChunkyPNG::OutOfBounds
-                  break;
-                end
-              end
-            end
+            canvas.replace! input_png, image.left, image.top
           end
         end    
         

data/lib/compass/sass_extensions/sprites/image.rb

@@ -6,6 +6,11 @@ module Compass
         TARGET = %r{[_-]target$}
         HOVER = %r{[_-]hover$}
         PARENT = %r{(.+)[-_](.+)$}
+
+        REPEAT_X = 'repeat-x'
+        NO_REPEAT = 'no-repeat'
+
+        VALID_REPEATS = [REPEAT_X, NO_REPEAT]
         
         attr_reader :relative_file, :options, :base
         attr_accessor :top, :left
@@ -53,8 +58,23 @@ module Compass
         end
 
         # Value of <tt> $#{name}-repeat </tt> or <tt> $repeat </tt>
-        def repeat
-         @repeat ||= (get_var_file("repeat") || options.get_var("repeat") || Sass::Script::String.new("no-repeat")).value
+        def repeat 
+          @repeat ||= begin 
+            rep = (get_var_file("repeat") || options.get_var("repeat") || Sass::Script::String.new(NO_REPEAT)).value
+            unless VALID_REPEATS.include? rep
+              raise SpriteException, "Invalid option for repeat \"#{rep}\" - valid options are #{VALID_REPEATS.join(', ')}"
+            end
+
+            rep
+          end
+        end
+
+        def repeat_x?
+          repeat == REPEAT_X
+        end
+
+        def no_repeat?
+          repeat == NO_REPEAT
         end
 
         # Value of <tt> $#{name}-position </tt> or <tt> $position </tt> defaults to <tt>0px</tt>

data/lib/compass/sass_extensions/sprites/layout_methods.rb

@@ -5,6 +5,7 @@ module Compass
         HORIZONTAL = 'horizontal'
         DIAGONAL = 'diagonal'
         SMART = 'smart'
+        VERTICAL = 'vertical'
         
         def smart?
           layout == SMART
@@ -17,6 +18,10 @@ module Compass
         def diagonal?
           layout == DIAGONAL
         end
+
+        def vertical?
+          layout == VERTICAL
+        end
         
         def layout
           @layout ||= @kwargs.get_var('layout').value
@@ -43,11 +48,38 @@ module Compass
                 b.size <=> a.size
               end
             end
+
             @width = width_for_vertical_layout
             calulate_vertical_postions
             @height = height_for_vertical_layout
+            if @images.any?(&:repeat_x?)
+              calculate_repeat_extra_width!
+              tile_images_that_repeat
+             end
           end
         end
+
+        def tile_images_that_repeat
+          @images.map {|img| img if img.repeat_x?}.compact.each do |image|
+            x = image.left - (image.left / image.width).ceil * image.width
+              while x < @width do
+                begin
+                  img = image.dup
+                  img.top = image.top
+                  img.left = x.to_i
+                  @images << img
+                  x += image.width 
+                end
+              end
+            end
+        end
+
+        def calculate_repeat_extra_width!
+          require 'rational' #for ruby 1.8.7
+          m = @images.inject(1) {|m,img| img.repeat_x? ? m.lcm(img.width) : m}
+          remainder = @width % m
+          @width += (m - remainder) unless remainder.zero?
+        end
         
         def calculate_smart_positions
           fitter = ::Compass::SassExtensions::Sprites::RowFitter.new(@images)
@@ -97,7 +129,7 @@ module Compass
         
         def calulate_vertical_postions
           @images.each_with_index do |image, index|
-            image.left = image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100.0) : image.position.value
+            image.left = (image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100.0) : image.position.value).to_i
             next if index == 0
             last_image = @images[index-1]
             image.top = last_image.top + last_image.height + [image.spacing,  last_image.spacing].max

data/lib/compass/sass_extensions/sprites/sprite_map.rb

@@ -49,7 +49,14 @@ module Compass
         end
 
         def inspect
-          to_s
+          puts 'images'
+          @images.each do |img|
+            puts img.file
+          end
+          puts "options"
+          @kwargs.each do |k,v|
+            puts "#{k}:#{v}"
+          end
         end
 
         def to_s(kwargs = self.kwargs)

data/lib/compass/sass_extensions/sprites/sprite_methods.rb

@@ -27,8 +27,7 @@ module Compass
         # Creates the Sprite::Image objects for each image and calculates the width
         def init_images
           @images = image_names.collect do |relative_file|
-            image = Compass::SassExtensions::Sprites::Image.new(self, relative_file, kwargs)
-            image
+            Image.new(self, relative_file, kwargs)
           end
         end
         
@@ -69,7 +68,7 @@ module Compass
         end
         
         def cleanup_old_sprites
-          Dir[File.join(Compass.configuration.images_path, "#{path}-*.png")].each do |file|
+          Dir[File.join(Compass.configuration.images_path, "#{path}-s*.png")].each do |file|
             log :remove, file
             FileUtils.rm file
             Compass.configuration.run_sprite_removed(file)

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

@@ -1,17 +1,14 @@
 .box-shadow {
   -webkit-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
   -moz-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
-  -o-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
   box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222; }
 
 .single-box-shadow {
   -webkit-box-shadow: 0px 0px 5px #333333;
   -moz-box-shadow: 0px 0px 5px #333333;
-  -o-box-shadow: 0px 0px 5px #333333;
   box-shadow: 0px 0px 5px #333333; }
 
 .multiple-box-shadows {
   -webkit-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
   -moz-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
-  -o-box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222;
   box-shadow: 0px 0px 5px #333333, 2px 2px 5px #222222; }

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

@@ -40,3 +40,6 @@ html > body {
   border-bottom-style: solid;
   border-bottom-width: 0.25em;
   padding-bottom: 0.417em; }
+
+.reset {
+  line-height: 1.143em; }

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

@@ -11,4 +11,6 @@ $base-line-height: 16px;
 .small-padded { @include adjust-font-size-to(12px,1); @include rhythm(1,1,1,1,12px); }
 
 .borders { @include h-borders(1px,1); }
-.large-borders { @include adjust-font-size-to(24px,3); @include h-borders(6px,1,24px); }
+.large-borders { @include adjust-font-size-to(24px,3); @include h-borders(6px,1,24px); }
+
+.reset { @include reset-baseline; }

data/test/helpers/rails.rb

@@ -10,7 +10,7 @@ module Compass
     # Generate a rails application without polluting our current set of requires
     # with the rails libraries. This will allow testing against multiple versions of rails
     # by manipulating the load path.
-    def generate_rails_app(name)
+    def generate_rails_app(name, dir = nil)
       if pid = fork
         Process.wait(pid)
         if $?.exitstatus == 2
@@ -22,7 +22,16 @@ module Compass
         begin
           require 'action_pack/version'
           if ActionPack::VERSION::MAJOR >= 3
-            `rails new #{name}`
+            require 'rails/generators'
+            require 'rails/generators/rails/app/app_generator'
+            require 'mocha'
+            dir ||= File.join(File.expand_path('../../', __FILE__))
+            args = [File.join(dir, name), '-q', '-f', '--skip-bundle', '--skip-gemfile']
+            
+            #stub this so you can generate more apps
+            Rails::Generators::AppGenerator.any_instance.stubs(:valid_const?).returns(true)
+            Rails::Generators::AppGenerator.start(args, {:destination_root => dir})
+            
           else
             require 'rails/version'
             require 'rails_generator'

data/test/integrations/sprites_test.rb

@@ -374,13 +374,13 @@ class SpritesTest < Test::Unit::TestCase
 
   it "should repeat the image" do
     css = render <<-SCSS
-      $squares-repeat: repeat;
+      $squares-repeat: repeat-x;
       @import "squares/*.png";
       @include all-squares-sprites;
     SCSS
     assert_correct css, <<-CSS
       .squares-sprite, .squares-ten-by-ten, .squares-twenty-by-twenty {
-        background: url('/squares-sbab486c25a.png') no-repeat;
+        background: url('/squares-s65c43cd573.png') no-repeat;
       }
       
       .squares-ten-by-ten {
@@ -628,7 +628,7 @@ class SpritesTest < Test::Unit::TestCase
     SCSS
     assert_correct css, <<-CSS
       .ko-sprite, .ko-default_background, .ko-starbg26x27 {
-        background: url('/ko-sd6b4d44430.png') no-repeat;
+        background: url('/ko-sd46dfbab4f.png') no-repeat;
       }
       
       .ko-default_background {

data/test/test_helper.rb

@@ -23,6 +23,12 @@ require 'compass'
 require 'test/unit'
 
 
+class String
+  def name
+    to_s
+  end
+end
+
 %w(command_line diff io rails test_case).each do |helper|
   require "helpers/#{helper}"
 end
@@ -49,7 +55,7 @@ module SpriteHelper
     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)
-    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| "selectors/#{n}.png"}, path, name, sass_engine, options)
+    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| uri.gsub('*', n)}, path, name, sass_engine, options)
     map.options = {:compass => {:logger => Compass::NullLogger.new}}
     map
   end
@@ -60,8 +66,9 @@ module SpriteHelper
   end
 
   def clean_up_sprites
-     init_sprite_helper
-    ::FileUtils.rm_r @images_tmp_path
+    init_sprite_helper
+    ::FileUtils.rm_r @images_tmp_path   
+  rescue Errno::ENOENT => e  
   end
   
 end

data/test/units/actions_test.rb

@@ -13,7 +13,7 @@ class ActionsTest < Test::Unit::TestCase
   end
   
   # When log4r is included, it sometimes breaks the Actions
-  def test_quiet_option
+  test "test_quiet_option" do
     b = BaseActionExtender.new
     b.logger = ""
     b.options[:quiet] = true

data/test/units/sass_extensions_test.rb

@@ -152,6 +152,10 @@ class SassExtensionsTest < Test::Unit::TestCase
     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)")
+  end
 
 protected
   def evaluate(value)

data/test/units/sprites/engine_test.rb

@@ -1,14 +1,19 @@
 require 'test_helper'
 
 class EngineTest < Test::Unit::TestCase
-  
+  include SpriteHelper
   def setup
+    create_sprite_temp
     sprite_filename = 'squares/ten-by-ten.png'
     @images = [
        Compass::SassExtensions::Sprites::Image.new(nil, File.join(sprite_filename), {}) 
       ]
     @engine = Compass::SassExtensions::Sprites::Engine.new(100, 100, @images)
   end
+
+  def taredown
+    clean_up_sprites
+  end
   
   
   test "should have width of 100" do

data/test/units/sprites/image_row_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 class ImageRowTest < Test::Unit::TestCase
   include SpriteHelper
   def setup
+    clean_up_sprites
     create_sprite_temp
     file = StringIO.new("images_path = #{@images_src_path.inspect}\n")
     Compass.add_configuration(file, "sprite_config")

data/test/units/sprites/image_test.rb

@@ -4,10 +4,15 @@ require 'ostruct'
 
 class SpritesImageTest < Test::Unit::TestCase
   include SpriteHelper
+
   def setup
     create_sprite_temp
   end
 
+  def teardown
+    clean_up_sprites
+  end
+
   SPRITE_FILENAME =  'selectors/ten-by-ten.png'
   
   def sprite_path 
@@ -51,13 +56,22 @@ class SpritesImageTest < Test::Unit::TestCase
     assert_nil test_image.parent
   end
   
-  test 'image type is "global"' do
-    image = test_image "selectors_ten_by_ten_repeat" => Sass::Script::String.new('global')
-    assert_equal 'global', image.repeat
+  test 'image type is "global" should raise exception' do
+    assert_raise ::Compass::SpriteException do
+      image = test_image "selectors_ten_by_ten_repeat" => Sass::Script::String.new('global')
+      image.repeat
+    end
   end
   
   test 'image type is "no-repeat"' do
-    assert_equal 'no-repeat', test_image.repeat
+    img = test_image
+    assert_equal 'no-repeat', img.repeat
+    assert img.no_repeat?
+  end
+
+  test 'image repeat-x' do
+    img = test_image "selectors_ten_by_ten_repeat" => Sass::Script::String.new('repeat-x')
+    assert img.repeat_x?
   end
 
   test 'image position' do
@@ -82,24 +96,4 @@ class SpritesImageTest < Test::Unit::TestCase
     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

data/test/units/sprites/layout_test.rb

@@ -0,0 +1,155 @@
+require 'test_helper'
+
+class LayoutTest < Test::Unit::TestCase
+  include SpriteHelper
+
+  def setup
+    Hash.send(:include, Compass::SassExtensions::Functions::Sprites::VariableReader)
+    clean_up_sprites
+    create_sprite_temp
+    file = StringIO.new("images_path = #{@images_tmp_path.inspect}\n")
+    Compass.add_configuration(file, "sprite_config")
+    Compass.configure_sass_plugin!
+    @options = {'cleanup' => Sass::Script::Bool.new(true), 'layout' => Sass::Script::String.new('vertical')}
+  end
+
+  def teardown
+    clean_up_sprites
+  end
+    
+  # HELPERS
+  
+  def vertical
+    opts = @options.merge("layout" => Sass::Script::String.new('vertical'))
+
+    sprite_map_test(opts)
+  end
+
+  def smart
+    options = @options.merge("layout" => Sass::Script::String.new('smart'))
+    importer = Compass::SpriteImporter.new
+    uri = "image_row/*.png"
+    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)
+    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map {|n| "image_row/#{n}.png"}, path, name, sass_engine, options)
+    map.options = {:compass => {:logger => Compass::NullLogger.new}}
+
+    map
+  end
+
+  def diagonal
+    opts = @options.merge("layout" => Sass::Script::String.new('diagonal'))
+
+    sprite_map_test(opts)
+  end
+
+  def horizontal(options= {})
+    opts = @options.merge("layout" => Sass::Script::String.new('horizontal'))
+    opts.merge!(options)
+
+    sprite_map_test(opts)
+  end
+
+  # REPEAT_X
+
+  test 'repeat-x layout single image' do
+    opts = {"repeat_x_three_repeat" => Sass::Script::String.new('repeat-x')}
+    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, 0, 0, 0, 0, 0, 3], map.images.map(&:left)
+  end
+
+  test 'repeat-x layout multi image' do
+    opts = {"repeat_x_three_repeat" => Sass::Script::String.new('repeat-x'), "repeat_x_four_repeat" => Sass::Script::String.new('repeat-x')}
+    map = sprite_map_test(@options.merge(opts), 'repeat_x/*.png')
+    assert_equal 12, map.width
+  end
+
+  # VERTICAL LAYOUT
+
+  it "should have a vertical layout" do
+    vert = vertical
+    assert_equal [0, 10, 20, 30], vert.images.map(&:top)
+    assert_equal [0, 0, 0, 0], vert.images.map(&:left)
+    assert vert.vertical?
+  end
+  
+  it "should have a vertical layout with spacing" do
+    vert = sprite_map_test(@options.merge({"spacing" => Sass::Script::Number.new(10, ['px'])}))
+    assert_equal [0, 20, 40, 60], vert.images.map(&:top)
+  end
+  
+  it "should layout vertical with position" do
+    vert = sprite_map_test("selectors_ten_by_ten_active_position" => Sass::Script::Number.new(10, ['px']))
+    assert_equal [0, 10, 0, 0], vert.images.map(&:left)
+  end
+
+  it "should generate vertical sprites in decending order" do
+    sizes = vertical.images.map{|image| File.size(image.file) }
+    assert_equal sizes.min, File.size(vertical.images.first.file)
+    assert_equal sizes.max, File.size(vertical.images.last.file)
+  end
+
+  # SMART LAYOUT
+  
+  it "should have a smart layout" do
+    base = smart
+    base.generate
+    assert base.smart?
+    assert_equal 400, base.width
+    assert_equal 60, base.height
+    assert_equal [[0, 0], [20, 120], [20, 0], [20, 100], [20, 160]], base.images.map {|i| [i.top, i.left]}
+    assert File.exists?(base.filename)
+    FileUtils.rm base.filename
+  end
+
+  # DIAGONAL LAYOUT
+  
+  it "should generate a diagonal sprite" do
+    base = diagonal
+    base.generate
+    assert base.diagonal?
+    assert_equal 40, base.width
+    assert_equal 40, base.height
+    assert_equal [[30, 0], [20, 10], [10, 20], [0, 30]], base.images.map {|i| [i.top, i.left]}
+    assert File.exists?(base.filename)
+    FileUtils.rm base.filename
+  end
+
+  # HORIZONTAL LAYOUT
+  
+  it "should have a horizontal layout" do
+    base = horizontal
+    assert base.horizontal?
+    assert_equal 10, base.height
+    assert_equal 40, base.width
+  end
+  
+  it "should layout images horizontaly" do
+    base = horizontal
+    assert_equal [0, 10, 20, 30], base.images.map(&:left)
+    assert_equal [0, 0, 0, 0],  base.images.map(&:top)
+  end
+  
+  it "should layout horizontaly with spacing" do
+    base = horizontal("spacing" => Sass::Script::Number.new(10, ['px']))
+    assert_equal [0, 20, 40, 60], base.images.map(&:left)
+    assert_equal [0, 0, 0, 0], base.images.map(&:top)
+    assert_equal 80, 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)
+  end
+  
+  it "should generate a horrizontal sprite" do
+    base = horizontal
+    base.generate
+    assert File.exists?(base.filename)
+    FileUtils.rm base.filename
+  end
+    
+end

data/test/units/sprites/sprite_command_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
-
+require 'compass/exec'
 class SpriteCommandTest < Test::Unit::TestCase
+  include Compass::TestCaseHelper
+  include Compass::CommandLineHelper
+  include Compass::IoHelper
+  
   attr_reader :test_dir
   include SpriteHelper
   def setup
@@ -27,7 +31,7 @@ class SpriteCommandTest < Test::Unit::TestCase
   def run_compass_with_options(options)
     output = 'foo'
     ::Dir.chdir @test_dir
-    %x{compass #{options.join(' ')}}
+    compass *options
   end
 
   def options_to_cli(options)

data/test/units/sprites/sprite_map_test.rb

@@ -80,102 +80,6 @@ class SpriteMapTest < Test::Unit::TestCase
     @base.generate
     assert !File.exists?(file), "Sprite file did not get removed"
   end
-
-  it "should have a vertical layout" do
-    assert_equal [0, 10, 20, 30], @base.images.map(&:top)
-    assert_equal [0, 0, 0, 0], @base.images.map(&:left)
-  end
-  
-  it "should have a vertical layout with spacing" do
-    base = sprite_map_test(@options.merge({"spacing" => Sass::Script::Number.new(10, ['px'])}))
-    assert_equal [0, 20, 40, 60], base.images.map(&:top)
-  end
-  
-  it "should layout vertical with position" do
-    base = sprite_map_test("selectors_ten_by_ten_active_position" => Sass::Script::Number.new(10, ['px']))
-    assert_equal [0, 10, 0, 0], base.images.map(&:left)
-  end
-  
-  def smart
-    options = @options.merge("layout" => Sass::Script::String.new('smart'))
-    importer = Compass::SpriteImporter.new
-    uri = "image_row/*.png"
-    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)
-    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map {|n| "image_row/#{n}.png"}, path, name, sass_engine, options)
-    map.options = {:compass => {:logger => Compass::NullLogger.new}}
-    map
-  end
-  
-  it "should have a smart layout" do
-    base = smart
-    base.generate
-    assert_equal 400, base.width
-    assert_equal 60, base.height
-    assert_equal [[0, 0], [20, 120], [20, 0], [20, 100], [20, 160]], base.images.map {|i| [i.top, i.left]}
-    assert File.exists?(base.filename)
-    FileUtils.rm base.filename
-  end
-
-  def diagonal
-    opts = @options.merge("layout" => Sass::Script::String.new('diagonal'))
-    sprite_map_test(opts)
-  end
-  
-  it "should generate a diagonal sprite" do
-    base = diagonal
-    base.generate
-    assert_equal 40, base.width
-    assert_equal 40, base.height
-    assert_equal [[30, 0], [20, 10], [10, 20], [0, 30]], base.images.map {|i| [i.top, i.left]}
-    assert File.exists?(base.filename)
-    FileUtils.rm base.filename
-  end
-
-  # Horizontal tests
-  def horizontal(options= {})
-    opts = @options.merge("layout" => Sass::Script::String.new('horizontal'))
-    opts.merge!(options)
-    sprite_map_test(opts)
-  end
-  
-  it "should have a horizontal layout" do
-    base = horizontal
-    assert_equal 10, base.height
-    assert_equal 40, base.width
-  end
-  
-  it "should layout images horizontaly" do
-    base = horizontal
-    assert_equal [0, 10, 20, 30], base.images.map(&:left)
-    assert_equal [0, 0, 0, 0], base.images.map(&:top)
-  end
-  
-  it "should layout horizontaly with spacing" do
-    base = horizontal("spacing" => Sass::Script::Number.new(10, ['px']))
-    assert_equal [0, 20, 40, 60], base.images.map(&:left)
-    assert_equal [0, 0, 0, 0], base.images.map(&:top)
-    assert_equal 80, 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)
-  end
-  
-  it "should generate a horrizontal sprite" do
-    base = horizontal
-    base.generate
-    assert File.exists?(base.filename)
-    FileUtils.rm base.filename
-  end
-    
-  it "should generate vertical sprites in decending order" do
-    sizes = @base.images.map{|image| File.size(image.file) }
-    assert_equal sizes.min, File.size(@base.images.first.file)
-    assert_equal sizes.max, File.size(@base.images.last.file)
-  end
   
   test "should get correct relative_name" do
     Compass.reset_configuration!
@@ -205,5 +109,23 @@ class SpriteMapTest < Test::Unit::TestCase
     base = sprite_map_test(@options.merge('selectors_ten_by_ten_position' => percent))
     assert_equal percent, base.image_for('ten-by-ten').position
   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(@base, "foo/my.png", {})
+    assert_equal File.join(other_folder, 'foo/my.png'), image.file
+    assert_equal 0, image.size
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 0.12.alpha.2
+  version: 0.12.alpha.3
   prerelease: 5
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-12-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70104972023440 !ruby/object:Gem::Requirement
+  requirement: &70118335109760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +25,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70104972023440
+  version_requirements: *70118335109760
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &70104972022940 !ruby/object:Gem::Requirement
+  requirement: &70118335109100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70104972022940
+  version_requirements: *70118335109100
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70104972022480 !ruby/object:Gem::Requirement
+  requirement: &70118335108460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,7 +47,7 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70104972022480
+  version_requirements: *70118335108460
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation
   and maintainance of CSS.
 email: chris@eppsteins.net
@@ -127,6 +127,7 @@ files:
 - examples/compass/bootstrap.rb
 - examples/compass/clean.rb
 - examples/compass/compass.html.haml
+- examples/compass/compass_app_log.txt
 - examples/compass/config.rb
 - examples/compass/headers.txt
 - examples/compass/images/blue_arrow.gif
@@ -827,6 +828,11 @@ files:
 - test/fixtures/sprites/public/images/nested/squares/ten-by-ten.png
 - test/fixtures/sprites/public/images/prefix/20-by-20.png
 - test/fixtures/sprites/public/images/prefix/ten-by-ten.png
+- test/fixtures/sprites/public/images/repeat_x/five.png
+- test/fixtures/sprites/public/images/repeat_x/four.png
+- test/fixtures/sprites/public/images/repeat_x/one.png
+- test/fixtures/sprites/public/images/repeat_x/three.png
+- test/fixtures/sprites/public/images/repeat_x/two.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten_active.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten_hover.png
@@ -1241,7 +1247,6 @@ files:
 - test/integrations/test_rails_helper.rb
 - test/test_helper.rb
 - test/test_helper.rbc
-- test/tmp/compass_rails/public/images/selectors-s4c703bbc05.png
 - test/units/actions_test.rb
 - test/units/actions_test.rbc
 - test/units/command_line_test.rb
@@ -1262,6 +1267,7 @@ files:
 - test/units/sprites/image_test.rbc
 - test/units/sprites/importer_test.rb
 - test/units/sprites/importer_test.rbc
+- test/units/sprites/layout_test.rb
 - test/units/sprites/row_fitter_test.rb
 - test/units/sprites/row_fitter_test.rbc
 - test/units/sprites/sprite_command_test.rb
@@ -1318,6 +1324,11 @@ test_files:
 - test/fixtures/sprites/public/images/nested/squares/ten-by-ten.png
 - test/fixtures/sprites/public/images/prefix/20-by-20.png
 - test/fixtures/sprites/public/images/prefix/ten-by-ten.png
+- test/fixtures/sprites/public/images/repeat_x/five.png
+- test/fixtures/sprites/public/images/repeat_x/four.png
+- test/fixtures/sprites/public/images/repeat_x/one.png
+- test/fixtures/sprites/public/images/repeat_x/three.png
+- test/fixtures/sprites/public/images/repeat_x/two.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten_active.png
 - test/fixtures/sprites/public/images/selectors/ten-by-ten_hover.png
@@ -1732,7 +1743,6 @@ test_files:
 - test/integrations/test_rails_helper.rb
 - test/test_helper.rb
 - test/test_helper.rbc
-- test/tmp/compass_rails/public/images/selectors-s4c703bbc05.png
 - test/units/actions_test.rb
 - test/units/actions_test.rbc
 - test/units/command_line_test.rb
@@ -1753,6 +1763,7 @@ test_files:
 - test/units/sprites/image_test.rbc
 - test/units/sprites/importer_test.rb
 - test/units/sprites/importer_test.rbc
+- test/units/sprites/layout_test.rb
 - test/units/sprites/row_fitter_test.rb
 - test/units/sprites/row_fitter_test.rbc
 - test/units/sprites/sprite_command_test.rb