compass 0.11.2 → 0.11.3

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

@@ -10,7 +10,7 @@ module Compass::SassExtensions::Functions::Sprites
     end
   end
 
-  # Creates a Compass::SassExtensions::Sprites::Base object. A sprite map, when used in a property is the same
+  # Creates a Compass::SassExtensions::Sprites::SpriteMap object. A sprite map, when used in a property is the same
   # as calling sprite-url. So the following background properties are equivalent:
   #
   #     $icons: sprite-map("icons/*.png");
@@ -21,7 +21,7 @@ module Compass::SassExtensions::Functions::Sprites
   # 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::Base.from_uri(glob, self, kwargs)
+    Compass::SassExtensions::Sprites::SpriteMap.from_uri(glob, self, kwargs)
   end 
   Sass::Script::Functions.declare :sprite_map, [:glob], :var_kwargs => true
 
@@ -96,7 +96,7 @@ module Compass::SassExtensions::Functions::Sprites
   def sprite_url(map)
     verify_map(map, "sprite-url")
     map.generate
-    image_url(Sass::Script::String.new("#{map.path}-#{map.uniqueness_hash}.png"),
+    image_url(Sass::Script::String.new("#{map.path}-s#{map.uniqueness_hash}.png"),
               Sass::Script::Bool.new(false),
               Sass::Script::Bool.new(false))
   end
@@ -160,7 +160,7 @@ protected
   end
 
   def verify_map(map, error = "sprite")
-    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
+    unless map.is_a?(Compass::SassExtensions::Sprites::SpriteMap)
       missing_sprite!(error)
     end
   end

data/lib/compass/sass_extensions/functions/sprites.rbc

@@ -82,7 +82,7 @@ x
 7
 Sprites
 i
-537
+551
 5
 66
 65
@@ -619,6 +619,20 @@ i
 49
 21
 4
+15
+99
+7
+72
+7
+73
+65
+67
+49
+20
+0
+49
+21
+4
 11
 I
 7
@@ -630,7 +644,7 @@ I
 0
 n
 p
-72
+74
 x
 4
 ZERO
@@ -923,8 +937,8 @@ x
 7
 Sprites
 x
-4
-Base
+9
+SpriteMap
 x
 8
 from_uri
@@ -994,7 +1008,7 @@ x
 6
 sprite
 i
-140
+150
 23
 2
 10
@@ -1017,41 +1031,51 @@ i
 15
 5
 20
-0
+1
 47
 49
 3
 1
+19
+1
+15
+5
+20
+0
+47
+49
+4
+1
 15
 20
 1
 45
-4
 5
-43
 6
 43
 7
-49
+43
 8
+49
+9
 1
 9
-45
+55
 1
 8
-58
+68
 5
 45
-4
-9
-43
+5
 10
-7
+43
 11
+7
+12
 64
 47
 49
-12
+13
 2
 15
 5
@@ -1059,7 +1083,7 @@ i
 0
 47
 49
-13
+14
 1
 19
 4
@@ -1075,27 +1099,27 @@ i
 3
 47
 49
-14
+15
 4
 19
 5
 15
 45
-4
-15
+5
+16
 43
-6
+7
 43
-16
+17
 13
 71
-17
+18
 47
 9
-123
+133
 47
 49
-18
+19
 0
 13
 20
@@ -1105,19 +1129,19 @@ i
 20
 5
 49
-19
+20
 0
 81
-20
-7
 21
+7
+22
 47
 49
-22
+23
 2
 15
 8
-139
+149
 20
 4
 35
@@ -1125,14 +1149,14 @@ i
 20
 5
 49
-19
+20
 0
 81
-20
-7
 21
+7
+22
 49
-17
+18
 2
 11
 I
@@ -1145,13 +1169,16 @@ I
 4
 n
 p
-23
+24
 x
 4
 ZERO
 n
 n
 x
+19
+convert_sprite_name
+x
 10
 verify_map
 x
@@ -1206,7 +1233,7 @@ x
 10
 initialize
 p
-15
+17
 I
 -1
 I
@@ -1216,27 +1243,31 @@ I
 I
 25
 I
-1c
+1e
 I
 26
 I
-2d
+26
 I
 27
 I
-3b
+37
 I
-29
+28
 I
 45
 I
 2a
 I
-55
+4f
 I
 2b
 I
-8c
+5f
+I
+2c
+I
+96
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
@@ -1378,15 +1409,15 @@ p
 I
 -1
 I
-33
+34
 I
 0
 I
-34
+35
 I
 b
 I
-35
+36
 I
 32
 x
@@ -1412,16 +1443,26 @@ x
 11
 sprite_file
 i
-83
+93
+5
+20
+1
+47
+49
+0
+1
+19
+1
+15
 5
 20
 0
 7
-0
+1
 64
 47
 49
-1
+2
 2
 15
 5
@@ -1429,7 +1470,7 @@ i
 1
 47
 49
-2
+3
 1
 15
 20
@@ -1437,55 +1478,55 @@ i
 20
 1
 49
-3
+4
 0
 49
-4
+5
 1
 19
 2
 9
-73
+83
 45
-5
 6
-43
 7
 43
 8
+43
+9
 13
 71
-9
+10
 47
 9
-63
+73
 47
 49
-10
+11
 0
 13
 20
 2
 49
-11
+12
 0
 47
 49
-12
+13
 1
 15
 8
-71
+81
 20
 2
 49
-11
+12
 0
 49
-9
+10
 1
 8
-82
+92
 5
 20
 0
@@ -1493,7 +1534,7 @@ i
 1
 47
 49
-13
+14
 2
 11
 I
@@ -1506,7 +1547,10 @@ I
 2
 n
 p
-14
+15
+x
+19
+convert_sprite_name
 s
 6
 sprite
@@ -1548,33 +1592,37 @@ x
 14
 missing_image!
 p
-13
+15
 I
 -1
 I
-3a
-I
-0
-I
 3b
 I
-b
+0
 I
 3c
 I
-13
+a
 I
 3d
 I
-21
+15
 I
 3e
 I
-49
+1d
+I
+3f
+I
+2b
 I
 40
 I
 53
+I
+42
+I
+5d
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
@@ -1601,39 +1649,49 @@ x
 27
 sprite_does_not_have_parent
 i
-77
+87
 5
 20
-0
+1
 47
 49
 0
 1
+19
+1
 15
 5
 20
-1
+0
 47
 49
 1
 1
 15
-45
+5
+20
+1
+47
+49
 2
+1
+15
+45
 3
-43
 4
 43
 5
+43
+6
 13
 71
-6
+7
 47
 9
-57
+67
 47
 49
-7
+8
 0
 13
 20
@@ -1641,42 +1699,42 @@ i
 20
 1
 49
-8
+9
 0
 49
-9
+10
 1
 49
-10
+11
 0
 49
-11
+12
 0
 47
 49
-12
+13
 1
 15
 8
-76
+86
 20
 0
 20
 1
 49
-8
+9
 0
 49
-9
+10
 1
 49
-10
+11
 0
 49
-11
+12
 0
 49
-6
+7
 1
 11
 I
@@ -1689,7 +1747,10 @@ I
 2
 n
 p
-13
+14
+x
+19
+convert_sprite_name
 x
 10
 verify_map
@@ -1728,25 +1789,29 @@ x
 10
 initialize
 p
-9
+11
 I
 -1
 I
-46
+48
 I
 0
 I
-47
+49
 I
-8
+a
 I
-48
+4a
 I
-10
+12
 I
-49
+4b
 I
-4d
+1a
+I
+4c
+I
+57
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
@@ -1770,143 +1835,153 @@ x
 19
 sprite_has_selector
 i
-138
+148
 5
 20
-0
+1
 47
 49
 0
 1
+19
+1
 15
 5
 20
-1
+0
 47
 49
 1
 1
 15
-45
-2
-3
+5
 20
-2
+1
+47
 49
+2
+1
+15
+45
+3
 4
-0
+20
+2
 49
 5
+0
+49
+6
 1
 9
-32
+42
 1
 8
-58
+68
 5
 45
-6
 7
-43
 8
-7
+43
 9
-45
-2
-10
 7
+10
+45
+3
 11
+7
+12
 64
 49
-12
+13
 1
 47
 101
-13
+14
 63
 2
 47
 49
-14
+15
 2
 15
 45
-6
-15
-43
+7
 16
 43
 17
+43
+18
 13
 71
-18
+19
 47
 9
-109
+119
 47
 49
-19
+20
 0
 13
 20
 0
 7
-20
+21
 20
 2
 49
-4
+5
 0
 47
 101
-13
+14
 7
-21
+22
 63
 3
 47
 49
-22
+23
 0
 20
 1
 49
-23
+24
 2
 47
 49
-24
+25
 1
 15
 8
-137
+147
 20
 0
 7
-20
+21
 20
 2
 49
-4
+5
 0
 47
 101
-13
+14
 7
-21
+22
 63
 3
 47
 49
-22
+23
 0
 20
 1
 49
-23
+24
 2
 49
-18
+19
 1
 11
 I
@@ -1919,7 +1994,10 @@ I
 3
 n
 p
-25
+26
+x
+19
+convert_sprite_name
 x
 10
 verify_map
@@ -1988,33 +2066,37 @@ x
 10
 initialize
 p
-13
+15
 I
 -1
 I
-4f
+52
 I
 0
 I
-50
+53
 I
-8
+a
 I
-51
+54
 I
-10
+12
 I
-52
+55
 I
-20
+1a
 I
-53
+56
 I
-3b
+2a
 I
-55
+57
 I
-8a
+45
+I
+59
+I
+94
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
@@ -2243,8 +2325,8 @@ x
 4
 to_s
 s
-1
--
+2
+-s
 x
 15
 uniqueness_hash
@@ -2267,31 +2349,31 @@ p
 I
 -1
 I
-5c
+60
 I
 0
 I
-5d
+61
 I
 b
 I
-5e
+62
 I
 11
 I
-5f
+63
 I
 5a
 I
-60
+64
 I
 78
 I
-61
+65
 I
 96
 I
-5f
+63
 I
 9b
 x
@@ -2314,7 +2396,7 @@ x
 15
 sprite_position
 i
-333
+343
 23
 1
 10
@@ -2345,50 +2427,60 @@ i
 15
 5
 20
+1
+47
+49
+3
+1
+19
+1
+15
+5
+20
 0
 7
-3
+4
 64
 47
 49
-4
+5
 2
 15
 20
 1
 13
 9
-57
+67
 15
 20
 1
 45
-5
 6
-43
 7
 43
 8
-49
+43
 9
+49
+10
 1
 9
-62
+72
 1
 8
-75
+85
 5
 45
-5
-10
-43
+6
 11
-7
+43
 12
+7
+13
 64
 47
 49
-13
+14
 2
 15
 20
@@ -2396,10 +2488,10 @@ i
 20
 1
 49
-14
+15
 0
 49
-15
+16
 1
 19
 4
@@ -2407,10 +2499,10 @@ i
 20
 4
 9
-96
+106
 1
 8
-105
+115
 5
 20
 0
@@ -2418,58 +2510,58 @@ i
 1
 47
 49
-16
+17
 2
 15
 20
 2
 49
-17
+18
 0
 7
-18
+19
 64
 83
-19
+20
 9
-124
+134
 20
 2
 19
 5
 8
-205
+215
 20
 2
 49
-14
+15
 0
 20
 4
 49
-20
+21
 0
 82
-21
+22
 19
 5
 15
 45
-5
-22
+6
+23
 43
-7
+8
 43
-23
+24
 13
 71
-24
+25
 47
 9
-182
+192
 47
 49
-25
+26
 0
 13
 20
@@ -2478,45 +2570,45 @@ i
 5
 78
 83
-19
+20
 9
-170
+180
 35
 0
 8
-175
+185
 7
-26
+27
 64
 35
 1
 47
 49
-27
+28
 2
 15
 8
-203
+213
 20
 5
 20
 5
 78
 83
-19
+20
 9
-195
+205
 35
 0
 8
-200
+210
 7
-26
+27
 64
 35
 1
 49
-24
+25
 2
 19
 5
@@ -2524,34 +2616,34 @@ i
 20
 3
 49
-14
+15
 0
 20
 4
 49
-28
+29
 0
 82
-21
+22
 19
 6
 15
 45
-5
-29
+6
+30
 43
-7
+8
 43
-23
+24
 13
 71
-24
+25
 47
 9
-264
+274
 47
 49
-25
+26
 0
 13
 20
@@ -2560,65 +2652,65 @@ i
 6
 78
 83
-19
+20
 9
-252
+262
 35
 0
 8
-257
+267
 7
-26
+27
 64
 35
 1
 47
 49
-27
+28
 2
 15
 8
-285
+295
 20
 6
 20
 6
 78
 83
-19
+20
 9
-277
+287
 35
 0
 8
-282
+292
 7
-26
+27
 64
 35
 1
 49
-24
+25
 2
 19
 6
 15
 45
-5
-30
+6
+31
 43
-7
+8
 43
-31
+32
 13
 71
-24
+25
 47
 9
-321
+331
 47
 49
-25
+26
 0
 13
 20
@@ -2628,14 +2720,14 @@ i
 35
 2
 7
-32
+33
 47
 49
-27
+28
 2
 15
 8
-332
+342
 20
 5
 20
@@ -2643,9 +2735,9 @@ i
 35
 2
 7
-32
+33
 49
-24
+25
 2
 11
 I
@@ -2658,12 +2750,15 @@ I
 4
 n
 p
-33
+34
 x
 4
 ZERO
 n
 n
+x
+19
+convert_sprite_name
 s
 15
 sprite-position
@@ -2745,65 +2840,69 @@ x
 5
 space
 p
-29
+31
 I
 -1
 I
-78
+7c
 I
 1c
 I
-79
+7d
 I
-27
+26
 I
-7a
+7e
 I
-3e
+31
 I
-7b
+7f
 I
-4c
+48
 I
-7d
+80
 I
-59
+56
 I
-7e
+82
 I
-60
+63
 I
-7f
+83
 I
 6a
 I
-81
+84
 I
-76
+74
 I
-82
+86
 I
-7c
+80
 I
-84
+87
 I
-8b
+86
 I
-85
+89
 I
-ce
+95
 I
-87
+8a
 I
-dd
+d8
 I
-88
+8c
 I
-120
+e7
 I
-89
+8d
 I
-14d
+12a
+I
+8e
+I
+157
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
@@ -2890,11 +2989,11 @@ p
 I
 -1
 I
-90
+95
 I
 0
 I
-91
+96
 I
 e
 x
@@ -2909,6 +3008,182 @@ x
 9
 protected
 x
+19
+convert_sprite_name
+M
+1
+n
+n
+x
+19
+convert_sprite_name
+i
+84
+20
+0
+45
+0
+1
+43
+2
+43
+3
+49
+4
+1
+9
+79
+45
+0
+5
+43
+2
+43
+6
+13
+71
+7
+47
+9
+56
+47
+49
+8
+0
+13
+45
+0
+9
+43
+2
+43
+3
+43
+10
+20
+0
+49
+11
+0
+49
+12
+1
+47
+49
+13
+1
+15
+8
+76
+45
+0
+14
+43
+2
+43
+3
+43
+10
+20
+0
+49
+11
+0
+49
+12
+1
+49
+7
+1
+11
+8
+80
+1
+15
+20
+0
+11
+I
+5
+I
+1
+I
+1
+I
+1
+n
+p
+15
+x
+4
+Sass
+n
+x
+6
+Script
+x
+5
+Color
+x
+5
+is_a?
+n
+x
+6
+String
+x
+3
+new
+x
+8
+allocate
+n
+x
+20
+HTML4_COLORS_REVERSE
+x
+3
+rgb
+x
+2
+[]
+x
+10
+initialize
+n
+p
+11
+I
+-1
+I
+9b
+I
+0
+I
+9c
+I
+e
+I
+9d
+I
+4f
+I
+9c
+I
+51
+I
+9f
+I
+54
+x
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+p
+1
+x
+6
+sprite
+x
 10
 verify_map
 M
@@ -2982,8 +3257,8 @@ x
 7
 Sprites
 x
-4
-Base
+9
+SpriteMap
 x
 5
 is_a?
@@ -2995,15 +3270,15 @@ p
 I
 -1
 I
-96
+a2
 I
 a
 I
-97
+a3
 I
 1d
 I
-98
+a4
 I
 25
 x
@@ -3099,15 +3374,15 @@ p
 I
 -1
 I
-9c
+a8
 I
 0
 I
-9d
+a9
 I
 11
 I
-9e
+aa
 I
 1f
 x
@@ -3242,11 +3517,11 @@ p
 I
 -1
 I
-a2
+ae
 I
 0
 I
-a3
+af
 I
 38
 x
@@ -3329,11 +3604,11 @@ p
 I
 -1
 I
-a6
+b2
 I
 0
 I
-a7
+b3
 I
 16
 x
@@ -3345,7 +3620,7 @@ x
 13
 function_name
 p
-61
+63
 I
 2
 I
@@ -3373,101 +3648,105 @@ I
 I
 8f
 I
-2d
+2e
 I
 a2
 I
-2e
+2f
 I
 b7
 I
-2f
+30
 I
 ce
 I
-33
+34
 I
 dc
 I
-37
+38
 I
 ed
 I
-3a
+3b
 I
 fb
 I
-43
+45
 I
 10e
 I
-46
+48
 I
 11c
 I
-4c
+4f
 I
 12f
 I
-4f
+52
 I
 13d
 I
-58
+5c
 I
 152
 I
-5c
+60
 I
 160
 I
-63
+67
 I
 171
 I
-78
+7c
 I
 17f
 I
-8b
+90
 I
 190
 I
-8c
+91
 I
 1a3
 I
-8d
+92
 I
 1b8
 I
-8e
+93
 I
 1cf
 I
-90
+95
 I
 1dd
 I
-94
+99
 I
 1e1
 I
-96
+9b
 I
 1ef
 I
-9c
+a2
 I
 1fd
 I
-a2
+a8
 I
 20b
 I
-a6
+ae
 I
 219
+I
+b2
+I
+227
 x
 78
 /Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb