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

@@ -1,28 +1,6 @@
 module Compass
   module Configuration
     class FileData < Data
-      extend Sass::Callbacks
-      # on_sprite_generated
-      # yields the filename
-      # usage: on_sprite_save {|filename| do_somethign(filename) }
-      define_callback :sprite_saved
-      # on_sprite_generated
-      # yields 'ChunkyPNG::Image'
-      # usage: on_sprite_generated {|sprite_data| do_something(sprite_data) }
-      define_callback :sprite_generated
-      # on_stylesheet_saved
-      # yields the filename
-      # usage: on_stylesheet_saved {|filename| do_something(filename) }
-      define_callback :stylesheet_saved
-      # on_stylesheet_error
-      # yields the filename & message
-      # usage: on_stylesheet_error {|filename, message| do_something(filename, message) }
-      define_callback :stylesheet_error
       def self.new_from_file(config_file, defaults = nil)
         data = new(config_file)
         data.with_defaults(defaults) do

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

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -187,29 +187,72 @@ x
 8
 FileData
 i
-24
+67
 5
 66
-99
-7
+5
+45
 0
+1
+43
+2
+47
+49
+3
+1
+15
+5
+7
+4
+47
+49
+5
+1
+15
+5
+7
+6
+47
+49
+5
+1
+15
+5
 7
+7
+47
+49
+5
 1
+15
+5
+7
+8
+47
+49
+5
+1
+15
+99
+7
+9
+7
+10
 65
 5
 49
-2
+11
 4
 15
 99
 7
-3
+12
 7
-4
+13
 65
 5
 49
-2
+11
 4
 11
 I
@@ -222,7 +265,32 @@ I
 0
 n
 p
-5
+14
+x
+4
+Sass
+n
+x
+9
+Callbacks
+x
+6
+extend
+x
+12
+sprite_saved
+x
+15
+define_callback
+x
+16
+sprite_generated
+x
+16
+stylesheet_saved
+x
+16
+stylesheet_error
 x
 13
 new_from_file
@@ -350,12 +418,12 @@ p
 I
 0
 I
-7
+1d
 I
 a
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0
 x
@@ -366,24 +434,24 @@ p
 I
 -1
 I
-4
+1a
 I
 8
 I
-5
+1b
 I
 26
 I
-6
+1c
 I
 30
 I
-9
+1f
 I
 33
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 3
 x
@@ -528,12 +596,12 @@ p
 I
 0
 I
-f
+25
 I
 d
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0
 x
@@ -544,24 +612,24 @@ p
 I
 -1
 I
-c
+22
 I
 8
 I
-d
+23
 I
 26
 I
-e
+24
 I
 30
 I
-11
+27
 I
 33
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 4
 x
@@ -577,7 +645,7 @@ x
 4
 data
 p
-5
+15
 I
 2
 I
@@ -585,12 +653,32 @@ I
 I
 d
 I
-c
+9
+I
+15
+I
+e
+I
+1d
+I
+13
+I
+25
 I
 18
+I
+2d
+I
+1a
+I
+38
+I
+22
+I
+43
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0
 x
@@ -605,8 +693,8 @@ I
 I
 1f
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0
 x
@@ -621,8 +709,8 @@ I
 I
 1c
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0
 x
@@ -637,7 +725,7 @@ I
 I
 1c
 x
-70
-/Users/crispee/Projects/compass/lib/compass/configuration/file_data.rb
+68
+/Users/chris/Projects/compass/lib/compass/configuration/file_data.rb
 p
 0

data/lib/compass/configuration/helpers.rb CHANGED

@@ -67,21 +67,22 @@ module Compass
           end
         end
         unless @callbacks_loaded
-          on_saved = Proc.new do |sass_file, css_file|
-                       Compass.configuration.run_callback(:stylesheet_saved, css_file)
-                     end
-          if Sass::Plugin.respond_to?(:on_updated_stylesheet)
-            Sass::Plugin.on_updated_stylesheet(&on_saved)
-          else
-            Sass::Plugin.on_updating_stylesheet(&on_saved)
+          Sass::Plugin.on_updating_stylesheet do |sass_file, css_file|
+            Compass.configuration.run_stylesheet_saved(css_file)
           end
           Sass::Plugin.on_compilation_error do |e, filename, css|
-            Compass.configuration.run_callback(:stylesheet_error, filename, e.message)
+            Compass.configuration.run_stylesheet_error(filename, e.message)
           end
           @callbacks_loaded = true
         end
       end
+      def configure_rails!(app)
+        app.config.compass.to_sass_engine_options.each do |key, value|
+          app.config.sass.send(:"#{key}=", value)
+        end
+      end
       def sass_engine_options
         configuration.to_sass_engine_options
       end

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

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -198,7 +198,7 @@ x
 7
 Helpers
 i
-250
+236
 5
 66
 99
