Sprite clean up move stuff from core

* Remove Imported injection from compass core
* Move Sprite stylesheets into sprite gem
* Updated tests

Author: scottdavis

compass-style.org/content/help/tutorials/spriting.markdown

@@ -36,7 +36,7 @@ Each is an icon that is 32px square.
 
 The simplest way to use these icon sprites is to let compass give you a class for each sprite:
 
-    @import "compass/utilities/sprites";
+    @import "compass/sprites";
     @import "my-icons/*.png";
     @include all-my-icons-sprites;
 
@@ -116,7 +116,7 @@ And your stylesheet will compile to:
 Getting the image dimensions of a sprite
 
 You can get a unit value by using the magical dimension functions `<map>-sprite-height` and `<map>-sprite-width`
-If you are looking to just return the dimensions see the [docs](/reference/compass/utilities/sprites/base/#mixin-sprite-dimensions)
+If you are looking to just return the dimensions see the [docs](/reference/compass/sprites/base/#mixin-sprite-dimensions)
 
 Example:
 

core/lib/compass/configuration/adapters.rb

@@ -35,11 +35,6 @@ def to_sass_plugin_options
         plugin_opts.merge!(sass_options || {})
         plugin_opts[:load_paths] ||= []
         plugin_opts[:load_paths] += resolve_additional_import_paths
-        # TODO: When sprites are extracted to their own plugin, this
-        # TODO: will need to be extracted to there.
-        if defined?(Compass::Sprites::Importer.new)
-          plugin_opts[:load_paths] << Compass::Sprites::Importer.new
-        end
         plugin_opts[:full_exception] = (environment == :development)
         plugin_opts
       end
@@ -93,11 +88,6 @@ def sass_load_paths
           next p if p.respond_to?(:find_relative)
           importer.new(p.to_s)
         end
-        # TODO: When sprites are extracted to their own plugin, this
-        # TODO: will need to be extracted to there.
-        if defined?(Compass::Sprites::Importer.new)
-          load_paths << Compass::Sprites::Importer.new
-        end
         load_paths
       end
 

core/stylesheets/compass/_utilities.scss

@@ -1,6 +1,5 @@
 @import "utilities/color";
 @import "utilities/general";
-@import "utilities/sprites";
 @import "utilities/tables";
 
 // deprecated

sprites/lib/compass/sprites.rb

@@ -1,5 +1,12 @@
 require 'compass/sprites/importer'
 require 'compass/sprites/version'
+stylesheet_dir = File.expand_path('../../../stylesheets', __FILE__)
 config = Compass::Configuration::Data.new("compass-sprites")
 config.add_import_path(Compass::Sprites::Importer.new)
+config.add_import_path(stylesheet_dir)
 Compass.add_configuration(config)
+
+
+Compass::Frameworks.register('sprite-framework',
+ :stylesheets_directory => stylesheet_dir
+)

sprites/lib/compass/sprites/importer/content.erb

@@ -1,4 +1,4 @@
-@import "compass/utilities/sprites/base";
+@import "compass/sprites/base";
 
 // General Sprite Defaults
 // You can override them before you import this file.

core/stylesheets/compass/utilities/_sprites.scss renamed to sprites/stylesheets/compass/_sprites.scss

@@ -1,3 +1,4 @@
+require "compass/sprites"
 module Compass::Sprites::Test::SpriteHelper
   URI = "selectors/*.png"
 

core/stylesheets/compass/utilities/sprites/_base.scss renamed to sprites/stylesheets/compass/sprites/_base.scss

@@ -939,7 +939,7 @@ def clean(string)
 
   it "should replace text with images and dimensions using sprites" do
      css = render <<-SCSS
-     @import "compass/utilities/sprites/sprite-img";
+     @import "compass/sprites/sprite-img";
      @import "colors/*.png";
      .blue { 
        @include sprite-replace-text($colors-sprites, blue); 

core/stylesheets/compass/utilities/sprites/_sprite-img.scss renamed to sprites/stylesheets/compass/sprites/_sprite-img.scss

@@ -2,7 +2,7 @@
 
 class SpriteMapTest < Test::Unit::TestCase
   include SpriteHelper
-  
+
   def setup
     Hash.send(:include, Compass::Sprites::SassExtensions::Functions::VariableReader)
     create_sprite_temp
@@ -20,40 +20,40 @@ def teardown
     clean_up_sprites
     @base = nil
   end
-  
+
   def test_should_have_the_correct_size
     assert_equal [10,40], @base.size
   end
-  
+
   def test_should_have_the_sprite_names
     assert_equal Compass::Sprites::Importer.sprite_names(URI), @base.sprite_names
   end
-  
+
   def test_should_have_image_filenames
     assert_equal Dir["#{@images_tmp_path}/selectors/*.png"].sort, @base.image_filenames
   end
-  
+
   def test_should_need_generation
     assert @base.generation_required?
   end
-  
-   def test_uniqueness_hash
+
+  def test_uniqueness_hash
     assert_equal '4c703bbc05', @base.uniqueness_hash
   end
-  
+
   def test_should_be_outdated
     assert @base.outdated?
   end
 
   def test_should_have_correct_filename
     assert_equal File.join(@images_tmp_path, "#{@base.path}-s#{@base.uniqueness_hash}.png"), @base.filename
   end
-  
- def test_should_return_the_ten_by_ten_image
+
+  def test_should_return_the_ten_by_ten_image
     assert_equal 'ten-by-ten', @base.image_for('ten-by-ten').name
     assert @base.image_for('ten-by-ten').is_a?(Compass::Sprites::SassExtensions::Image)
   end
-  
+
  def test_should_have_selectors
    %w(target hover active).each do |selector|
      assert @base.send(:"has_#{selector}?", 'ten-by-ten')
@@ -76,7 +76,7 @@ def test_should_generate_sprite
     assert !@base.generation_required?
     assert !@base.outdated?
   end
-  
+
   def test_should_remove_old_sprite_when_generating_new
     @base.generate
     file = @base.filename
@@ -88,10 +88,8 @@ def test_should_remove_old_sprite_when_generating_new
     @base.generate
     assert !File.exists?(file), "Sprite file did not get removed"
   end
-  
+
   def test_should_get_correct_relative_name
-    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')
@@ -105,21 +103,19 @@ def test_should_get_correct_relative_name
     assert_equal 'foo/my.png', Compass::Sprites::SassExtensions::SpriteMap.relative_name(File.join(other_folder, 'foo/my.png'))
     FileUtils.rm_rf other_folder
   end
-  
+
   def test_should_get_correct_relative_name_for_directories_with_similar_names
-    Compass.reset_configuration!
-    uri = 'foo/*.png'
     other_folder = File.join(@images_tmp_path, '../other-temp')
     other_folder2 = File.join(@images_tmp_path, '../other-temp2')
 
     FileUtils.mkdir_p other_folder
     FileUtils.mkdir_p other_folder2
-    
+
     FileUtils.mkdir_p File.join(other_folder2, 'foo')
     %w(my bar).each do |file|
       FileUtils.touch(File.join(other_folder2, "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, other_folder2]
@@ -130,22 +126,20 @@ def test_should_get_correct_relative_name_for_directories_with_similar_names
     FileUtils.rm_rf other_folder
     FileUtils.rm_rf other_folder2
   end
-  
+
   test "should create map for nested" do
     base = Compass::Sprites::SassExtensions::SpriteMap.from_uri OpenStruct.new(:value => 'nested/squares/*.png'), @base.instance_variable_get(:@evaluation_context), @options
     assert_equal 'squares', base.name
     assert_equal 'nested/squares', base.path
   end
-  
+
   test "should have correct position on ten-by-ten" do
     percent = Sass::Script::Number.new(50, ['%'])
     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')
@@ -160,5 +154,4 @@ def test_should_get_correct_relative_name_for_directories_with_similar_names
     assert_equal File.expand_path(File.join(other_folder, 'foo/my.png')), image.file
     assert_equal 0, image.size
   end
-  
 end