sprite tests are green

Author: scottdavis

cli/lib/compass/sass_extensions.rb

@@ -8,4 +8,3 @@ module 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/lib/compass/sass_extensions/sprites.rb

@@ -5,7 +5,7 @@ PATH
       chunky_png (~> 1.2.9)
 
 PATH
-  remote: /Users/sdavis/OSS/compass/cli
+  remote: /Volumes/SSD/oss/compass/cli
   specs:
     compass (1.0.0.alpha.17)
       chunky_png (~> 1.2)
@@ -16,14 +16,14 @@ PATH
       sass (~> 3.3.0.rc.1)
 
 PATH
-  remote: /Users/sdavis/OSS/compass/core
+  remote: /Volumes/SSD/oss/compass/core
   specs:
     compass-core (1.0.0.alpha.16)
       multi_json (~> 1.0)
       sass (>= 3.3.rc.1)
 
 PATH
-  remote: /Users/sdavis/OSS/compass/import-once
+  remote: /Volumes/SSD/oss/compass/import-once
   specs:
     compass-import-once (1.0.1)
 
@@ -41,7 +41,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     oily_png (1.1.0)
       chunky_png (~> 1.2.7)
     rake (10.1.1)

sprites/Gemfile.lock

@@ -1,5 +1,6 @@
 require 'erb'
 require 'compass'
+require 'compass/sprites/sass_extensions/sprites'
 require 'compass/sprites/importer/binding'
 
 module Compass
@@ -122,7 +123,7 @@ def self.content_for_images(uri, name, skip_overrides = false)
     private
 
       def self.valid_extensions
-        @valid_extensions ||= SassExtensions::Sprites::SpriteMap.sprite_engine_class::VALID_EXTENSIONS
+        @valid_extensions ||= Compass::Sprites::SassExtensions::SpriteMap.sprite_engine_class::VALID_EXTENSIONS
       end
 
       def self.sprite_importer_regex_with_ext

sprites/lib/compass/sprites/importer.rb

@@ -22,4 +22,4 @@ def save(filename)
   end
 end
 
-require 'compass/sass_extensions/sprites/engines/chunky_png_engine'
+require 'compass/sprites/sass_extensions/engines/chunky_png_engine'

cli/lib/compass/sass_extensions/sprites/engines.rb renamed to sprites/lib/compass/sprites/sass_extensions/engines.rb

@@ -1,4 +1,4 @@
-module Compass::SassExtensions::Functions::Sprites
+module Compass::Sprites::SassExtensions::Functions
 
   extend Compass::SassExtensions::Functions::SassDeclarationHelper
   extend Sass::Script::Value::Helpers
@@ -75,7 +75,7 @@ def inline_sprite(map)
   # the first time it is converted to a url. Simply constructing it has no side-effects.
   def sprite_map(glob, kwargs = {})
     kwargs.extend VariableReader
-    Compass::SassExtensions::Sprites::SpriteMap.from_uri(glob, self, kwargs)
+    Compass::Sprites::SassExtensions::SpriteMap.from_uri(glob, self, kwargs)
   end
   declare :sprite_map, [:glob], :var_kwargs => true
 
@@ -283,7 +283,7 @@ def convert_sprite_name(sprite)
   end
 
   def verify_map(map, error = "sprite")
-    unless map.is_a?(Compass::SassExtensions::Sprites::SpriteMap)
+    unless map.is_a?(Compass::Sprites::SassExtensions::SpriteMap)
       missing_sprite!(error)
     end
   end

cli/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb renamed to sprites/lib/compass/sprites/sass_extensions/engines/chunky_png_engine.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       class Image
         include Sass::Script::Value::Helpers
         ACTIVE = %r{[_-]active$}

cli/lib/compass/sass_extensions/functions/sprites.rb renamed to sprites/lib/compass/sprites/sass_extensions/functions.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module ImageMethods
         # Fetches the Sprite::Image object for the supplied name
          def image_for(name)

cli/lib/compass/sass_extensions/sprites/image.rb renamed to sprites/lib/compass/sprites/sass_extensions/image.rb

@@ -1,8 +1,8 @@
 require 'forwardable'
 
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       class ImageRow
         extend Forwardable
 

cli/lib/compass/sass_extensions/sprites/image_methods.rb renamed to sprites/lib/compass/sprites/sass_extensions/image_methods.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       class Images < Array
 
         def sort_by!(method)

cli/lib/compass/sass_extensions/sprites/image_row.rb renamed to sprites/lib/compass/sprites/sass_extensions/image_row.rb

@@ -1,7 +1,7 @@
 require 'rational'
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module Layout
         class SpriteLayout
 