@@ -369,23 +369,15 @@ i
 3
 4
 15
-99
+65
 7
 26
 7
 27
-65
-67
-49
-2
-0
-49
-3
-4
-15
-65
+64
 7
 28
+64
 7
 29
 64
@@ -395,23 +387,17 @@ i
 7
 31
 64
-7
-32
-64
-7
-33
-64
 35
 5
 49
-34
+32
 2
 15
 99
 7
-35
+33
 7
-36
+34
 65
 67
 49
@@ -423,9 +409,9 @@ i
 15
 99
 7
-37
+35
 7
-38
+36
 65
 67
 49
@@ -437,9 +423,9 @@ i
 15
 99
 7
-39
+37
 7
-40
+38
 65
 67
 49
@@ -459,7 +445,7 @@ I
 0
 n
 p
-41
+39
 x
 13
 configuration
@@ -516,7 +502,7 @@ x
 21
 default_configuration
 p
-15
+13
 I
 -1
 I
@@ -538,18 +524,14 @@ I
 I
 8
 I
-16
-I
-0
-I
 17
 I
 b
 I
 1a
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -664,8 +646,8 @@ f
 I
 2b
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -763,7 +745,7 @@ x
 14
 @configuration
 p
-15
+13
 I
 -1
 I
@@ -773,10 +755,6 @@ I
 I
 13
 I
-14
-I
-0
-I
 15
 I
 16
@@ -795,8 +773,8 @@ I
 I
 35
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 3
 x
@@ -1131,7 +1109,7 @@ x
 5
 raise
 p
-35
+31
 I
 -1
 I
@@ -1161,10 +1139,6 @@ I
 I
 25
 I
-4f
-I
-0
-I
 50
 I
 26
@@ -1197,14 +1171,10 @@ c8
 I
 2e
 I
-d9
-I
-0
-I
 da
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 3
 x
@@ -1259,8 +1229,8 @@ I
 I
 4
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -1312,8 +1282,8 @@ I
 I
 7
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -1542,7 +1512,7 @@ x
 21
 add_template_location
 p
-9
+7
 I
 0
 I
@@ -1556,14 +1526,10 @@ I
 I
 42
 I
-2d
-I
-0
-I
 2e
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -1592,7 +1558,7 @@ x
 22
 configure_sass_plugin!
 i
-22
+24
 58
 37
 19
@@ -1609,14 +1575,16 @@ i
 49
 2
 0
+7
+3
 20
 1
 49
-3
-1
+4
+2
 11
 I
-5
+6
 I
 2
 I
@@ -1625,7 +1593,7 @@ I
 2
 n
 p
-4
+5
 x
 7
 Compass
@@ -1634,8 +1602,11 @@ x
 13
 configuration
 x
-20
-run_stylesheet_saved
+16
+stylesheet_saved
+x
+12
+run_callback
 p
 5
 I
@@ -1647,10 +1618,10 @@ a
 I
 47
 I
-16
+18
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -1676,7 +1647,7 @@ x
 22
 configure_sass_plugin!
 i
-31
+33
 58
 37
 19
@@ -1697,19 +1668,21 @@ i
 49
 2
 0
+7
+3
 20
 1
 20
 0
 49
-3
+4
 0
 49
-4
-2
+5
+3
 11
 I
-7
+8
 I
 3
 I
@@ -1718,7 +1691,7 @@ I
 3
 n
 p
-5
+6
 x
 7
 Compass
@@ -1727,11 +1700,14 @@ x
 13
 configuration
 x
+16
+stylesheet_error
+x
 7
 message
 x
-20
-run_stylesheet_error
+12
+run_callback
 p
 5
 I
@@ -1743,10 +1719,10 @@ e
 I
 4a
 I
-1f
+21
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 3
 x
@@ -1762,7 +1738,7 @@ x
 20
 on_compilation_error
 p
-23
+21
 I
 -1
 I
@@ -1804,14 +1780,10 @@ I
 I
 4c
 I
-4f
-I
-0
-I
 50
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -1821,214 +1793,6 @@ x
 9
 locations
 x
