compass 0.12.alpha.0 → 0.12.alpha.1

data/lib/compass/sprite_importer.rb

@@ -1,8 +1,16 @@
+require 'erb'
+require 'compass/sprite_importer/binding'
 module Compass
   class SpriteImporter < Sass::Importers::Base
     VAILD_FILE_NAME = /\A#{Sass::SCSS::RX::IDENT}\Z/
     SPRITE_IMPORTER_REGEX = %r{((.+/)?([^\*.]+))/(.+?)\.png}
     VALID_EXTENSIONS = ['.png']
+    
+    TEMPLATE_FOLDER = File.join(File.expand_path('../', __FILE__), 'sprite_importer')
+    CONTENT_TEMPLATE_FILE = File.join(TEMPLATE_FOLDER, 'content.erb')
+    CONTENT_TEMPLATE = ERB.new(File.read(CONTENT_TEMPLATE_FILE))
+
+
 
     # finds all sprite files
     def self.find_all_sprite_map_files(path)
@@ -19,7 +27,7 @@ module Compass
     end
     
     def find_relative(uri, base, options)
-      find(File.join(base, uri), options)
+      nil
     end
     
     def to_s
@@ -85,93 +93,20 @@ module Compass
     end
     
     # Returns the sass_options for this sprite
-    def self.sass_options(name, importer, options)
-      options.merge!(:filename => name, :syntax => :scss, :importer => importer)
+    def self.sass_options(uri, importer, options)
+      options.merge!(:filename => uri, :syntax => :scss, :importer => importer)
     end
     
     # Returns a Sass::Engine for this sprite object
     def self.sass_engine(uri, name, importer, options)
-      Sass::Engine.new(content_for_images(uri, name, options[:skip_overrides]), sass_options(name, importer, options))
+      content = content_for_images(uri, name, options[:skip_overrides])
+      Sass::Engine.new(content, sass_options(uri, importer, options))
     end
 
     # Generates the Sass for this sprite file
     def self.content_for_images(uri, name, skip_overrides = false)
