New layout for sprites, heavily "packed"

Rakefile

@@ -1,5 +1,5 @@
 
-GEMS = ['core', 'cli', 'import-once']
+GEMS = ['core', 'cli', 'import-once', 'sprites']
 
 
 task :default => %w[test]

cli/Gemfile

@@ -8,13 +8,14 @@ unless ENV['PKG']
   gem "compass-core", :path => "../core" unless defined?(CI)
   gem "compass-import-once", :path => "../import-once" unless defined?(CI)
   gem 'sass-globbing', "~> 1.1.1"
+  gem "compass-sprites", :path => "../sprites"
   gem "cucumber", "~> 1.2.1"
   gem "rspec", "~> 2.0.0"
   gem "compass-validator", "3.0.1"
   gem "css_parser", "~> 1.0.1"
   gem "rubyzip", "0.9.9"
-  gem 'mocha', '0.11.4'
   gem 'minitest', '2.12.1'
+  gem "mocha", "~> 0.14.0", :require => false
   gem 'diff-lcs', '~> 1.1.2'
   gem 'rake'
   gem 'json', '~> 1.7.7', :platforms => :ruby_18

cli/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0.alpha.3

cli/compass.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gemspec|
   gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.5'
   gemspec.add_dependency 'compass-core', "~> #{File.read(File.join(File.dirname(__FILE__),"..","core","VERSION")).strip}"
   gemspec.add_dependency 'compass-import-once', "~> #{File.read(File.join(File.dirname(__FILE__),"..","import-once","VERSION")).strip}"
-  gemspec.add_dependency 'chunky_png', '~> 1.2'
   gemspec.add_dependency 'rb-fsevent', '>= 0.9.3'
   gemspec.add_dependency 'rb-inotify', '>= 0.9'
 

cli/features/step_definitions/command_line_steps.rb

@@ -4,9 +4,9 @@
 require 'test_helper'
 
 require 'compass/exec'
-include Compass::TestCaseHelper
-include Compass::CommandLineHelper
-include Compass::IoHelper
+include Compass::Test::TestCaseHelper
+include Compass::Test::CommandLineHelper
+include Compass::Test::IoHelper
 
 Before do
   Compass.reset_configuration!

cli/lib/compass.rb

@@ -33,7 +33,8 @@ def lib_directory
    configuration/file_data
    app_integration
    compiler
-   sprite_importer
+   sass_compiler
 ).each do |lib|
   require "compass/#{lib}"
 end
+require 'compass/sprites/importer'

cli/lib/compass/commands/sprite.rb

@@ -39,11 +39,10 @@ def initialize(working_path, options)
 
       def perform
         relative_uri = options[:uri].gsub(/^#{Compass.configuration.images_dir}\//, '')
-        name = Compass::SpriteImporter.sprite_name(relative_uri)
-        sprites = Compass::SpriteImporter.new
+        name = Compass::Sprites::Importer.sprite_name(relative_uri)
         options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{name}.#{Compass.configuration.preferred_syntax}")
         options[:skip_overrides] ||= false
-        contents = Compass::SpriteImporter.content_for_images(relative_uri, name, options[:skip_overrides])
+        contents = Compass::Sprites::Importer.content_for_images(relative_uri, name, options[:skip_overrides])
         if options[:output_file][-4..-1] != "scss"
           contents = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => :scss)).to_tree.to_sass
         end

cli/lib/compass/configuration/helpers.rb

@@ -47,11 +47,11 @@ def configure_sass_plugin!
           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
@@ -66,7 +66,7 @@ def add_project_configuration(*args)
         configuration_file_path = args.shift || detect_configuration_file
 
         raise ArgumentError, "Too many arguments" if args.any?
-        if AppIntegration.default? && data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
+        if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type
             add_configuration(data.raw_project_type.to_sym)
           elsif options[:project_type]
@@ -75,7 +75,7 @@ def add_project_configuration(*args)
             add_configuration(:stand_alone)
           end
           add_configuration(data)
-        else
+        elsif !AppIntegration.default?
           add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
         end
       end

cli/lib/compass/sass_extensions.rb

@@ -2,8 +2,4 @@
   raise LoadError, "It looks like you've got an incompatible version of Sass. This often happens when you have an old haml gem installed. Please upgrade Haml to v3.1 or above."
 end
 
-module Compass::SassExtensions
-end
-
 require 'compass/sass_extensions/functions'
-require 'compass/sass_extensions/sprites'

cli/lib/compass/sass_extensions/functions.rb

@@ -5,11 +5,3 @@ def declare(*args)
     end
   end
 end
-
-%w(sprites).each do |func|
-  require "compass/sass_extensions/functions/#{func}"
-end
-
-module Sass::Script::Functions
-  include Compass::SassExtensions::Functions::Sprites
-end

cli/test/fixtures/stylesheets/busted_font_urls/css/screen.css

@@ -1,8 +1,8 @@
-.showgrid { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+.showgrid { font-family: url('http://assets2.example.com/fonts/grid-BUSTED.ttf'); }
 
 .no-buster { font-family: url('http://assets3.example.com/fonts/grid.ttf'); }
 
-.buster-by-default { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+.buster-by-default { font-family: url('http://assets2.example.com/fonts/grid-BUSTED.ttf'); }
 
 .feed { font-family: url('http://assets3.example.com/fonts/feed.ttf?query_string'); }
 

cli/test/fixtures/stylesheets/busted_image_urls/css/screen.css

@@ -1,4 +1,4 @@
-.showgrid { background-image: url('http://assets0.example.com/images/grid-BUSTED.png'); }
+.showgrid { background-image: url('http://assets3.example.com/images/grid-BUSTED.png'); }
 
 .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }
 

cli/test/fixtures/stylesheets/compass/config.rb

@@ -1,6 +1,7 @@
 # Require any additional compass plugins here.
 require 'true'
 require 'compass/import-once/activate'
+require 'compass/sprites'
 project_type = :stand_alone
 css_dir = "tmp"
 sass_dir = "sass"

cli/test/fixtures/stylesheets/compass/css/images.css

@@ -5,4 +5,4 @@
   background-image: url('/images/4x6.png?busted=true'); }
 
 .absolute {
-  background-image: url(http://example.com/images/4x6.png); }
+  background-image: url('http://example.com/images/4x6.png'); }

cli/test/fixtures/stylesheets/image_urls/config.rb

@@ -17,3 +17,10 @@
 asset_host do |path|
   "http://assets%d.example.com" % (path.size % 4)
 end
+
+add_asset_collection(
+  :root_dir => "other/asset_collection",
+  :http_dir => "ext-assets",
+  :images_dir => "img",
+  :sass_dir => "scss"
+)

cli/test/fixtures/stylesheets/image_urls/css/screen.css

@@ -1,3 +1,5 @@
+.imported-from-asset-collection { color: red; }
+
 .showgrid { background-image: url('http://assets0.example.com/images/grid.png?busted=true'); }
 
 .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }

cli/test/fixtures/stylesheets/image_urls/other/asset_collection/scss/_ac-stylesheet.scss

@@ -0,0 +1 @@
+.imported-from-asset-collection { color: red; }

cli/test/fixtures/stylesheets/image_urls/sass/screen.sass

@@ -1,3 +1,5 @@
+@import "ac-stylesheet"
+
 .showgrid
   background-image: image-url(unquote("grid.png"))