cli/lib/compass/sass_extensions/sprites/images.rb renamed to sprites/lib/compass/sprites/sass_extensions/images.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module Layout
         class Diagonal < SpriteLayout
 

cli/lib/compass/sass_extensions/sprites/layout.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module Layout
         class Horizontal < SpriteLayout
 

cli/lib/compass/sass_extensions/sprites/layout/diagonal.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout/diagonal.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module Layout
         class Smart < SpriteLayout
 

cli/lib/compass/sass_extensions/sprites/layout/horizontal.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout/horizontal.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module Layout
         class Vertical < SpriteLayout
 

cli/lib/compass/sass_extensions/sprites/layout/smart.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout/smart.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module LayoutMethods
         HORIZONTAL = 'horizontal'
         DIAGONAL = 'diagonal'
@@ -32,16 +32,16 @@ def layout
         def compute_image_positions!
           case layout
           when SMART
-            require 'compass/sass_extensions/sprites/layout/smart'
+            require 'compass/sprites/sass_extensions/layout/smart'
             @images, @width, @height = Layout::Smart.new(@images, @kwargs).properties
           when DIAGONAL
-            require 'compass/sass_extensions/sprites/layout/diagonal'
+            require 'compass/sprites/sass_extensions/layout/diagonal'
             @images, @width, @height = Layout::Diagonal.new(@images, @kwargs).properties
           when HORIZONTAL
-            require 'compass/sass_extensions/sprites/layout/horizontal'
+            require 'compass/sprites/sass_extensions/layout/horizontal'
             @images, @width, @height = Layout::Horizontal.new(@images, @kwargs).properties
           else
-            require 'compass/sass_extensions/sprites/layout/vertical'
+            require 'compass/sprites/sass_extensions/layout/vertical'
             @images, @width, @height = Layout::Vertical.new(@images, @kwargs).properties
           end
         end

cli/lib/compass/sass_extensions/sprites/layout/vertical.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout/vertical.rb

@@ -39,7 +39,7 @@ def efficiency
 
         private
         def new_row(image = nil)
-          row = Compass::SassExtensions::Sprites::ImageRow.new(width)
+          row = Compass::Sprites::SassExtensions::ImageRow.new(width)
           row.add(image) if image
           row
         end

cli/lib/compass/sass_extensions/sprites/layout_methods.rb renamed to sprites/lib/compass/sprites/sass_extensions/layout_methods.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       class SpriteMap < Sass::Script::Value::Base
         attr_accessor :image_names, :path, :name, :map, :kwargs
         attr_accessor :images, :width, :height, :engine

cli/lib/compass/sass_extensions/sprites/row_fitter.rb renamed to sprites/lib/compass/sprites/sass_extensions/row_fitter.rb

@@ -1,6 +1,6 @@
 module Compass
-  module SassExtensions
-    module Sprites
+  module Sprites
+    module SassExtensions
       module SpriteMethods
 
         # Changing this string will invalidate all previously generated sprite images.

cli/lib/compass/sass_extensions/sprites/sprite_map.rb renamed to sprites/lib/compass/sprites/sass_extensions/sprite_map.rb

@@ -0,0 +1,24 @@
+module Compass
+  module Sprites
+    module SassExtensions
+    end
+  end
+end
+
+require 'digest/md5'
+require 'compass/sprites/sass_extensions/functions'
+require 'compass/sprites/sass_extensions/images'
+require 'compass/sprites/sass_extensions/layout'
+require 'compass/sprites/sass_extensions/image_row'
+require 'compass/sprites/sass_extensions/row_fitter'
+require 'compass/sprites/sass_extensions/image'
+require 'compass/sprites/sass_extensions/layout_methods'
+require 'compass/sprites/sass_extensions/sprite_methods'
+require 'compass/sprites/sass_extensions/image_methods'
+require 'compass/sprites/sass_extensions/sprite_map'
+require 'compass/sprites/sass_extensions/engines'
+require 'compass/sprites/importer'
+
+module Sass::Script::Functions
+  include Compass::Sprites::SassExtensions::Functions
+end

cli/lib/compass/sass_extensions/sprites/sprite_methods.rb renamed to sprites/lib/compass/sprites/sass_extensions/sprite_methods.rb

@@ -14,7 +14,7 @@ def sprite_map_test(options, uri = URI)
     path, name = Compass::Sprites::Importer.path_and_name(uri)
     sprite_names = Compass::Sprites::Importer.sprite_names(uri)
     sass_engine = Compass::Sprites::Importer.sass_engine(uri, name, importer, options)
