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/sprites/image.rb CHANGED

@@ -17,7 +17,16 @@ module Compass
         # The Full path to the image
         def file
-          File.join(Compass.configuration.images_path, relative_file)
+          @file ||= find_file
+        end
+        def find_file
+          Compass.configuration.sprite_load_path.each do |path|
+            f = File.join(path, relative_file)
+            if File.exists?(f)
+              return f
+            end
+          end
         end
         # Width of the image
@@ -25,6 +34,10 @@ module Compass
           dimensions.first
         end
+        def size
+          @size ||= File.size(file)
+        end
         # Height of the image
         def height
           dimensions.last
@@ -35,29 +48,28 @@ module Compass
           File.basename(relative_file, '.png')
         end
+        def get_var_file(var)
+          options.get_var "#{name}_#{var}"
+        end
         # Value of <tt> $#{name}-repeat </tt> or <tt> $repeat </tt>
         def repeat
-          [ "#{name}-repeat", "repeat" ].each { |which|
-            if var = options.get_var(which)
-              return var.value
-            end
-          }
-          "no-repeat"
+          (get_var_file("repeat") || options.get_var("repeat") || Sass::Script::String.new("no-repeat")).value
         end
-        # Value of <tt> $#{name}-position </tt> or <tt> $position </tt> defaults o <tt>0px</tt>
+        # Value of <tt> $#{name}-position </tt> or <tt> $position </tt> defaults to <tt>0px</tt>
         def position
-          options.get_var("#{name}-position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
+          get_var_file("position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
         end
         # Offset within the sprite
         def offset
           (position.unitless? || position.unit_str == "px") ? position.value : 0
         end
         # Spacing between this image and the next
         def spacing
-          (options.get_var("#{name}-spacing") || options.get_var("spacing") || Sass::Script::Number.new(0)).value
+          (get_var_file("spacing") || options.get_var("spacing") || Sass::Script::Number.new(0, ['px'])).value
         end
         # MD5 hash of this file

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

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -238,7 +238,7 @@ x
 5
 Image
 i
-436
+394
 5
 66
 65
@@ -615,57 +615,15 @@ i
 25
 4
 15
-99
-7
-60
-7
-61
-65
-67
-49
-24
-0
-49
-25
-4
-15
-99
-7
-62
-7
-63
-65
-67
-49
-24
-0
-49
-25
-4
-15
-99
-7
-64
-7
-65
-65
-67
-49
-24
-0
-49
-25
-4
-15
 5
 48
-66
+60
 15
 99
 7
-67
+61
 7
-68
+62
 65
 67
 49
@@ -685,7 +643,7 @@ I
 0
 n
 p
-69
+63
 x
 6
 ACTIVE
@@ -824,8 +782,8 @@ f
 I
 19
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 3
 x
@@ -854,82 +812,28 @@ x
 4
 file
 i
-12
-39
-0
-13
-10
-11
-15
-5
-48
-1
-38
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-2
-x
-5
-@file
-x
-9
-find_file
-p
-5
-I
--1
-I
-13
-I
-0
-I
-14
-I
-c
-x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
-p
-0
-x
-9
-find_file
-M
-1
-n
-n
-x
-9
-find_file
-i
-15
+19
 45
 0
 1
-49
+45
 2
-0
-49
 3
-0
-56
+49
 4
-50
+0
+49
 5
 0
+5
+48
+6
+49
+7
+2
 11
 I
-2
+3
 I
 0
 I
@@ -938,7 +842,11 @@ I
 0
 n
 p
-6
+8
+x
+4
+File
+n
 x
 7
 Compass
@@ -947,139 +855,29 @@ x
 13
 configuration
 x
-16
-sprite_load_path
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-9
-find_file
-i
-35
-57
-19
-0
-15
-45
-0
-1
-20
-0
-5
-48
-2
-49
-3
-2
-19
-1
-15
-45
-0
-4
-20
-1
-49
-5
-1
-9
-33
-20
-1
-31
-8
-34
-1
 11
-I
-6
-I
-2
-I
-1
-I
-1
-n
-p
-6
-x
-4
-File
-n
+images_path
 x
 13
 relative_file
 x
 4
 join
-n
-x
-7
-exists?
-p
-13
-I
-0
-I
-18
-I
-4
-I
-19
-I
-12
-I
-1a
-I
-1c
-I
-1b
-I
-21
-I
-1a
-I
-22
-I
-0
-I
-23
-x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
-p
-2
-x
-4
-path
-x
-1
-f
-x
-4
-each
 p
 5
 I
 -1
 I
-17
+13
 I
 0
 I
-18
+14
 I
-f
+13
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -1123,99 +921,28 @@ p
 I
 -1
 I
-21
+18
 I
 0
 I
-22
+19
 I
 7
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
-4
-size
+6
+height
 M
 1
 n
 n
 x
-4
-size
-i
-18
-39
-0
-13
-10
-17
-15
-45
-1
-2
-5
-48
-3
-49
-4
-1
-38
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-5
-@size
-x
-4
-File
-n
-x
-4
-file
-x
-4
-size
-p
-5
-I
--1
-I
-25
-I
-0
-I
-26
-I
-12
-x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
-p
-0
-x
-6
-height
-M
-1
-n
-n
-x
-6
-height
+6
+height
 i
 7
 5
@@ -1247,16 +974,16 @@ p
 I
 -1
 I
-2a
+1d
 I
 0
 I
-2b
+1e
 I
 7
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -1313,80 +1040,66 @@ p
 I
 -1
 I
-2f
+22
 I
 0
 I
-30
+23
 I
 d
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
-12
-get_var_file
+6
+repeat
 M
 1
 n
 n
 x
-12
-get_var_file
+6
+repeat
 i
-33
-5
-48
-0
+25
 5
 48
-1
-49
-2
 0
 47
 101
-3
+1
 7
-4
-5
-48
 2
-47
-101
-3
+63
+2
 7
-4
-20
-0
-47
-101
 3
-63
-5
-49
+64
+35
+2
+56
+4
+50
 5
-1
+0
+15
+7
+6
+64
 11
 I
-7
+2
 I
-1
+0
 I
-1
+0
 I
-1
+0
 n
 p
-6
-x
 7
-options
-x
-4
-base
 x
 4
 name
@@ -1394,134 +1107,62 @@ x
 4
 to_s
 s
-1
-_
-x
 7
-get_var
-p
-5
-I
--1
-I
-33
-I
-0
-I
-34
-I
-21
-x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
-p
-1
-x
-3
-var
-x
+-repeat
+s
 6
 repeat
 M
 1
-n
+p
+2
+x
+9
+for_block
+t
 n
 x
 6
 repeat
 i
-71
-39
+26
+57
+19
 0
-13
-10
-70
 15
 5
-7
-1
-64
-47
+48
+0
+20
+0
 49
-2
 1
-13
-10
-65
-15
-5
-48
-3
-7
 1
-64
-49
-4
+19
 1
-13
-10
-65
-15
-45
-5
-6
-43
-7
-43
-8
-13
-71
 9
-47
-9
-59
-47
+24
+20
+1
 49
-10
+2
 0
-13
-7
-11
-64
-47
-49
-12
-1
-15
+31
 8
-65
-7
-11
-64
-49
-9
+25
 1
-49
-13
-0
-38
-0
 11
 I
-3
+5
 I
-0
+2
 I
-0
+1
 I
-0
+1
 n
 p
-14
-x
-7
-@repeat
-s
-6
-repeat
-x
-12
-get_var_file
+3
 x
 7
 options
@@ -1529,45 +1170,64 @@ x
 7
 get_var
 x
+5
+value
+p
+9
+I
+0
+I
+28
+I
 4
-Sass
-n
+I
+29
+I
+10
+I
+2a
+I
+18
+I
+29
+I
+1a
 x
-6
-Script
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+p
+2
 x
-6
-String
+5
+which
 x
 3
-new
+var
 x
-8
-allocate
+4
+each
 s
 9
 no-repeat
-x
-10
-initialize
-x
-5
-value
 p
-5
+7
 I
 -1
 I
-38
+27
 I
 0
 I
-39
+28
 I
-47
+15
+I
+2d
+I
+19
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -1582,79 +1242,79 @@ x
 position
 i
 74
-39
+5
+48
 0
-13
-10
-73
-15
 5
-7
+48
 1
-64
 47
-49
+101
+2
+7
+3
+63
 2
+49
+4
 1
 13
 10
-71
+73
 15
 5
 48
-3
+0
 7
-1
+5
 64
 49
 4
 1
 13
 10
-71
+73
 15
 45
-5
 6
-43
 7
 43
 8
+43
+9
 13
 71
-9
+10
 47
 9
-62
+64
 47
 49
-10
+11
 0
 13
 78
 7
-11
+12
 64
 35
 1
 47
 49
-12
+13
 2
 15
 8
-71
+73
 78
 7
-11
+12
 64
 35
 1
 49
-9
+10
 2
-38
-0
 11
 I
 4
@@ -1666,22 +1326,25 @@ I
 0
 n
 p
-13
-x
-9
-@position
-s
-8
-position
-x
-12
-get_var_file
+14
 x
 7
 options
 x
+4
+name
+x
+4
+to_s
+s
+9
+-position
+x
 7
 get_var
+s
+8
+position
 x
 4
 Sass
@@ -1709,16 +1372,16 @@ p
 I
 -1
 I
-3d
+31
 I
 0
 I
-3e
+32
 I
 4a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -1732,47 +1395,39 @@ x
 6
 offset
 i
-41
-39
-0
-13
-10
-40
-15
+33
 5
 48
-1
+0
 49
-2
+1
 0
 13
 10
-27
+21
 15
 5
 48
-1
+0
 49
-3
+2
 0
 7
-4
+3
 64
 83
-5
+4
 9
-37
+31
 5
 48
-1
+0
 49
-6
+5
 0
 8
-38
+32
 78
-38
-0
 11
 I
 2
@@ -1784,10 +1439,7 @@ I
 0
 n
 p
-7
-x
-7
-@offset
+6
 x
 8
 position
@@ -1807,24 +1459,20 @@ x
 5
 value
 p
-7
+5
 I
 -1
 I
-42
+36
 I
 0
 I
-43
-I
-26
-I
-43
+37
 I
-29
+21
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -1838,86 +1486,76 @@ x
 7
 spacing
 i
-77
-39
+67
+5
+48
 0
-13
-10
-76
-15
 5
-7
+48
 1
-64
 47
-49
+101
+2
+7
+3
+63
 2
+49
+4
 1
 13
 10
-71
+63
 15
 5
 48
-3
+0
 7
-1
+5
 64
 49
 4
 1
 13
 10
-71
+63
 15
 45
-5
 6
-43
 7
 43
 8
+43
+9
 13
 71
-9
+10
 47
 9
-62
+59
 47
 49
-10
+11
 0
 13
 78
-7
-11
-64
-35
-1
 47
 49
 12
-2
+1
 15
 8
-71
+63
 78
-7
-11
-64
-35
-1
 49
-9
-2
+10
+1
 49
 13
 0
-38
-0
 11
 I
-4
+3
 I
 0
 I
@@ -1928,20 +1566,23 @@ n
 p
 14
 x
-8
-@spacing
-s
 7
-spacing
+options
 x
-12
-get_var_file
+4
+name
 x
-7
-options
+4
+to_s
+s
+8
+-spacing
 x
 7
 get_var
+s
+7
+spacing
 x
 4
 Sass
@@ -1958,9 +1599,6 @@ new
 x
 8
 allocate
-s
-2
-px
 x
 10
 initialize
@@ -1972,16 +1610,16 @@ p
 I
 -1
 I
-47
+3b
 I
 0
 I
-48
+3c
 I
-4d
+43
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2040,16 +1678,16 @@ p
 I
 -1
 I
-4c
+40
 I
 0
 I
-4d
+41
 I
 f
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2100,16 +1738,16 @@ p
 I
 -1
 I
-51
+45
 I
 0
 I
-52
+46
 I
 a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2160,16 +1798,16 @@ p
 I
 -1
 I
-56
+4a
 I
 0
 I
-57
+4b
 I
 a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2232,16 +1870,16 @@ p
 I
 -1
 I
-5b
+4f
 I
 0
 I
-5c
+50
 I
 11
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2292,16 +1930,16 @@ p
 I
 -1
 I
-60
+54
 I
 0
 I
-61
+55
 I
 a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2364,16 +2002,16 @@ p
 I
 -1
 I
-65
+59
 I
 0
 I
-66
+5a
 I
 11
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2424,16 +2062,16 @@ p
 I
 -1
 I
-6a
+5e
 I
 0
 I
-6b
+5f
 I
 a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2496,16 +2134,16 @@ p
 I
 -1
 I
-6f
+63
 I
 0
 I
-70
+64
 I
 11
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2611,36 +2249,32 @@ x
 9
 image_for
 p
-13
+11
 I
 -1
 I
-74
+68
 I
 0
 I
-75
+69
 I
 16
 I
-76
+6a
 I
 20
 I
-77
+6b
 I
 2e
 I
-75
-I
-2f
-I
-0
+69
 I
 30
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2758,20 +2392,20 @@ p
 I
 -1
 I
-7d
+71
 I
 0
 I
-7e
+72
 I
 32
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 p
-59
+53
 I
 2
 I
@@ -2807,92 +2441,80 @@ I
 I
 98
 I
-17
+18
 I
 a6
 I
-21
+1d
 I
 b4
 I
-25
+22
 I
 c2
 I
-2a
+27
 I
 d0
 I
-2f
+31
 I
 de
 I
-33
+36
 I
 ec
 I
-38
+3b
 I
 fa
 I
-3d
+40
 I
 108
 I
-42
+45
 I
 116
 I
-47
+4a
 I
 124
 I
-4c
+4f
 I
 132
 I
-51
+54
 I
 140
 I
-56
+59
 I
 14e
 I
-5b
+5e
 I
 15c
 I
-60
+63
 I
 16a
 I
-65
+68
 I
 178
 I
-6a
-I
-186
-I
-6f
-I
-194
-I
-74
-I
-1a2
-I
-7c
+70
 I
-1a6
+17c
 I
-7d
+71
 I
-1b4
+18a
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2907,8 +2529,8 @@ I
 I
 1d
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2923,8 +2545,8 @@ I
 I
 1c
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2939,8 +2561,8 @@ I
 I
 1c
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0
 x
@@ -2955,7 +2577,7 @@ I
 I
 1c
 x
-76
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
+74
+/Users/chris/Projects/compass/lib/compass/sass_extensions/sprites/image.rb
 p
 0