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/configuration/inheritance.rb CHANGED

@@ -61,6 +61,19 @@ module Compass
           inherited_writer(*attributes)
         end
+        def chained_method(method)
+          line = __LINE__ + 1
+          class_eval %Q{
+            alias_method :_chained_#{method}, method
+            def #{method}(*args, &block)
+              _chained_#{method}(*args, &block)
+              if inherited_data
+                inherited_data.#{method}(*args, &block)
+              end
+            end
+          }, __FILE__, line
+        end
       end

data/lib/compass/configuration/inheritance.rbc CHANGED

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -364,8 +364,8 @@ e
 I
 22
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -391,7 +391,7 @@ x
 12
 ClassMethods
 i
-58
+44
 5
 66
 99
@@ -435,20 +435,6 @@ i
 49
 3
 4
-15
-99
-7
-8
-7
-9
-65
-67
-49
-2
-0
-49
-3
-4
 11
 I
 5
@@ -460,7 +446,7 @@ I
 0
 n
 p
-10
+8
 x
 16
 inherited_writer
@@ -710,8 +696,8 @@ I
 I
 56
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -736,8 +722,8 @@ I
 I
 8
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -977,8 +963,8 @@ I
 I
 4c
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -1003,8 +989,8 @@ I
 I
 8
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1077,176 +1063,15 @@ I
 I
 14
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
 10
 attributes
-x
-14
-chained_method
-M
-1
-n
-n
-x
-14
-chained_method
-i
-52
-4
-65
-79
-81
-0
-19
-1
-15
-5
-7
-1
-20
-0
-47
-101
-2
-7
-3
-20
-0
-47
-101
-2
-7
-4
-20
-0
-47
-101
-2
-7
-5
-20
-0
-47
-101
-2
-7
-6
-63
-9
-65
-49
-7
-0
-20
-1
-47
-49
-8
-3
-11
-I
-c
-I
-2
-I
-1
-I
-1
-n
 p
-9
-x
-1
-+
-s
-36
-            alias_method :_chained_
-x
-4
-to_s
-s
-25
-, method
-            def
-s
-39
-(*args, &block)
-              _chained_
-s
-79
-(*args, &block)
-              if inherited_data
-                inherited_data.
-s
-60
-(*args, &block)
-              end
-            end
-x
-11
-active_path
-x
-10
-class_eval
-p
-19
-I
--1
-I
-40
-I
-0
-I
-41
-I
-8
-I
-4a
-I
-9
-I
-42
-I
-b
-I
-43
-I
-12
-I
-44
-I
-19
-I
-45
-I
-20
-I
-47
-I
-29
-I
-4a
-I
-34
-x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
-p
-2
-x
-6
-method
-x
-4
-line
-p
-9
+7
 I
 2
 I
@@ -1261,13 +1086,9 @@ I
 3b
 I
 2c
-I
-40
-I
-3a
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1542,16 +1363,16 @@ p
 I
 -1
 I
-52
+45
 I
 0
 I
-53
+46
 I
 6
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1632,40 +1453,36 @@ x
 11
 respond_to?
 p
-15
+13
 I
 -1
 I
-56
+49
 I
 0
 I
-c9
+bc
 I
 1
 I
-57
+4a
 I
 c
 I
-58
+4b
 I
 17
 I
-59
+4c
 I
 22
 I
-58
-I
-23
-I
-0
+4b
 I
 24
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1735,40 +1552,36 @@ x
 15
 inherited_data=
 p
-15
+13
 I
 -1
 I
-5e
+51
 I
 0
 I
-5f
+52
 I
 6
 I
-60
+53
 I
 11
 I
-c9
+bc
 I
 12
 I
-62
-I
-1c
-I
-0
+55
 I
 1d
 I
-64
+57
 I
 1f
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1816,20 +1629,20 @@ p
 I
 -1
 I
-67
+5a
 I
 0
 I
-c9
+bc
 I
 1
 I
-68
+5b
 I
 b
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1883,24 +1696,24 @@ p
 I
 -1
 I
-6b
+5e
 I
 0
 I
-6c
+5f
 I
 8
 I
-6d
+60
 I
 b
 I
-6e
+61
 I
 11
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1997,28 +1810,28 @@ p
 I
 -1
 I
-71
+64
 I
 0
 I
-72
+65
 I
 10
 I
-73
+66
 I
 20
 I
-74
+67
 I
 28
 I
-75
+68
 I
 2a
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2088,20 +1901,20 @@ p
 I
 -1
 I
-78
+6b
 I
 0
 I