-      <<-SCSS
-@import "compass/utilities/sprites/base";
-
-// General Sprite Defaults
-// You can override them before you import this file.
-$#{name}-sprite-base-class: ".#{name}-sprite" !default;
-$#{name}-sprite-dimensions: false !default;
-$#{name}-position: 0% !default;
-$#{name}-spacing: 0 !default;
-$#{name}-repeat: no-repeat !default;
-$#{name}-prefix: '' !default;
-$#{name}-clean-up: true !default;
-$#{name}-layout:vertical !default;
-
-#{skip_overrides ? "$#{name}-sprites: sprite-map(\"#{uri}\", $layout: $#{name}-layout, $cleanup: $#{name}-clean-up);" : generate_overrides(uri, name) }
-
-// All sprites should extend this class
-// The #{name}-sprite mixin will do so for you.
-\#{$#{name}-sprite-base-class} {
-  background: $#{name}-sprites no-repeat;
-}
-
-// Use this to set the dimensions of an element
-// based on the size of the original image.
-@mixin #{name}-sprite-dimensions($name) {
-  @include sprite-dimensions($#{name}-sprites, $name)
-}
-
-// Move the background position to display the sprite.
-@mixin #{name}-sprite-position($name, $offset-x: 0, $offset-y: 0) {
-  @include sprite-background-position($#{name}-sprites, $name, $offset-x, $offset-y)
-}
-
-// Extends the sprite base class and set the background position for the desired sprite.
-// It will also apply the image dimensions if $dimensions is true.
-@mixin #{name}-sprite($name, $dimensions: $#{name}-sprite-dimensions, $offset-x: 0, $offset-y: 0) {
-  @extend \#{$#{name}-sprite-base-class};
-  @include sprite($#{name}-sprites, $name, $dimensions, $offset-x, $offset-y)
-}
-
-@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) {
-  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
-}
-
-// Generates a class for each sprited image.
-@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) {
-  @include #{name}-sprites(#{sprite_names(uri).join(" ")}, $dimensions, $prefix, $offset-x, $offset-y);
-}
-SCSS
-    end
-    
-    # Generates the override defaults for this Sprite
-    # <tt>$#{name}-#{sprite_name}-position </tt>
-    # <tt> $#{name}-#{sprite_name}-spacing </tt>
-    # <tt> #{name}-#{sprite_name}-repeat: </tt>
-    def self.generate_overrides(uri, name)
-      sprites = sprite_names(uri)
-      content = <<-TXT
-// These variables control the generated sprite output
-// You can override them selectively before you import this file.
-      TXT
-      sprites.map do |sprite_name| 
-        content += <<-SCSS
-$#{name}-#{sprite_name}-position: $#{name}-position !default;
-$#{name}-#{sprite_name}-spacing: $#{name}-spacing !default;
-$#{name}-#{sprite_name}-repeat: $#{name}-repeat !default;
-        SCSS
-      end.join
-
-      content += "\n$#{name}-sprites: sprite-map(\"#{uri}\", \n$layout: $#{name}-layout, \n$cleanup: $#{name}-clean-up,\n"
-      content += sprites.map do |sprite_name| 
-%Q{  $#{sprite_name}-position: $#{name}-#{sprite_name}-position,
-  $#{sprite_name}-spacing: $#{name}-#{sprite_name}-spacing,
-  $#{sprite_name}-repeat: $#{name}-#{sprite_name}-repeat}
-      end.join(",\n")
-      content += ");"
+      binder = Compass::Sprites::Binding.new(:name => name, :uri => uri, :skip_overrides => skip_overrides, :sprite_names => sprite_names(uri), :files => files(uri))
+      CONTENT_TEMPLATE.result(binder.get_binding)
     end
   end
 end

data/lib/compass/sprite_importer.rbc

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -140,360 +140,284 @@ x
 14
 SpriteImporter
 i
-355
+279
 5
 66
-5
-7
-0
-7
-1
-47
-49
-2
-2
-15
 65
 7
-3
+0
 44
 43
-4
+1
 7
-5
+2
 45
-6
-7
+3
+4
 43
-8
+5
 43
-9
+6
 43
-10
+7
 47
 101
-11
+8
 7
-12
+9
 63
 3
 78
 49
-13
+10
 2
 49
-14
+11
 2
 15
 65
 7
-15
+12
 7
-16
+13
 13
 70
 9
-65
+55
 15
 44
 43
-4
+1
 7
-17
+14
 78
 49
-13
+10
 2
 6
-16
+13
 49
-14
+11
 2
 15
 65
 7
-18
+15
 7
-19
+16
 64
 35
 1
 49
-14
+11
 2
 15
 99
 7
-20
+17
 7
-21
+18
 65
 5
 49
-22
+19
 4
 15
 99
 7
-23
+20
 7
-24
+21
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-27
+24
 7
-28
-65
-67
-49
 25
-0
-49
-26
-4
-15
-99
-7
-29
-7
-30
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-11
+8
 7
-31
+26
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-32
+27
 7
-33
+28
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-34
+29
 7
-35
+30
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-36
+31
 7
-37
+32
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-38
+33
 7
-39
+34
 65
 67
 49
-25
+22
 0
 49
-26
+23
 4
 15
 99
 7
-40
+35
 7
-41
+36
 65
 5
 49
-22
-4
-15
-99
-7
-42
-7
-43
-65
-67
-49
-25
-0
-49
-26
+19
 4
 15
 99
 7
-44
+37
 7
-45
+38
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-46
+39
 7
-47
+40
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-48
+41
 7
-49
+42
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-50
+43
 7
-51
+44
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-52
+45
 7
-53
+46
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-54
+47
 7
-55
+48
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-56
-7
-57
-65
-67
 49
-25
-0
-49
-26
-4
-15
-99
-7
-58
 7
-59
+50
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 15
 99
 7
-60
+51
 7
-61
+52
 65
-67
-49
-25
-0
+5
 49
-26
+19
 4
 11
 I
@@ -506,19 +430,10 @@ I
 0
 n
 p
-62
+53
 x
-3
-uri
-x
-7
-options
-x
-13
-attr_accessor
-x
-15
-VAILD_FILE_NAME
+15
+VAILD_FILE_NAME
 x
 6
 Regexp
@@ -564,338 +479,166 @@ s
 4
 .png
 x
-4
-load
+25
+find_all_sprite_map_files
 M
 1
 n
 n
 x
-4
-load
+25
+find_all_sprite_map_files
 i
-54
-45
+59
+7
 0
+64
+19
 1
-43
+15
+7
+1
+20
+1
+4
+10
+49
 2
-13
-71
-3
-47
-9
-23
+1
 47
-49
+101
+3
+7
 4
-0
-13
-47
-49
+45
 5
-0
-15
-8
-26
+6
+7
+7
+64
 49
+8
+1
+47
+101
 3
-0
+7
+9
+63
+5
 19
 2
 15
+45
+10
+11
+45
+12
+13
 20
 0
-20
-1
-17
-2
+7
+14
+64
 20
 2
-12
 49
-6
-1
-15
-20
-2
-12
+8
+3
 49
-7
-1
-15
-2
 15
-20
-2
+1
 11
 I
-6
+8
 I
 3
 I
-2
+1
 I
-2
-n
-p
-8
-x
-7
-Compass
+1
 n
-x
-14
-SpriteImporter
-x
-3
-new
-x
-8
-allocate
-x
-10
-initialize
-x
-4
-uri=
-x
-8
-options=
 p
-9
-I
--1
-I
+16
+s
 8
-I
-0
-I
-9
-I
-1d
-I
-a
-I
-33
-I
-b
-I
-36
-x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
-p
-3
-x
+[0-9a-f]
+s
 3
-uri
-x
-7
-options
-x
-5
-klass
+*-s
 x
-13
-attach_method
-x
-10
-initialize
-M
 1
-n
-n
+*
 x
-10
-initialize
-i
-42
-23
-0
-10
-14
-44
-43
-0
-78
-49
-1
-1
-19
-0
-15
-7
-2
-64
-44
-43
-0
-78
-49
-1
-1
-17
-2
-38
-3
-15
-38
 4
-15
-2
-15
-20
-0
-56
-5
-50
-6
-0
-11
-I
-4
-I
-1
-I
-0
-I
+to_s
+s
 1
-n
-p
-7
-x
-4
-Hash
+{
 x
 16
-new_from_literal
+VALID_EXTENSIONS
+n
 s
-0
-
+1
+,
 x
 4
-@uri
-x
-8
-@options
-M
+join
+s
 1
-p
-2
-x
-9
-for_block
-t
-n
+}
 x
-10
-initialize
-i
-27
-58
-37
-19
-0
-15
-37
-19
-1
-15
-15
-5
-20
-0
-47
-101
-0
-7
-1
-63
-2
-20
-1
-47
-49
-2
-2
-11
-I
-6
-I
-2
-I
-2
-I
-2
-n
-p
 3
+Dir
+n
 x
 4
-to_s
+File
+n
 s
-1
-=
+2
+**
 x
 4
-send
+glob
 p
-5
+9
+I
+-1
+I
+8
 I
 0
 I
-10
+9
+I
+6
 I
 a
 I
-11
+27
 I
-1b
+b
+I
+3b
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-2
-x
 3
-key
-x
-5
-value
 x
 4
-each
-p
-7
-I
--1
-I
-e
-I
-e
-I
-f
-I
-22
-I
-10
-I
-2a
-x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
-p
-1
+path
 x
-7
-options
+3
+hex
 x
-17
-method_visibility
+4
+glob
 x
-15
-add_defn_method
+13
+attach_method
 x
 4
 find
@@ -907,41 +650,47 @@ x
 4
 find
 i
-32
+38
 20
 0
-20
-1
-17
-2
-38
+45
 0
-15
-38
 1
-15
+49
 2
-15
+1
+9
+34
+5
+49
+3
+0
 20
 0
-45
-2
+5
+49
 3
+0
+20
+0
 49
 4
 1
-9
-30
 5
-48
+20
+1
+49
 5
+4
 11
 8
-31
+35
+1
+15
 1
 11
 I
-4
+7
 I
 2
 I
@@ -952,12 +701,6 @@ n
 p
 6
 x
-4
-@uri
-x
-8
-@options
-x
 21
 SPRITE_IMPORTER_REGEX
 n
@@ -965,35 +708,45 @@ x
 2
 =~
 x
+5
+class
+x
+11
+sprite_name
+x
 11
 sass_engine
 p
-11
+13
 I
 -1
 I
-15
+e
 I
 0
 I
-16
+f
 I
-e
+a
 I
-17
+10
 I
-18
+22
 I
-18
+f
 I
-1e
+23
 I
-17
+0
 I
-20
+24
+I
+12
+I
+26
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -1003,6 +756,12 @@ x
 7
 options
 x
+17
+method_visibility
+x
+15
+add_defn_method
+x
 13
 find_relative
 M
@@ -1013,41 +772,11 @@ x
 13
 find_relative
 i
-32
-20
-0
-20
-2
-17
-2
-38
-0
-15
-38
-1
-15
-2
-15
-5
-45
 2
-3
-20
 1
-20
-0
-49
-4
-2
-20
-2
-47
-49
-5
-2
 11
 I
-7
+4
 I
 3
 I
@@ -1056,42 +785,22 @@ I
 3
 n
 p
-6
-x
-4
-@uri
-x
-8
-@options
-x
-4
-File
-n
-x
-4
-join
-x
-4
-find
+0
 p
-7
+5
 I
 -1
 I
-1c
+15
 I
 0
 I
-1d
-I
-e
-I
-1e
+16
 I
-20
+2
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 3
 x
@@ -1142,16 +851,16 @@ p
 I
 -1
 I
-21
+19
 I
 0
 I
-22
+1a
 I
 8
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -1202,16 +911,16 @@ p
 I
 -1
 I
-25
+1d
 I
 0
 I
-26
+1e
 I
 b
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -1260,16 +969,16 @@ p
 I
 -1
 I
-29
+21
 I
 0
 I
-2a
+22
 I
 c
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -1286,38 +995,30 @@ x
 5
 mtime
 i
-33
-20
+25
+5
+49
+0
 0
 20
-1
-17
-2
-38
 0
-15
-38
+49
+1
 1
-15
-2
-15
-5
-48
-2
 49
-3
+2
 0
 45
+3
 4
-5
 78
 49
-6
+5
 1
 56
-7
+6
 50
-8
+7
 1
 11
 I
@@ -1330,13 +1031,10 @@ I
 2
 n
 p
-9
-x
-4
-@uri
-x
 8
-@options
+x
+5
+class
 x
 5
 files
@@ -1419,20 +1117,24 @@ x
 1
 >
 p
-5
+7
 I
 0
 I
-2f
+26
 I
 a
 I
-30
+27
+I
+20
+I
+0
 I
 21
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 3
 x
@@ -1448,24 +1150,20 @@ x
 6
 inject
 p
-7
+5
 I
 -1
 I
-2d
+25
 I
 0
 I
-2e
-I
-e
-I
-2f
+26
 I
-21
+19
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -1485,7 +1183,7 @@ x
 3
 key
 i
-67
+53
 23
 1
 10
@@ -1500,55 +1198,41 @@ i
 19
 1
 15
-20
-0
-20
-1
-17
-2
-38
-2
-15
-38
-3
-15
-2
-15
 5
 49
-4
+2
 0
 49
-5
+3
 0
 7
-6
+4
 64
 81
-7
+5
 45
-8
-9
+6
+7
 45
+6
 8
-10
 20
 0
 49
-11
+9
 1
 49
-12
+10
 1
 81
-7
+5
 45
-8
-13
+6
+11
 20
 0
 49
-14
+12
 1
 35
 2
@@ -1563,7 +1247,7 @@ I
 2
 n
 p
-15
+13
 x
 4
 Hash
@@ -1571,20 +1255,14 @@ x
 16
 new_from_literal
 x
-4
-@uri
-x
-8
-@options
-x
 5
 class
 x
 4
 name
 s
-1
-:
+8
+:sprite:
 x
 1
 +
@@ -1604,24 +1282,20 @@ x
 8
 basename
 p
-7
+5
 I
 -1
 I
-34
+2b
 I
 e
 I
-35
-I
-1c
-I
-36
+2c
 I
-43
+35
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -1641,7 +1315,7 @@ x
 13
 path_and_name
 i
-41
+40
 20
 0
 45
@@ -1667,21 +1341,20 @@ i
 35
 2
 8
-40
+39
 5
 45
 4
 5
-7
+43
 6
-64
-49
 7
-1
+7
+64
 47
 49
 8
-1
+2
 11
 I
 4
@@ -1708,102 +1381,125 @@ x
 7
 Compass
 n
-s
-19
-invalid sprite path
 x
 5
 Error
+s
+19
+invalid sprite path
 x
 5
 raise
 p
-9
+11
 I
 -1
 I
-39
+2f
 I
 0
 I
-3a
+30
 I
 a
 I
-3b
+31
 I
 1a
 I
-3d
+33
+I
+27
 I
-29
+0
+I
+28
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
 3
 uri
 x
-4
-name
+11
+sprite_name
 M
 1
 n
 n
 x
-4
-name
+11
+sprite_name
 i
-9
+22
 5
+20
+0
 47
 49
 0
-0
-15
-39
 1
+97
+37
+19
+1
+15
+37
+19
+2
+15
+15
+2
+15
+20
+2
 11
 I
-1
+5
 I
-0
+3
 I
-0
+1
 I
-0
+1
 n
 p
-2
-x
-21
-ensure_path_and_name!
+1
 x
-5
-@name
+13
+path_and_name
 p
 7
 I
 -1
 I
-42
+38
 I
 0
 I
-43
+39
 I
-6
+13
 I
-44
+3a
 I
-9
+16
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-0
+3
+x
+3
+uri
+x
+1
+_
+x
+4
+name
 x
 4
 path
@@ -1815,187 +1511,121 @@ x
 4
 path
 i
-9
-5
-47
-49
-0
-0
-15
-39
-1
-11
-I
-1
-I
-0
-I
-0
-I
-0
-n
-p
-2
-x
-21
-ensure_path_and_name!
-x
+22
 5
-@path
-p
-7
-I
--1
-I
-48
-I
+20
 0
-I
+47
 49
-I
-6
-I
-4a
-I
-9
-x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
-p
 0
-x
-5
-files
-M
 1
-n
-n
-x
-5
-files
-i
-28
-45
-0
+97
+37
+19
 1
-45
+15
+37
+19
 2
-3
-45
-4
-5
-49
-6
-0
-49
-7
-0
-5
-48
-8
-49
-9
+15
+15
 2
-49
-10
+15
+20
 1
-49
-11
-0
 11
 I
-4
-I
-0
-I
-0
+5
 I
-0
-n
-p
-12
-x
-3
-Dir
-n
-x
-4
-File
-n
-x
-7
-Compass
-n
-x
-13
-configuration
-x
-11
-images_path
-x
 3
-uri
-x
-4
-join
-x
-2
-[]
+I
+1
+I
+1
+n
+p
+1
 x
-4
-sort
+13
+path_and_name
 p
-5
+7
 I
 -1
 I
-4e
+3e
 I
 0
 I
-4f
+3f
 I
-1c
+13
+I
+40
+I
+16
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-0
+3
 x
-12
-sprite_names
+3
+uri
+x
+4
+path
+x
+1
+_
+x
+5
+files
 M
 1
 n
 n
 x
-12
-sprite_names
-i
-9
 5
-48
+files
+i
+15
+45
 0
-56
 1
-50
+49
 2
 0
+49
+3
+0
+56
+4
+50
+5
+0
 11
 I
-2
+3
 I
-0
+1
 I
-0
+1
 I
-0
+1
 n
 p
-3
+6
 x
-5
-files
+7
+Compass
+n
+x
+13
+configuration
+x
+16
+sprite_load_path
 M
 1
 p
@@ -2006,10 +1636,10 @@ for_block
 t
 n
 x
-12
-sprite_names
+5
+files
 i
-60
+44
 57
 19
 0
@@ -2017,61 +1647,45 @@ i
 45
 0
 1
-20
-0
-7
+45
 2
-64
-49
 3
-2
-19
+20
+0
+21
 1
-15
-45
+0
+49
 4
+2
+49
 5
-20
 1
 49
 6
+0
+19
 1
-9
-31
+15
+20
 1
-8
-56
-5
-45
-7
-8
-43
-9
+49
 7
-10
-45
 0
+9
+38
+1
 11
-20
-0
-49
-3
+8
+39
 1
-47
-101
-12
-63
-2
-47
-49
-13
-2
 15
 20
 1
+31
 11
 I
-8
+7
 I
 2
 I
@@ -2080,111 +1694,104 @@ I
 1
 n
 p
-14
+8
+x
+3
+Dir
+n
 x
 4
 File
 n
-s
-4
-.png
-x
-8
-basename
 x
-15
-VAILD_FILE_NAME
-n
+4
+join
 x
 2
-=~
-x
-7
-Compass
-n
-x
-5
-Error
-s
-63
-Sprite file names must be legal css identifiers. Please rename 
-n
+[]
 x
 4
-to_s
+sort
 x
-5
-raise
+6
+empty?
 p
 11
 I
 0
 I
-54
+45
 I
 4
 I
-55
+46
 I
-12
+1b
 I
-56
+47
 I
-1f
+27
 I
-57
+0
 I
-39
+28
 I
-59
+48
 I
-3c
+2c
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
-4
-file
+6
+folder
 x
-8
-filename
+5
+files
 x
-7
-collect
+4
+each
 p
 5
 I
 -1
 I
-53
+44
 I
 0
 I
-54
+45
 I
-9
+f
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-0
+1
 x
-17
-validate_sprites!
+3
+uri
+x
+12
+sprite_names
 M
 1
 n
 n
 x
-17
-validate_sprites!
+12
+sprite_names
 i
-9
+13
 5
-48
+20
 0
+47
+49
+0
+1
 56
 1
 50
@@ -2192,13 +1799,13 @@ i
 0
 11
 I
-2
+3
 I
-0
+1
 I
-0
+1
 I
-0
+1
 n
 p
 3
@@ -2215,10 +1822,10 @@ for_block
 t
 n
 x
-17
-validate_sprites!
+12
+sprite_names
 i
-52
+60
 57
 19
 0
@@ -2226,76 +1833,87 @@ i
 45
 0
 1
+20
+0
+7
+2
+64
+49
+3
+2
+19
+1
+15
 45
-2
-3
-20
-0
-49
 4
+5
+20
 1
 49
-5
+6
 1
 9
-23
+31
 1
 8
-51
+56
 5
 45
-6
 7
-43
 8
-7
+43
 9
+7
+10
 45
 0
-10
-7
 11
-64
+20
+0
 49
-12
+3
 1
 47
 101
-13
-7
-14
+12
 63
-3
+2
 47
 49
-15
+13
 2
+15
+20
+1
 11
 I
-7
+8
 I
-1
+2
 I
 1
 I
 1
 n
 p
-16
-x
-16
-VALID_EXTENSIONS
-n
+14
 x
 4
 File
 n
-x
-7
-extname
+s
+4
+.png
 x
 8
-include?
+basename
+x
+15
+VAILD_FILE_NAME
+n
+x
+2
+=~
 x
 7
 Compass
@@ -2304,68 +1922,77 @@ x
 5
 Error
 s
-31
-Invalid sprite extension only: 
+63
+Sprite file names must be legal css identifiers. Please rename 
 n
-s
-1
-,
-x
-4
-join
 x
 4
 to_s
-s
-19
- images are allowed
 x
 5
 raise
 p
-7
+13
 I
 0
 I
-5e
+4e
 I
 4
 I
-5f
+4f
 I
-17
+12
 I
-60
+50
 I
-34
+1f
+I
+51
+I
+38
+I
+0
+I
+39
+I
+53
+I
+3c
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-1
+2
 x
 4
 file
 x
-4
-each
+8
+filename
+x
+7
+collect
 p
 5
 I
 -1
 I
-5d
+4d
 I
 0
 I
-5e
+4e
 I
-9
+d
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-0
+1
+x
+3
+uri
 x
 12
 sass_options
@@ -2377,63 +2004,59 @@ x
 12
 sass_options
 i
-42
-5
-48
-0
+41
+20
+2
 44
 43
-1
+0
 4
 3
 49
-2
+1
 1
 13
 7
-3
-5
-48
-4
+2
+20
+0
 49
-5
+3
 2
 15
 13
 7
-6
-7
+4
 7
-49
 5
+49
+3
 2
 15
 13
 7
-8
-5
+6
+20
+1
 49
-5
+3
 2
 15
 49
-9
+7
 1
 11
 I
-5
+8
 I
-0
+3
 I
-0
+3
 I
-0
+3
 n
 p
-10
-x
-7
-options
+8
 x
 4
 Hash
@@ -2444,9 +2067,6 @@ x
 8
 filename
 x
-4
-name
-x
 3
 []=
 x
@@ -2459,25 +2079,34 @@ x
 8
 importer
 x
-5
-merge
+6
+merge!
 p
 5
 I
 -1
 I
-66
+58
 I
 0
 I
-67
+59
 I
-2a
+29
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-0
+3
+x
+3
+uri
+x
+8
+importer
+x
+7
+options
 x
 11
 sass_engine
@@ -2489,66 +2118,99 @@ x
 11
 sass_engine
 i
-45
+72
 5
-47
-49
+20
 0
+20
+1
+20
+3
+7
 0
-15
-45
+49
 1
+1
+47
+49
 2
-43
 3
+19
+4
+15
+45
+3
+4
+43
+5
 13
 71
-4
+6
 47
 9
-35
+55
 47
 49
-5
+7
 0
 13
+20
+4
 5
-48
-6
-5
-48
-7
+20
+0
+20
+2
+20
+3
 47
 49
 8
+3
+47
+49
+9
 2
 15
 8
-44
-5
-48
-6
+71
+20
+4
 5
-48
-7
+20
+0
+20
+2
+20
+3
+47
 49
-4
+8
+3
+49
+6
 2
 11
 I
-4
+c
 I
-0
+5
 I
-0
+4
 I
-0
+4
 n
 p
-9
+10
 x
-17
-validate_sprites!
+14
+skip_overrides
+x
+2
+[]
+x
+18
+content_for_images
 x
 4
 Sass
@@ -2563,9 +2225,6 @@ x
 8
 allocate
 x
-18
-content_for_images
-x
 12
 sass_options
 x
@@ -2576,99 +2235,37 @@ p
 I
 -1
 I
-6b
+5d
 I
 0
 I
-6c
+5e
 I
-6
+13
 I
-6d
+5f
 I
-2d
-x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
-p
-0
-x
-21
-ensure_path_and_name!
-M
-1
-n
-n
-x
-21
-ensure_path_and_name!
-i
-22
-5
-49
-0
-0
-5
 48
-1
-49
-2
-1
-97
-37
-38
-3
-15
-37
-38
-4
-15
-15
-2
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-5
 x
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+p
 5
-class
 x
 3
 uri
 x
-13
-path_and_name
+4
+name
 x
-5
-@path
+8
+importer
 x
-5
-@name
-p
-5
-I
--1
-I
-70
-I
-0
-I
-71
-I
-16
+7
+options
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
-p
-0
+7
+content
 x
 18
 content_for_images
@@ -2680,286 +2277,279 @@ x
 18
 content_for_images
 i
-293
+286
 23
-0
+2
 10
 8
 3
 19
-0
+2
 15
 7
 0
-5
-48
+20
 1
 47
 101
+1
+7
 2
+20
+1
+47
+101
+1
 7
 3
-5
-48
+20
 1
 47
 101
-2
+1
 7
 4
-5
-48
+20
 1
 47
 101
-2
+1
 7
 5
-5
-48
+20
 1
 47
 101
-2
+1
 7
 6
-5
-48
+20
 1
 47
 101
-2
+1
 7
 7
-5
-48
+20
 1
 47
 101
-2
+1
 7
 8
-5
-48
+20
 1
 47
 101
-2
+1
 7
 9
-5
-48
+20
 1
 47
 101
-2
+1
 7
 10
 20
-0
+2
 9
-108
+111
 7
 11
-5
-48
+20
 1
 47
 101
-2
+1
 7
 12
-5
-48
+20
+0
+47
+101
+1
+7
 13
+20
+1
 47
 101
-2
+1
 7
 14
-5
-48
+20
 1
 47
 101
-2
+1
 7
 15
 63
-7
+9
 8
-111
+120
 5
-48
+20
+0
+20
+1
+47
+49
 16
+2
 47
 101
-2
+1
 7
 17
-5
-48
+20
 1
 47
 101
-2
+1
 7
 18
-5
-48
+20
 1
 47
 101
-2
+1
 7
 19
-5
-48
+20
 1
 47
 101
-2
+1
 7
 20
-5
-48
+20
 1
 47
 101
-2
+1
 7
 21
-5
-48
+20
 1
 47
 101
-2
+1
 7
 22
-5
-48
+20
 1
 47
 101
-2
+1
 7
 23
-5
-48
+20
 1
 47
 101
-2
+1
 7
 24
-5
-48
+20
 1
 47
 101
-2
+1
 7
 25
-5
-48
+20
 1
 47
 101
-2
+1
 7
 26
-5
-48
+20
 1
 47
 101
-2
+1
 7
 27
-5
-48
+20
 1
 47
 101
-2
+1
 7
 28
-5
-48
+20
 1
 47
 101
-2
+1
 7
 29
-5
-48
+20
 1
 47
 101
-2
+1
 7
 30
-5
-48
+20
 1
 47
 101
-2
+1
 7
 31
-5
-48
+20
 1
 47
 101
-2
+1
 7
 32
-5
-48
+20
 1
 47
 101
-2
+1
 7
 33
-5
-48
+20
 1
 47
 101
-2
+1
 7
 34
-5
-48
+20
 1
 47
 101
-2
+1
 7
 30
-5
-48
+20
 1
 47
 101
-2
+1
 7
 35
-5
-48
+20
 1
 47
 101
-2
+1
 7
 36
 5
-48
+20
+0
+47
+49
 37
+1
 7
 38
 64
@@ -2968,20 +2558,20 @@ i
 1
 47
 101
-2
+1
 7
 40
 63
-61
+63
 11
 I
-3e
+42
 I
-1
+3
 I
-0
+2
 I
-1
+3
 n
 p
 41
@@ -2994,9 +2584,6 @@ s
 $
 x
 4
-name
-x
-4
 to_s
 s
 22
@@ -3028,6 +2615,10 @@ $
 s
 27
 -clean-up: true !default;
+$
+s
+29
+-layout: vertical !default;
 
 
 s
@@ -3036,12 +2627,12 @@ $
 s
 22
 -sprites: sprite-map("
-x
-3
-uri
 s
-14
-", $cleanup: $
+13
+", $layout: $
+s
+20
+-layout, $cleanup: $
 s
 11
 -clean-up);
@@ -3117,15 +2708,15 @@ s
 46
 -sprite-dimensions, $prefix: sprite-map-name($
 s
-33
--sprites)) {
+61
+-sprites), $offset-x: 0, $offset-y: 0) {
   @include sprites($
 s
 26
 -sprites, $sprite-names, $
 s
-101
--sprite-base-class, $dimensions, $prefix)
+123
+-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
 }
 
 // Generates a class for each sprited image.
