RubyGems - compass - Versions diffs - 0.11.7 → 0.12.alpha.0 - Mend

compass 0.11.7 → 0.12.alpha.0

Files changed (207) hide show

data/Rakefile +10 -0
data/VERSION.yml +4 -3
data/bin/compass +1 -5
data/features/command_line.feature +17 -17
data/features/extensions.feature +0 -6
data/features/step_definitions/command_line_steps.rb +1 -2
data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +35 -5
data/frameworks/compass/stylesheets/compass/css3/_images.scss +6 -6
data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +3 -12
data/frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss +1 -1
data/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss +11 -14
data/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss +5 -5
data/frameworks/compass/templates/pie/PIE.htc +64 -83
data/lib/compass.rbc +36 -42
data/lib/compass/actions.rb +1 -0
data/lib/compass/actions.rbc +85 -244
data/lib/compass/app_integration.rbc +20 -28
data/lib/compass/app_integration/merb.rbc +4 -8
data/lib/compass/app_integration/rails.rb +22 -5
data/lib/compass/app_integration/rails.rbc +142 -658
data/lib/compass/app_integration/rails/actionpack2x.rb +10 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/action_controller.rb +0 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/sass_plugin.rb +0 -0
data/lib/compass/app_integration/rails/{actionpack2 → actionpack2x}/urls.rb +0 -0
data/lib/compass/app_integration/rails/actionpack30.rb +11 -0
data/lib/compass/app_integration/rails/{actionpack3 → actionpack30}/railtie.rb +0 -0
data/lib/compass/app_integration/rails/actionpack31.rb +5 -0
data/lib/compass/app_integration/rails/actionpack31/helpers.rb +5 -0
data/lib/compass/app_integration/rails/actionpack31/railtie.rb +89 -0
data/lib/compass/app_integration/rails/configuration_defaults.rb +54 -14
data/lib/compass/app_integration/rails/configuration_defaults.rbc +324 -1081
data/lib/compass/app_integration/rails/installer.rbc +61 -145
data/lib/compass/app_integration/rails/runtime.rb +6 -16
data/lib/compass/app_integration/stand_alone.rbc +15 -15
data/lib/compass/app_integration/stand_alone/configuration_defaults.rbc +23 -23
data/lib/compass/app_integration/stand_alone/installer.rbc +32 -52
data/lib/compass/browser_support.rbc +23 -35
data/lib/compass/commands/clean_project.rb +1 -1
data/lib/compass/commands/project_stats.rb +7 -7
data/lib/compass/commands/sprite.rb +4 -3
data/lib/compass/compiler.rb +2 -2
data/lib/compass/compiler.rbc +398 -591
data/lib/compass/configuration.rb +2 -0
data/lib/compass/configuration.rbc +78 -134
data/lib/compass/configuration/adapters.rbc +40 -98
data/lib/compass/configuration/comments.rb +5 -1
data/lib/compass/configuration/comments.rbc +51 -132
data/lib/compass/configuration/data.rb +26 -10
data/lib/compass/configuration/data.rbc +536 -526
data/lib/compass/configuration/defaults.rb +24 -1
data/lib/compass/configuration/defaults.rbc +187 -762
data/lib/compass/configuration/file_data.rb +0 -22
data/lib/compass/configuration/file_data.rbc +125 -37
data/lib/compass/configuration/helpers.rb +9 -8
data/lib/compass/configuration/helpers.rbc +153 -433
data/lib/compass/configuration/inheritance.rb +13 -0
data/lib/compass/configuration/inheritance.rbc +165 -412
data/lib/compass/configuration/paths.rbc +9 -9
data/lib/compass/configuration/serialization.rb +1 -0
data/lib/compass/configuration/serialization.rbc +84 -151
data/lib/compass/dependencies.rbc +4 -16
data/lib/compass/errors.rbc +5 -5
data/lib/compass/frameworks.rb +4 -10
data/lib/compass/frameworks.rbc +66 -118
data/lib/compass/quick_cache.rbc +8 -12
data/lib/compass/sass_extensions.rbc +4 -8
data/lib/compass/sass_extensions/functions.rbc +57 -90
data/lib/compass/sass_extensions/functions/colors.rbc +18 -22
data/lib/compass/sass_extensions/functions/constants.rbc +25 -45
data/lib/compass/sass_extensions/functions/cross_browser_support.rbc +36 -48
data/lib/compass/sass_extensions/functions/display.rbc +107 -341
data/lib/compass/sass_extensions/functions/enumerate.rbc +9 -9
data/lib/compass/sass_extensions/functions/font_files.rbc +125 -542
data/lib/compass/sass_extensions/functions/gradient_support.rbc +167 -379
data/lib/compass/sass_extensions/functions/image_size.rb +10 -2
data/lib/compass/sass_extensions/functions/image_size.rbc +400 -715
data/lib/compass/sass_extensions/functions/inline_image.rbc +98 -152
data/lib/compass/sass_extensions/functions/lists.rb +0 -5
data/lib/compass/sass_extensions/functions/lists.rbc +39 -75
data/lib/compass/sass_extensions/functions/selectors.rbc +28 -36
data/lib/compass/sass_extensions/functions/sprites.rb +5 -7
data/lib/compass/sass_extensions/functions/sprites.rbc +233 -255
data/lib/compass/sass_extensions/functions/trig.rb +2 -1
data/lib/compass/sass_extensions/functions/trig.rbc +51 -53
data/lib/compass/sass_extensions/functions/urls.rb +171 -80
data/lib/compass/sass_extensions/functions/urls.rbc +1051 -3158
data/lib/compass/sass_extensions/monkey_patches.rbc +5 -5
data/lib/compass/sass_extensions/monkey_patches/browser_support.rbc +47 -63
data/lib/compass/sass_extensions/monkey_patches/traversal.rbc +16 -36
data/lib/compass/sass_extensions/sprites.rb +3 -1
data/lib/compass/sass_extensions/sprites.rbc +13 -93
data/lib/compass/sass_extensions/sprites/engines.rbc +6 -615
data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc +94 -260
data/lib/compass/sass_extensions/sprites/image.rb +23 -11
data/lib/compass/sass_extensions/sprites/image.rbc +313 -691
data/lib/compass/sass_extensions/sprites/image_row.rb +47 -0
data/lib/compass/sass_extensions/sprites/layout_methods.rb +117 -0
data/lib/compass/sass_extensions/sprites/row_fitter.rb +86 -0
data/lib/compass/sass_extensions/sprites/sprite_map.rb +18 -4
data/lib/compass/sass_extensions/sprites/sprite_map.rbc +3635 -708
data/lib/compass/sass_extensions/sprites/sprite_methods.rb +5 -17
data/lib/compass/sprite_importer.rb +38 -62
data/lib/compass/sprite_importer.rbc +1495 -1125
data/lib/compass/util.rbc +11 -19
data/lib/compass/version.rbc +25 -53
data/test/fixtures/sprites/public/images/image_row/large.png +0 -0
data/test/fixtures/sprites/public/images/image_row/large_square.png +0 -0
data/test/fixtures/sprites/public/images/image_row/medium.png +0 -0
data/test/fixtures/sprites/public/images/image_row/small.png +0 -0
data/test/fixtures/sprites/public/images/image_row/tall.png +0 -0
data/test/fixtures/stylesheets/compass/css/lists.css +7 -7
data/test/fixtures/stylesheets/compass/css/reset.css +1 -0
data/test/fixtures/stylesheets/compass/css/sprites.css +248 -248
data/test/fixtures/stylesheets/compass/images/flag-s8c3c755a68.png +0 -0
data/test/integrations/sprites_test.rb +115 -3
data/test/test_helper.rb +29 -1
data/test/tmp/compass_rails/public/images/selectors-sef52c5c63a.png +0 -0
data/test/units/configuration_test.rb +2 -5
data/test/units/rails_configuration_test.rb +50 -0
data/test/units/sass_extensions_test.rb +17 -5
data/test/units/sprites/image_row_test.rb +57 -0
data/test/units/sprites/image_test.rb +53 -45
data/test/units/sprites/importer_test.rb +31 -12
data/test/units/sprites/row_fitter_test.rb +66 -0
data/test/units/sprites/sprite_command_test.rb +1 -11
data/test/units/sprites/sprite_map_test.rb +122 -16
metadata +38 -149
data/bin/compass.compiled.rbc +0 -707
data/examples/compass/compass_app_log.txt +0 -6
data/frameworks/compass/stylesheets/compass/css3/_user-interface.scss +0 -19
data/lib/compass/commands.rbc +0 -307
data/lib/compass/commands/base.rbc +0 -1044
data/lib/compass/commands/clean_project.rbc +0 -1856
data/lib/compass/commands/create_project.rbc +0 -2691
data/lib/compass/commands/default.rbc +0 -1677
data/lib/compass/commands/generate_grid_background.rbc +0 -1939
data/lib/compass/commands/help.rbc +0 -1921
data/lib/compass/commands/imports.rbc +0 -969
data/lib/compass/commands/installer_command.rbc +0 -807
data/lib/compass/commands/interactive.rbc +0 -1341
data/lib/compass/commands/list_frameworks.rbc +0 -1111
data/lib/compass/commands/print_version.rbc +0 -2478
data/lib/compass/commands/project_base.rbc +0 -2085
data/lib/compass/commands/project_stats.rbc +0 -4202
data/lib/compass/commands/registry.rbc +0 -1350
data/lib/compass/commands/sprite.rbc +0 -2212
data/lib/compass/commands/stamp_pattern.rbc +0 -2011
data/lib/compass/commands/unpack_extension.rbc +0 -2348
data/lib/compass/commands/update_project.rbc +0 -3002
data/lib/compass/commands/validate_project.rbc +0 -1686
data/lib/compass/commands/watch_project.rbc +0 -4155
data/lib/compass/commands/write_configuration.rbc +0 -2896
data/lib/compass/exec.rbc +0 -500
data/lib/compass/exec/command_option_parser.rbc +0 -676
data/lib/compass/exec/global_options_parser.rbc +0 -1306
data/lib/compass/exec/helpers.rbc +0 -758
data/lib/compass/exec/project_options_parser.rbc +0 -1515
data/lib/compass/exec/sub_command_ui.rbc +0 -1191
data/lib/compass/grid_builder.rbc +0 -0
data/lib/compass/installers.rbc +0 -152
data/lib/compass/installers/bare_installer.rbc +0 -939
data/lib/compass/installers/base.rbc +0 -4427
data/lib/compass/installers/manifest.rbc +0 -3335
data/lib/compass/installers/manifest_installer.rbc +0 -1591
data/lib/compass/installers/template_context.rbc +0 -1030
data/lib/compass/logger.rbc +0 -2317
data/lib/compass/sass_extensions/functions/env.rbc +0 -299
data/lib/compass/sass_extensions/sprites/image_methods.rbc +0 -900
data/lib/compass/sass_extensions/sprites/image_row.rbc +0 -1168
data/lib/compass/sass_extensions/sprites/layout_methods.rbc +0 -3236
data/lib/compass/sass_extensions/sprites/row_fitter.rbc +0 -2067
data/lib/compass/sass_extensions/sprites/sprite_methods.rbc +0 -3190
data/test/fixtures/extensions/only_stylesheets/compass_init.rb +0 -1
data/test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss +0 -3
data/test/fixtures/stylesheets/compass/css/user-interface.css +0 -5
data/test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png +0 -0
data/test/fixtures/stylesheets/compass/sass/user-interface.scss +0 -5
data/test/fixtures/stylesheets/envtest/tmp/env.css +0 -2
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb +0 -25
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss +0 -5
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss +0 -3
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/screen.scss +0 -6
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/ie.css +0 -5
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css +0 -3
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css +0 -68
data/test/helpers/command_line.rbc +0 -2820
data/test/helpers/diff.rbc +0 -1104
data/test/helpers/io.rbc +0 -962
data/test/helpers/rails.rbc +0 -1116
data/test/helpers/test_case.rbc +0 -1255
data/test/integrations/compass_test.rbc +0 -6589
data/test/integrations/rails_integration_test.rbc +0 -1342
data/test/integrations/sprites_test.rbc +0 -6192
data/test/test_helper.rbc +0 -1694
data/test/units/actions_test.rbc +0 -644
data/test/units/command_line_test.rbc +0 -1532
data/test/units/compass_png_test.rbc +0 -0
data/test/units/configuration_test.rbc +0 -3833
data/test/units/rails_configuration_test.rbc +0 -1032
data/test/units/sass_extensions_test.rbc +0 -3586
data/test/units/sprites/engine_test.rbc +0 -962
data/test/units/sprites/image_row_test.rbc +0 -1578
data/test/units/sprites/image_test.rbc +0 -2836
data/test/units/sprites/importer_test.rbc +0 -2620
data/test/units/sprites/row_fitter_test.rbc +0 -1479
data/test/units/sprites/sprite_command_test.rbc +0 -1147
data/test/units/sprites/sprite_map_test.rbc +0 -6515

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