-79
+6c
 I
 10
 I
-7a
+6d
 I
 18
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2159,16 +1972,16 @@ p
 I
 -1
 I
-7d
+70
 I
 0
 I
-7e
+71
 I
 f
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -2245,36 +2058,32 @@ x
 4
 send
 p
-13
+11
 I
 -1
 I
-81
+74
 I
 0
 I
-82
+75
 I
 f
 I
-83
+76
 I
 18
 I
-84
+77
 I
 21
 I
-83
-I
-22
-I
-0
+76
 I
 23
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -2409,48 +2218,44 @@ x
 11
 respond_to?
 p
-19
+17
 I
 -1
 I
-89
+7c
 I
 0
 I
-8a
+7d
 I
 9
 I
-8b
+7e
 I
 19
 I
-8c
+7f
 I
 2a
 I
-8d
+80
 I
 3b
 I
-8e
+81
 I
 45
 I
-8f
+82
 I
 4f
 I
-8e
-I
-50
-I
-0
+81
 I
 51
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2532,32 +2337,28 @@ x
 11
 default_for
 p
-11
+9
 I
 -1
 I
-95
+88
 I
 0
 I
-96
+89
 I
 15
 I
-99
+8c
 I
 1f
 I
-97
-I
-21
-I
-0
+8a
 I
 22
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -2662,32 +2463,28 @@ x
 5
 raise
 p
-11
+9
 I
 -1
 I
-9d
+90
 I
 4
 I
-9e
+91
 I
 9
 I
-9f
+92
 I
 23
 I
-a1
-I
-30
-I
-0
+94
 I
 31
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 3
 x
@@ -2754,40 +2551,36 @@ x
 14
 inherited_data
 p
-15
+13
 I
 -1
 I
-a5
+98
 I
 0
 I
-a6
+99
 I
 5
 I
-a7
+9a
 I
 8
 I
-a8
+9b
 I
 d
 I
-a9
+9c
 I
 17
 I
-ab
-I
-18
-I
-0
+9e
 I
 19
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2864,32 +2657,28 @@ x
 2
 <<
 p
-11
+9
 I
 -1
 I
-af
+a2
 I
 0
 I
-b0
+a3
 I
 6
 I
-b1
-I
-21
-I
-0
+a4
 I
 23
 I
-b2
+a5
 I
 26
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3305,80 +3094,44 @@ x
 2
 <<
 p
-35
+17
 I
 0
 I
-b9
+ac
 I
 4
 I
-ba
+ad
 I
 7
 I
-bf
+b2
 I
 10
 I
-bb
-I
-2b
-I
-0
-I
-30
-I
-bb
-I
-46
-I
-0
+ae
 I
 4e
 I
-bc
-I
-69
-I
-0
-I
-6e
-I
-bc
-I
-84
-I
-0
+af
 I
 8c
 I
-bd
-I
-a7
-I
-0
-I
-ac
-I
-bd
-I
-c2
-I
-0
+b0
 I
 ca
 I
-be
+b1
 I
 d8
 I
-ba
+ad
 I
 dc
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3395,24 +3148,24 @@ p
 I
 0
 I
-b7
+aa
 I
 4
 I
-b8
+ab
 I
 9
 I
-b9
+ac
 I
 12
 I
-c1
+b4
 I
 21
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -3429,24 +3182,24 @@ p
 I
 -1
 I
-b5
+a8
 I
 0
 I
-b6
+a9
 I
 a
 I
-b7
+aa
 I
 13
 I
-c3
+b6
 I
 16
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3457,68 +3210,68 @@ p
 I
 2
 I
-52
+45
 I
 10
 I
-56
+49
 I
 1e
 I
-5e
+51
 I
 2c
 I
-67
+5a
 I
 3a
 I
-6b
+5e
 I
 48
 I
-71
+64
 I
 56
 I
-78
+6b
 I
 64
 I
-7d
+70
 I
 72
 I
-81
+74
 I
 80
 I
-89
+7c
 I
 8e
 I
-95
+88
 I
 9c
 I
-9d
+90
 I
 aa
 I
-a5
+98
 I
 b8
 I
-af
+a2
 I
 c6
 I
-b5
+a8
 I
 d4
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 p
@@ -3534,12 +3287,12 @@ I
 I
 27
 I
-50
+43
 I
 41
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3554,8 +3307,8 @@ I
 I
 1c
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3570,8 +3323,8 @@ I
 I
 1c
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3586,7 +3339,7 @@ I
 I
 1c
 x
-72
-/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+70
+/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0