-    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| uri.gsub('*', n)}, path, name, sass_engine, options)
+    map = Compass::Sprites::SassExtensions::SpriteMap.new(sprite_names.map{|n| uri.gsub('*', n)}, path, name, sass_engine, options)
     map.options = {:compass => {:logger => Compass::NullLogger.new}}
     map
   end

sprites/lib/compass/sprites/sass_extensions/sprites.rb

@@ -50,7 +50,7 @@ def sprite_map_test(options, uri = URI)
     path, name = Compass::Sprites::Importer.path_and_name(uri)
     sprite_names = Compass::Sprites::Importer.sprite_names(uri)
     sass_engine = Compass::Sprites::Importer.sass_engine(uri, name, importer, options)
-    map = Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| uri.gsub('*', n)}, path, name, sass_engine, options)
+    map = Compass::Sprites::SassExtensions::SpriteMap.new(sprite_names.map{|n| uri.gsub('*', n)}, path, name, sass_engine, options)
     map.options = {:compass => {:logger => Compass::NullLogger.new}}
     map
   end

sprites/test/helpers/sprite_helper.rb

@@ -6,7 +6,7 @@ def setup
     create_sprite_temp
     sprite_filename = 'squares/ten-by-ten.png'
     @images = [
-       Compass::SassExtensions::Sprites::Image.new(nil, File.join(sprite_filename), {}) 
+       Compass::Sprites::SassExtensions::Image.new(nil, File.join(sprite_filename), {}) 
       ]
     @engine = Compass::SassExtensions::Sprites::Engine.new(100, 100, @images)
   end

sprites/test/test_helper.rb

@@ -11,7 +11,7 @@ def setup
     @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, {})
+      Compass::Sprites::SassExtensions::Image.new(nil, img, {})
     end
     image_row(1000)
   end
@@ -21,7 +21,7 @@ def teardown
   end
 
   def image_row(max)
-    @image_row = Compass::SassExtensions::Sprites::ImageRow.new(max)
+    @image_row = Compass::Sprites::SassExtensions::ImageRow.new(max)
   end
 
   def populate_row
@@ -32,7 +32,7 @@ def populate_row
 
   def test_should_return_false_if_image_will_not_fit_in_row
     image_row(100)
-    img = Compass::SassExtensions::Sprites::Image.new(nil, File.join('image_row', 'large.png'), {})
+    img = Compass::Sprites::SassExtensions::Image.new(nil, File.join('image_row', 'large.png'), {})
     assert !@image_row.add(img)
   end
 

sprites/test/units/engine_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'compass/sass_extensions/sprites/images'
+require 'compass/sprites/sass_extensions/images'
 
 class ImagesTest < Test::Unit::TestCase
 
   def setup
-    @images = Compass::SassExtensions::Sprites::Images.new
+    @images = Compass::Sprites::SassExtensions::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)

sprites/test/units/image_row_test.rb

@@ -4,7 +4,7 @@ class LayoutTest < Test::Unit::TestCase
   include SpriteHelper
 
   def setup
-    Hash.send(:include, Compass::SassExtensions::Functions::Sprites::VariableReader)
+    Hash.send(:include, Compass::Sprites::SassExtensions::Functions::VariableReader)
     clean_up_sprites
     create_sprite_temp
     file = StringIO.new("images_path = #{@images_tmp_path.inspect}\n")
@@ -32,7 +32,7 @@ def smart
     path, name = Compass::Sprites::Importer.path_and_name(uri)
     sprite_names = Compass::Sprites::Importer.sprite_names(uri)
     sass_engine = Compass::Sprites::Importer.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 = Compass::Sprites::SassExtensions::SpriteMap.new(sprite_names.map {|n| "image_row/#{n}.png"}, path, name, sass_engine, options)
     map.options = {:compass => {:logger => Compass::NullLogger.new}}
 
     map
@@ -177,4 +177,4 @@ def test_should_generate_a_horrizontal_sprite
     FileUtils.rm base.filename
   end
 
-end
+end

sprites/test/units/images_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'compass/sass_extensions/sprites/row_fitter'
+require 'compass/sprites/sass_extensions/row_fitter'
 
 class RowFitterTest < Test::Unit::TestCase
   include SpriteHelper
@@ -18,7 +18,7 @@ def teardown
 
   def create_images(dims)
     dims.collect { |width, height| 
-      image = Compass::SassExtensions::Sprites::Image.new('blah', 'blah', {})
+      image = Compass::Sprites::SassExtensions::Image.new('blah', 'blah', {})
       image.stubs(:width => width, :height => height)
       image
     }