@@ -3134,8 +2725,8 @@ s
 23
 -sprites($dimensions: $
 s
-24
--sprites)) {
+52
+-sprites), $offset-x: 0, $offset-y: 0) {
   @include 
 s
 9
@@ -3150,111 +2741,125 @@ x
 4
 join
 s
-27
-, $dimensions, $prefix);
+49
+, $dimensions, $prefix, $offset-x, $offset-y);
 }
 
 p
-47
+51
 I
 -1
 I
-75
+63
 I
 8
 I
-7b
+69
 I
-1a
+18
 I
-7c
+6a
 I
-22
+1f
 I
-7d
+6b
 I
-2a
+26
 I
-7e
+6c
 I
-32
+2d
 I
-7f
+6d
 I
-3a
+34
 I
-80
+6e
+I
+3b
+I
+6f
 I
 42
 I
-81
+70
 I
-4a
+49
 I
-83
+72
 I
-74
+78
 I
-86
+0
 I
-7c
+7d
 I
-87
+75
 I
 84
 I
-88
+76
 I
-8c
+8b
 I
-8d
+77
 I
-94
+92
 I
-8e
+7c
 I
-9c
+99
 I
-92
+7d
 I
-a4
+a0
 I
-93
+81
 I
-ac
+a7
 I
-98
+82
+I
+ae
+I
+87
 I
 bc
 I