-16
-configure_rails!
-M
-1
-n
-n
-x
-16
-configure_rails!
-i
-35
-20
-0
-49
-0
-0
-7
-1
-49
-2
-1
-9
-15
-1
-8
-17
-1
-11
-15
-20
-0
-49
-0
-0
-49
-3
-0
-49
-4
-0
-56
-5
-50
-6
-0
-11
-I
-3
-I
-1
-I
-1
-I
-1
-n
-p
-7
-x
-6
-config
-x
-4
-sass
-x
-11
-respond_to?
-x
-7
-compass
-x
-22
-to_sass_engine_options
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-16
-configure_rails!
-i
-38
-58
-37
-19
-0
-15
-37
-19
-1
-15
-15
-21
-1
-0
-49
-0
-0
-49
-1
-0
-20
-0
-47
-101
-2
-7
-3
-63
-2
-47
-49
-4
-0
-20
-1
-49
-5
-2
-11
-I
-6
-I
-2
-I
-2
-I
-2
-n
-p
-6
-x
-6
-config
-x
-4
-sass
-x
-4
-to_s
-s
-1
-=
-x
-6
-to_sym
-x
-4
-send
-p
-5
-I
-0
-I
-52
-I
-a
-I
-53
-I
-26
-x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
-p
-2
-x
-3
-key
-x
-5
-value
-x
-4
-each
-p
-9
-I
--1
-I
-50
-I
-0
-I
-51
-I
-11
-I
-0
-I
-12
-I
-52
-I
-23
-x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
-p
-1
-x
-3
-app
-x
 19
 sass_engine_options
 M
@@ -2069,16 +1833,16 @@ p
 I
 -1
 I
-57
+50
 I
 0
 I
-58
+51
 I
 7
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -2365,84 +2129,60 @@ x
 28
 project_type_without_default
 p
-37
+25
 I
 -1
 I
-5c
+55
 I
 0
 I
-5d
-I
-1b
-I
-5d
+56
 I
 1e
 I
-5e
+57
 I
 2d
 I
-5f
-I
-42
-I
-0
+58
 I
 43
 I
-60
+59
 I
 5b
 I
-61
+5a
 I
 62
 I
-62
+5b
 I
 71
 I
-63
+5c
 I
 7a
 I
-64
+5d
 I
 88
 I
-66
-I
-8f
-I
-0
+5f
 I
 90
 I
-69
+62
 I
 99
 I
-6b
-I
-b7
-I
-0
-I
-bb
-I
-6b
-I
-c1
-I
-0
+64
 I
 c2
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 4
 x
@@ -2602,32 +2342,28 @@ x
 8
 discover
 p
-11
+9
 I
 0
 I
-70
+69
 I
 4
 I
-71
+6a
 I
 e
 I
-72
+6b
 I
 1a
 I
-71
-I
-1b
-I
-0
+6a
 I
 1c
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 1
 x
@@ -2657,36 +2393,32 @@ x
 8
 discover
 p
-13
+11
 I
 -1
 I
-6f
+68
 I
 0
 I
-70
+69
 I
 c
 I
-75
+6e
 I
 1a
 I
-76
+6f
 I
 2a
 I
-75
-I
-2b
-I
-0
+6e
 I
 2c
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -2778,20 +2510,20 @@ p
 I
 -1
 I
-7b
+74
 I
 8
 I
-7c
+75
 I
 17
 I
-7d
+76
 I
 2a
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -2925,36 +2657,32 @@ x
 1
 +
 p
-13
+11
 I
 -1
 I
-80
+79
 I
 8
 I
-81
+7a
 I
 17
 I
-82
+7b
 I
 31
 I
-83
+7c
 I
 47
 I
-85
-I
-49
-I
-0
+7e
 I
 4a
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -3086,12 +2814,12 @@ p
 I
 0
 I
-8e
+87
 I
 f
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 1
 x
@@ -3150,12 +2878,12 @@ p
 I
 0
 I
-8f
+88
 I
 d
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 1
 x
@@ -3169,20 +2897,20 @@ p
 I
 -1
 I
-8d
+86
 I
 8
 I
-8e
+87
 I
 13
 I
-8f
+88
 I
 1b
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 2
 x
@@ -3250,32 +2978,28 @@ x
 6
 clean!
 p
-11
+9
 I
 -1
 I
-92
+8b
 I
 0
 I
-93
+8c
 I
 d
 I
-94
+8d
 I
 14
 I
-93
-I
-15
-I
-0
+8c
 I
 16
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 1
 x
@@ -3346,20 +3070,20 @@ p
 I
 -1
 I
-98
+91
 I
 0
 I
-99
+92
 I
 14
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 p
-35
+33
 I
 2
 I
@@ -3395,44 +3119,40 @@ I
 I
 72
 I
-57
+55
 I
 80
 I
-5c
+68
 I
 8e
 I
-6f
+74
 I
 9c
 I
-7b
+79
 I
 aa
 I
-80
+83
 I
-b8
+c2
 I
-8a
+86
 I
 d0
 I
-8d
+8b
 I
 de
 I
-92
+91
 I
 ec
-I
-98
-I
-fa
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -3451,8 +3171,8 @@ I
 I
 20
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -3474,12 +3194,12 @@ I
 I
 1c
 I
-9e
+97
 I
 27
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0
 x
@@ -3494,7 +3214,7 @@ I
 I
 1c
 x
-68
-/Users/crispee/Projects/compass/lib/compass/configuration/helpers.rb
+66
+/Users/chris/Projects/compass/lib/compass/configuration/helpers.rb
 p
 0