@@ -22,7 +22,7 @@ module Compass::SassExtensions::Functions::Sprites
   def sprite_map(glob, kwargs = {})
     kwargs.extend VariableReader
     Compass::SassExtensions::Sprites::SpriteMap.from_uri(glob, self, kwargs)
-  end
+  end
   Sass::Script::Functions.declare :sprite_map, [:glob], :var_kwargs => true
   # Returns the image and background position for use in a single shorthand property:
@@ -34,7 +34,7 @@ module Compass::SassExtensions::Functions::Sprites
   #
   #     background: url('/images/icons.png?12345678') 0 -24px no-repeat;
   def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO)
-    sprite = convert_sprite_name(sprite)
+    sprite = convert_sprite_name(sprite)
     verify_map(map)
     unless sprite.is_a?(Sass::Script::String)
       raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
@@ -61,7 +61,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite")
     verify_sprite(sprite)
     if image = map.image_for(sprite.value)
-      Sass::Script::String.new(image.relative_file)
+      Sass::Script::String.new(image.file)
     else
       missing_image!(map, sprite)
     end
@@ -96,9 +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}-s#{map.uniqueness_hash}.png"),
-              Sass::Script::Bool.new(false),
-              Sass::Script::Bool.new(false))
+    generated_image_url(Sass::Script::String.new("#{map.path}-s#{map.uniqueness_hash}.png"))
   end
   Sass::Script::Functions.declare :sprite_url, [:map]