-99
+88
 I
-c4
+c3
 I
-9a
+89
 I
-cc
+ca
 I
-9d
+8c
 I
-e4
+df
 I
-9e
+8d
 I
-f4
+ed
 I
-a2
+91
 I
-10c
+102
 I
-a3
+92
 I
-125
+11e
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-1
+3
+x
+3
+uri
+x
+4
+name
 x
 14
 skip_overrides
@@ -3269,16 +2874,25 @@ x
 18
 generate_overrides
 i
-84
-7
+96
+5
+20
 0
-64
-19
+47
+49
 0
+1
+19
+2
 15
-5
-48
+7
 1
+64
+19
+3
+15
+20
+2
 56
 2
 50
@@ -3289,90 +2903,93 @@ i
 0
 15
 20
-0
+3
 7
 5
-5
-48
-6
+20
+1
 47
 101
+6
 7
 7
-8
-5
-48
-9
+20
+0
 47
 101
-7
-7
-10
-5
-48
 6
+7
+8
+20
+1
 47
 101
+6
 7
+9
+20
+1
+47
+101
+6
 7
-11
+10
 63
-7
+9
 81
-12
+11
 19
-0
+3
 15
 20
-0
-5
-48
-1
+3
+20
+2
 56
-13
+12
 50
 3
 0
 7
-14
+13
 64
 49
 4
 1
 81
-12
+11
 19
-0
+3
 15
 20
-0
+3
 7
-15
+14
 64
 81
-12
+11
 19
-0
+3
 11
 I
-9
+e
 I
-1
+4
 I
-0
+2
 I
-0
+2
 n
 p
-16
+15
+x
+12
+sprite_names
 s
 121
 // These variables control the generated sprite output
 // You can override them selectively before you import this file.
 
-x
-12
-sprite_names
 M
 1
 p
@@ -3393,85 +3010,85 @@ i
 15
 21
 1
-0
+3
 7
 0
-5
-48
+21
+1
 1
 47
 101
-2
+1
 7
-3
+2
 20
 0
 47
 101
-2
+1
 7
-4
-5
-48
+3
+21
+1
 1
 47
 101
-2
+1
 7
-5
-5
-48
+4
+21
+1
 1
 47
 101
-2
+1
 7
-3
+2
 20
 0
 47
 101
-2
+1
 7
-6
 5
-48
+21
+1
 1
 47
 101
-2
-7
+1
 7
-5
-48
+6
+21
+1
 1
 47
 101
-2
+1
 7
-3
+2
 20
 0
 47
 101
-2
+1
 7
-8
-5
-48
+7
+21
+1
 1
 47
 101