@@ -147,7 +145,7 @@ module Compass::SassExtensions::Functions::Sprites
   Sass::Script::Functions.declare :sprite_position, [:map, :sprite, :offset_x, :offset_y]
   def sprite_image(*args)
-    raise Sass::SyntaxError, %Q(The sprite-image() function has been replaced by sprite(). See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
+    raise Sass::SyntaxError, %Q(The sprite-image() function has been replaced by sprite(). See http://compass-style.org/help/tutorials/spriting/ for more information.)
   end
 protected

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

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -820,8 +820,8 @@ I
 I
 23
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -842,8 +842,8 @@ I
 I
 10
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 0
 x
@@ -959,8 +959,8 @@ I
 I
 29
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 2
 x
@@ -1233,7 +1233,7 @@ x
 10
 initialize
 p
-19
+17
 I
 -1
 I
@@ -1255,10 +1255,6 @@ I
 I
 28
 I
-44
-I
-0
-I
 45
 I
 2a
@@ -1273,8 +1269,8 @@ I
 I
 96
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 6
 x
@@ -1425,8 +1421,8 @@ I
 I
 32
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -1587,8 +1583,8 @@ x
 8
 allocate
 x
-4
-file
+13
+relative_file
 x
 10
 initialize
@@ -1596,7 +1592,7 @@ x
 14
 missing_image!
 p
-17
+15
 I
 -1
 I
@@ -1626,14 +1622,10 @@ I
 I
 42
 I
-5c
-I
-0
-I
 5d
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 3
 x
@@ -1821,8 +1813,8 @@ I
 I
 57
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 2
 x
@@ -2074,7 +2066,7 @@ x
 10
 initialize
 p
-17
+15
 I
 -1
 I
@@ -2100,18 +2092,14 @@ I
 I
 57
 I
-44
-I
-0
-I
 45
 I
 59
 I
 94
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 3
 x
@@ -2138,7 +2126,7 @@ x
 10
 sprite_url
 i
-95
+155
 5
 20
 0
@@ -2229,10 +2217,70 @@ i
 49
 7
 1
+45
+3
+15
+43
+5
+43
+16
+13
+71
+7
+47
+9
+116
+47
+49
+8
+0
+13
+3
+47
+49
+14
+1
+15
+8
+120
+3
+49
+7
+1
+45
+3
+17
+43
+5
+43
+16
+13
+71
+7
+47
+9
+146
+47
+49
+8
+0
+13
+3
 47
 49
+14
+1
 15
+8
+150
+3
+49
+7
 1
+47
+49
+18
+3
 11
 I
 8
@@ -2244,7 +2292,7 @@ I
 1
 n
 p
-16
+19
 s
 10
 sprite-url
@@ -2288,11 +2336,16 @@ s
 x
 10
 initialize
+n
+x
+4
+Bool
+n
 x
-19
-generated_image_url
-p
 9
+image_url
+p
+15
 I
 -1
 I
@@ -2310,10 +2363,22 @@ I
 I
 63
 I
-5f
+5a
+I
+64
+I
+78
+I
+65
+I
+96
+I
+63
+I
+9b
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -2331,7 +2396,7 @@ x
 15
 sprite_position
 i
-363
+343
 23
 1
 10
@@ -2362,30 +2427,10 @@ i
 15
 5
 20
-2
-7
-3
-47
-49
-4
-2
-15
-5
-20
-3
-7
-3
-47
-49
-4
-2
-15
-5
-20
 1
 47
 49
-5
+3
 1
 19
 1
@@ -2394,48 +2439,48 @@ i
 20
 0
 7
-6
+4
 64
 47
 49
-7
+5
 2
 15
 20
 1
 13
 9
-87
+67
 15
 20
 1
 45
-8
-9
+6
+7
 43
-10
+8
 43
-11
+9
 49
-12
+10
 1
 9
-92
+72
 1
 8
-105
+85
 5
 45
-8
-13
+6
+11
 43
-14
+12
 7
-15
+13
 64
 47
 49
-16
+14
 2
 15
 20
@@ -2443,10 +2488,10 @@ i
 20
 1
 49
-17
+15
 0
 49
-18
+16
 1
 19
 4
@@ -2454,10 +2499,10 @@ i
 20
 4
 9
-126
+106
 1
 8
-135
+115
 5
 20
 0
@@ -2465,58 +2510,58 @@ i
 1
 47
 49
-19
+17
 2
 15
 20
 2
 49
-20
+18
 0
 7
-21
+19
 64
 83
-22
+20
 9
-154
+134
 20
 2
 19
 5
 8
-235
+215
 20
 2
 49
-17
+15
 0
 20
 4
 49
-23
+21
 0
 82
-24
+22
 19
 5
 15
 45
-8
-25
+6
+23
 43
-10
+8
 43
-3
+24
 13
 71
-26
+25
 47
 9
-212
+192
 47
 49
-27
+26
 0
 13
 20
@@ -2525,45 +2570,45 @@ i
 5
 78
 83
-22
+20
 9
-200
+180
 35
 0
 8
-205
+185
 7
-28
+27
 64
 35
 1
 47
 49
-29
+28
 2
 15
 8
-233
+213
 20
 5
 20
 5
 78
 83
-22
+20
 9
-225
+205
 35
 0
 8
-230
+210
 7
-28
+27
 64
 35
 1
 49
-26
+25
 2
 19
 5
@@ -2571,34 +2616,34 @@ i
 20
 3
 49
-17
+15
 0
 20
 4
 49
-30
+29
 0
 82
-24
+22
 19
 6
 15
 45
-8
-31
+6
+30
 43
-10
+8
 43
-3
+24
 13
 71
-26
+25
 47
 9
-294
+274
 47
 49
-27
+26
 0
 13
 20
@@ -2607,65 +2652,65 @@ i
 6
 78
 83
-22
+20
 9
-282
+262
 35
 0
 8
-287
+267
 7
-28
+27
 64
 35
 1
 47
 49
-29
+28
 2
 15
 8
-315
+295
 20
 6
 20
 6
 78
 83
-22
+20
 9
-307
+287
 35
 0
 8
-312
+292
 7
-28
+27
 64
 35
 1
 49
-26
+25
 2
 19
 6
 15
 45
-8
-32
+6
+31
 43
-10
+8
 43
-33
+32
 13
 71
-26
+25
 47
 9
-351
+331
 47
 49
-27
+26
 0
 13
 20
@@ -2675,14 +2720,14 @@ i
 35
 2
 7
-34
+33
 47
 49
-29
+28
 2
 15
 8
-362
+342
 20
 5
 20
@@ -2690,9 +2735,9 @@ i
 35
 2
 7
-34
+33
 49
-26
+25
 2
 11
 I
@@ -2705,19 +2750,13 @@ I
 4
 n
 p
-35
+34
 x
 4
 ZERO
 n
 n
 x
-6
-Number
-x
-11
-assert_type
-x
 19
 convert_sprite_name
 s
@@ -2775,6 +2814,9 @@ x
 -
 n
 x
+6
+Number
+x
 3
 new
 x
@@ -2798,124 +2840,72 @@ x
 5
 space
 p
-57
+31
 I
 -1
 I
-7a
-I
-1c
-I
-7b
-I
-26
-I
 7c
 I
-30
+1c
 I
 7d
 I
-3a
+26
 I
 7e
 I
-45
+31
 I
 7f
 I
-5c
+48
 I
 80
 I
-69
-I
-0
-I
-6a
+56
 I
 82
 I
-77
+63
 I
 83
 I
-7e
+6a
 I
 84
 I
-87
-I
-0
-I
-88
+74
 I
 86
 I
-94
+80
 I
 87
 I
-9a
+86
 I
 89
 I
-a9
-I
-8a
-I
-cd
-I
-0
-I
-d4
-I
-8a
-I
-e6
-I
-0
-I
-e9
+95
 I
 8a
 I
-eb
-I
-0
-I
-ec
+d8
 I
 8c
 I
-fb
+e7
 I
 8d
 I
-11f
-I
-0
-I
-126
-I
-8d
-I
-138
-I
-0
-I
-13b
-I
-8d
-I
-13e
+12a
 I
 8e
 I
-16b
+157
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 7
 x
@@ -2989,8 +2979,8 @@ x
 11
 SyntaxError
 s
-134
-The sprite-image() function has been replaced by sprite(). See http://compass-style.org/help/tutorials/spriting/ for more information.
+139
+The sprite-image() function has been replaced by sprite(). See http://beta.compass-style.org/help/tutorials/spriting/ for more information.
 x
 5
 raise
@@ -3007,8 +2997,8 @@ I
 I
 e
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -3162,7 +3152,7 @@ x
 initialize
 n
 p
-13
+11
 I
 -1
 I
@@ -3180,18 +3170,14 @@ I
 I
 9c
 I
-50
-I
-0
-I
 51
 I
 9f
 I
 54
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -3280,7 +3266,7 @@ x
 15
 missing_sprite!
 p
-9
+7
 I
 -1
 I
@@ -3294,14 +3280,10 @@ I
 I
 a4
 I
-24
-I
-0
-I
 25
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 2
 x
@@ -3388,7 +3370,7 @@ x
 5
 raise
 p
-9
+7
 I
 -1
 I
@@ -3402,14 +3384,10 @@ I
 I
 aa
 I
-1e
-I
-0
-I
 1f
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -3547,8 +3525,8 @@ af
 I
 38
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 2
 x
@@ -3634,8 +3612,8 @@ b3
 I
 16
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 1
 x
@@ -3718,11 +3696,11 @@ I
 I
 160
 I
-65
+67
 I
 171
 I
-7a
+7c
 I
 17f
 I
@@ -3770,8 +3748,8 @@ b2
 I
 227
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 0
 x
@@ -3786,7 +3764,7 @@ I
 I
 22
 x
-80
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
+78
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/sprites.rb
 p
 0