-2
+1
 7
-9
+8
 63
 19
 81
-10
+9
 22
 1
-0
+3
 11
 I
 16
@@ -3483,15 +3100,12 @@ I
 1
 n
 p
-11
+10
 s
 1
 $
 x
 4
-name
-x
-4
 to_s
 s
 1
@@ -3525,32 +3139,32 @@ p
 I
 0
 I
-b1
+a1
 I
 4
 I
-b2
+a2
 I
 7
 I
-b3
+a3
 I
 20
 I
-b4
+a4
 I
 37
 I
-b5
+a5
 I
 52
 I
-b2
+a2
 I
 56
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -3568,20 +3182,18 @@ s
 $
 x
 4
-name
-x
-4
 to_s
 s
 22
 -sprites: sprite-map("
-x
-3
-uri
 s
-15
+16
 ", 
-$cleanup: $
+  $layout: $
+s
+23
+-layout, 
+  $cleanup: $
 s
 11
 -clean-up,
@@ -3602,84 +3214,108 @@ x
 18
 generate_overrides
 i
-75
+99
 57
 19
 0
 15
 7
 0
+21
+1
+1
+47
+101
+1
+7
+2
 20
 0
 47
 101
 1
 7
-2
-5
-48
 3
+21
+1
+1
 47
 101
 1
 7
-4
+2
 20
 0
 47
 101
 1
 7
-5
+4
+21
+1
+1
+47
+101
+1
+7
+2
 20
 0
 47
 101
 1
 7
-6
 5
-48
-3
+21
+1
+1
 47
 101
 1
 7
-4
+2
 20
 0
 47
 101
 1
 7
+6
+21
+1
+1
+47
+101
+1
 7
+2
 20
 0
 47
 101
 1
 7
-8
-5
-48
-3
+7
+21
+1
+1
 47
 101
 1
 7
-4
+2
 20
 0
 47
 101
 1
 7
-9
+8
 63
-19
+25
 11
 I
-15
+1b
 I
 1
 I
@@ -3688,7 +3324,7 @@ I
 1
 n
 p
-10
+9
 s
 3
   $
@@ -3696,15 +3332,12 @@ x
 4
 to_s
 s
-12
--position: $
-x
-4
-name
-s
 1
 -
 s
+12
+-position: $
+s
 14
 -position,
   $
@@ -3726,24 +3359,24 @@ p
 I
 0
 I
-ba
+aa
 I
 4
 I
-bb
+ab
 I
-1c
+24
 I
-bc
+ac
 I
-32
+42
 I
-bd
+ad
 I
-4b
+63
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -3757,156 +3390,153 @@ s
 2
 );
 p
-19
+21
 I
 -1
 I
-ac
+9b
 I
 0
 I
-ad
+9c
 I
-6
+a
 I
-b1
+9d
 I
-12
+10
 I
-b9
+a1
 I
-35
+1b
 I
-be
+a9
 I
-37
+42
 I
-ba
+ae
 I
-3f
+44
 I
-be
+aa
 I
-42
+4b
+I
+ae
 I
-ba
+4e
 I
-4a
+aa
 I
-bf
+56
+I
+af
 I
-54
-x
 60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+x
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
-1
+4
+x
+3
+uri
+x
+4
+name
+x
+7
+sprites
 x
 7
 content
 p
-49
+41
 I
 2
 I
 3
 I
-c
+22
 I
 4
 I
-2c
+3b
 I
 5
 I
-45
-I
-6
-I
-51
+47
 I
 8
 I
-5c
+52
 I
 e
 I
-6a
+60
 I
 15
 I
-78
+6e
 I
-1c
+19
 I
-86
+7c
 I
-21
+1d
 I
-94
+8a
 I
-25
+21
 I
-a2
+98
 I
-29
+25
 I
-b0
+a6
 I
-2d
+2b
 I
-be
+b4
 I
-34
+2f
 I
-cc
+bf
 I
-39
+38
 I
-d7
+ca
 I
-42
+3e
 I
-e5
+d5
 I
-48
+44
 I
-f3
+e0
 I
-4e
+4d
 I
-101
+eb
 I
-53
+58
 I
-10f
+f6
 I
 5d
 I
-11d
-I
-66
-I
-12b
-I
-6b
-I
-139
-I
-70
-I
-147
+101
 I
-75
+63
 I
-155
+10c
 I
-ac
+9b
 I
-163
+117
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -3921,8 +3551,8 @@ I
 I
 23
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -3937,7 +3567,7 @@ I
 I
 1c
 x
-60
-/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+62
+/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
 p
 0