compass 0.11.7 → 0.12.alpha.0

data/lib/compass/commands/clean_project.rb

@@ -30,7 +30,7 @@ module Compass
       def perform
         compiler = new_compiler_instance
         compiler.clean!
-        Compass::SpriteImporter.find_all_sprite_map_files(Compass.configuration.images_path).each do |sprite|
+        Compass::SpriteImporter.find_all_sprite_map_files(Compass.configuration.generated_images_path).each do |sprite|
           remove sprite
         end
       end

data/lib/compass/commands/project_stats.rb

@@ -34,13 +34,13 @@ module Compass
         compiler = new_compiler_instance
         sass_files = sorted_sass_files(compiler)
         total_label = "Total (#{sass_files.size} files):"
-        rows       = [[           :-,           :-,           :-,            :-,            :-,              :-,               :- ],
-                      [   'Filename',      'Rules', 'Properties', 'Mixins Defs', 'Mixins Used', 'CSS Selectors', 'CSS Properties' ],
-                      [           :-,           :-,           :-,            :-,            :-,              :-,               :- ]]
-        maximums   =  [ total_label.length,      5,           10,            14,            11,              13,               14 ]
-        alignments =  [        :left,       :right,       :right,        :right,        :right,          :right,           :right ]
-        delimiters =  [ ['| ', ' |'],  [' ', ' |'],  [' ', ' |'],   [' ', ' |'],   [' ', ' |'],     [' ', ' |'],      [' ', ' |'] ]
-        totals     =  [ total_label,             0,            0,             0,             0,               0,                0 ]
+        rows       = [[           :-,           :-,           :-,            :-,            :-,            :-,               :- ],
+                      [   'Filename',      'Rules', 'Properties', 'Mixins Defs', 'Mixins Used',   'CSS Rules', 'CSS Properties' ],
+                      [           :-,           :-,           :-,            :-,            :-,            :-,               :- ]]
+        maximums   =  [ total_label.length,      5,           10,            14,            11,             9,               14 ]
+        alignments =  [        :left,       :right,       :right,        :right,        :right,        :right,           :right ]
+        delimiters =  [ ['| ', ' |'],  [' ', ' |'],  [' ', ' |'],   [' ', ' |'],   [' ', ' |'],   [' ', ' |'],      [' ', ' |'] ]
+        totals     =  [ total_label,             0,            0,             0,             0,             0,                0 ]
 
         sass_files.each do |sass_file|
           css_file = compiler.corresponding_css_file(sass_file) unless sass_file[0..0] == '_'

data/lib/compass/commands/sprite.rb

@@ -39,10 +39,11 @@ module Compass
 
       def perform
         relative_uri = options[:uri].gsub(/^#{Compass.configuration.images_dir}\//, '')
-        sprites = Compass::SpriteImporter.new(:uri => relative_uri, :options => Compass.sass_engine_options)
-        options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{sprites.name}.#{Compass.configuration.preferred_syntax}")
+        name = Compass::SpriteImporter.sprite_name(relative_uri)
+        sprites = Compass::SpriteImporter.new
+        options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{name}.#{Compass.configuration.preferred_syntax}")
         options[:skip_overrides] ||= false
-        contents = sprites.content_for_images(options[:skip_overrides])
+        contents = Compass::SpriteImporter.content_for_images(relative_uri, name, options[:skip_overrides])
         if options[:output_file][-4..-1] != "scss"
           contents = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => :scss)).to_tree.to_sass
         end

data/lib/compass/compiler.rb

@@ -138,7 +138,7 @@ module Compass
       end
       duration = options[:time] ? "(#{(css_content.__duration * 1000).round / 1000.0}s)" : ""
       write_file(css_filename, css_content, options.merge(:force => true, :extra => duration))
-      Compass.configuration.run_callback(:stylesheet_saved, css_filename)
+      Compass.configuration.run_stylesheet_saved(css_filename)
     end
 
     def should_compile?(sass_filename, css_filename)
@@ -159,7 +159,7 @@ module Compass
       formatted_error = "(Line #{e.sass_line}: #{e.message})"
       file = basename(sass_filename)
       logger.record :error, file, formatted_error
-      Compass.configuration.run_callback(:stylesheet_error, sass_filename, formatted_error)
+      Compass.configuration.run_stylesheet_error(sass_filename, formatted_error)
       write_file css_filename, error_contents(e, sass_filename), options.merge(:force => true)
     end
 

data/lib/compass/compiler.rbc

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -503,30 +503,30 @@ x
 10
 initialize
 i
-336
+249
 5
 20
 0
-49
-0
-0
 13
 18
 2
 47
 49
-1
+0
 1
 15
 15
-45
-2
-3
 20
 1
-49
-4
+7
 1
+64
+7
+2
+64
+49
+3
+2
 20
 2
 17
@@ -535,14 +535,14 @@ i
 12
 47
 49
-5
+4
 1
 15
 5
 12
 47
 49
-6
+5
 1
 15
 2
@@ -551,25 +551,25 @@ i
 20
 3
 7
-7
+6
 49
-8
+7
 1
 13
 18
 2
 47
 49
-9
+8
 1
 15
 15
 20
 3
 7
-10
+9
 49
-8
+7
 1
 13
 10
@@ -577,10 +577,10 @@ i
 15
 44
 43
-11
+10
 78
 49
-12
+11
 1
 19
 4
@@ -593,7 +593,7 @@ i
 2
 47
 49
-13
+12
 1
 15
 15
@@ -601,37 +601,37 @@ i
 20
 3
 49
-14
+13
 0
 13
 18
 2
 47
 49
-15
+14
 1
 15
 15
 5
 49
-16
+15
 0
 20
 4
 49
-17
+16
 1
 15
 5
 49
-16
+15
 0
 7
-18
+17
 14
 2
 49
-19
+18
 1
 13
 10
@@ -639,12 +639,12 @@ i
 15
 5
 48
-20
+19
 13
 18
 3
 49
-21
+20
 2
 15
 8
@@ -656,34 +656,34 @@ i
 15
 5
 49
-16
+15
 0
 7
-22
+21
 5
 45
+22
 23
+43
 24
 43
 25
-43
-26
 13
 71
-27
+26
 47
 9
 184
 47
 49
-28
+27
 0
 13
 20
 1
 47
 49
-29
+28
 1
 15
 8
@@ -691,152 +691,65 @@ i
 20
 1
 49
-27
+26
 1
 13
 18
 2
 47
 49
-30
-1
-15
-13
-18
-3
-49
-21
-2
-15
-15
-5
-49
-16
-0
-7
-31
-14
-2
-49
-19
-1
-13
-10
-236
-15
-44
-43
-11
-78
-49
-12
+29
 1
-13
-18
-3
-49
-21
-2
-15
-8
-240
-18
-2
-16
-2
 15
-5
-49
-16
-0
-7
-31
-49
-19
-1
-7
-7
-5
-49
-7
-0
 13
 18
 3
 49
-21
-2
-15
-15
-5
-49
-16
-0
-7
-31
-49
-19
-1
-7
-32
-45
-33
-34
-49
-35
-0
-49
-32
-0
-13
-18
-3
-49
-21
+20
 2
 15
 15
 5
 45
-23
-36
+22
+30
 43
-37
+31
 43
-38
+32
 13
 71
-27
+26
 47
 9
-321
+234
 47
 49
-28
+27
 0
 13
 5
 48
-16
+15
 47
 49
-29
+28
 1
 15
 8
-327
+240
 5
 48
-16
+15
 49
-27
+26
 1
 13
 18
 2
 47
 49
-39
+33
 1
 15
 11
@@ -850,20 +763,19 @@ I
 4
 n
 p
-40
-x
-4
-to_s
+34
 x
 13
 working_path=
+s
+2
+./
+s
+0
+
 x
 4
-File
-n
-x
-11
-expand_path
+gsub
 x
 5
 from=
@@ -940,19 +852,6 @@ initialize
 x
 9
 importer=
-x
-7
-compass
-x
-11
-environment
-x
-7
-Compass
-n
-x
-13
-configuration
 n
 x
 6
@@ -964,7 +863,7 @@ x
 18
 staleness_checker=
 p
-43
+37
 I
 -1
 I
@@ -972,19 +871,19 @@ I
 I
 0
 I
-ba
+b4
 I
 1
 I
 9
 I
-f
+c
 I
 a
 I
 1b
 I
-ba
+b4
 I
 2c
 I
@@ -996,7 +895,7 @@ c
 I
 51
 I
-ba
+b4
 I
 52
 I
@@ -1004,7 +903,7 @@ d
 I
 5d
 I
-ba
+b4
 I
 5e
 I
@@ -1024,7 +923,7 @@ I
 I
 9c
 I
-ba
+b4
 I
 9d
 I
@@ -1032,28 +931,16 @@ I
 I
 cd
 I
-12
-I
-f1
-I
-13
-I
-108
+b4
 I
-14
-I
-124
+ce
 I
-ba
-I
-125
-I
-15
+12
 I
-150
+f9
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 5
 x
@@ -1187,16 +1074,16 @@ p
 I
 -1
 I
-18
+15
 I
 0
 I
-19
+16
 I
 2b
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -1349,32 +1236,24 @@ x
 11
 @sass_files
 p
-11
+7
 I
 -1
 I
-1c
+19
 I
 e
 I
-1d
+1a
 I
 19
 I
-1e
-I
-3c
-I
-0
-I
-43
-I
-1e
+1b
 I
 4d
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -1451,16 +1330,16 @@ p
 I
 -1
 I
-21
+1e
 I
 0
 I
-22
+1f
 I
 16
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1580,32 +1459,28 @@ x
 5
 raise
 p
-11
+9
 I
 -1
 I
-25
+22
 I
 0
 I
-26
+23
 I
 d
 I
-27
+24
 I
 25
 I
-29
-I
-32
-I
-0
+26
 I
 33
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1702,12 +1577,12 @@ p
 I
 0
 I
-2e
+2b
 I
 c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1721,16 +1596,16 @@ p
 I
 -1
 I
-2d
+2a
 I
 0
 I
-2e
+2b
 I
 11
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -1799,16 +1674,16 @@ p
 I
 -1
 I
-31
+2e
 I
 0
 I
-32
+2f
 I
 17
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1910,12 +1785,12 @@ p
 I
 0
 I
-36
+33
 I
 d
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1973,12 +1848,12 @@ p
 I
 0
 I
-36
+33
 I
 a
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -1992,16 +1867,16 @@ p
 I
 -1
 I
-35
+32
 I
 0
 I
-36
+33
 I
 14
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -2110,24 +1985,20 @@ x
 13
 needs_update?
 p
-7
+5
 I
 0
 I
-3b
-I
-a
-I
-3c
+38
 I
-1b
+a
 I
-0
+39
 I
 1c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -2144,20 +2015,20 @@ p
 I
 -1
 I
-3a
+37
 I
 0
 I
-3b
+38
 I
 f
 I
-3e
+3b
 I
 11
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -2224,16 +2095,16 @@ p
 I
 -1
 I
-41
+3e
 I
 0
 I
-42
+3f
 I
 14
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -2402,24 +2273,20 @@ x
 1
 >
 p
-7
+5
 I
 0
 I
-4a
+47
 I
 4
 I
-4b
-I
-26
-I
-0
+48
 I
 27
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -2429,40 +2296,36 @@ x
 4
 each
 p
-15
+13
 I
 -1
 I
-46
+43
 I
 0
 I
-47
+44
 I
 9
 I
-48
-I
-12
-I
-0
+45
 I
 13
 I
-49
+46
 I
 1e
 I
-4a
+47
 I
 27
 I
-4d
+4a
 I
 29
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -2482,28 +2345,29 @@ x
 6
 clean!
 i
-23
-5
+24
+45
+0
+1
 5
 48
-0
+2
 7
-1
+3
 49
-2
+4
 1
-47
 49
-3
+5
 1
 15
 5
 48
-4
+6
 56
-5
+7
 50
-6
+8
 0
 11
 I
@@ -2516,7 +2380,11 @@ I
 0
 n
 p
-7
+9
+x
+9
+FileUtils
+n
 x
 7
 options
@@ -2527,8 +2395,8 @@ x
 2
 []
 x
-6
-remove
+5
+rm_rf
 x
 9
 css_files
@@ -2545,17 +2413,18 @@ x
 6
 clean!
 i
-12
+13
 57
 19
 0
 15
-5
+45
+0
+1
 20
 0
-47
 49
-0
+2
 1
 11
 I
@@ -2568,25 +2437,29 @@ I
 1
 n
 p
-1
+3
 x
-6
-remove
+9
+FileUtils
+n
+x
+4
+rm_f
 p
 5
 I
 0
 I
-52
+4f
 I
 4
 I
-53
+50
 I
-c
+d
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -2600,20 +2473,20 @@ p
 I
 -1
 I
-50
+4d
 I
 0
 I
-51
+4e
 I
-e
+f
 I
-52
+4f
 I
-17
+18
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -2627,146 +2500,130 @@ x
 3
 run
 i
-124
-78
-19
-0
-15
+104
 5
 47
 49
 0
 0
 9
-53
-5
-48
+37
+45
 1
-7
 2
-49
-3
-1
-9
-36
-5
 5
 48
-1
+3
 7
-2
+4
 49
-3
+5
 1
-47
 49
-4
-1
-8
-37
+6
 1
 15
 5
 48
-1
+3
+7
 7
-5
 2
 13
 18
 3
 49
-6
+8
 2
 15
 8
-54
+38
 1
 15
 5
 48
-7
+9
 56
-8
+10
 50
-9
+11
 0
 15
 5
 56
-10
+12
 47
 50
-11
+13
 0
 19
-1
+0
 15
 5
 48
-1
+3
 7
-12
+14
 49
-3
+5
 1
 9
-118
+102
 5
 7
-13
+15
 20
-1
+0
 49
-14
+16
 0
 7
-15
+17
 49
-16
+18
 1
 49
-17
+19
 0
 7
-18
+20
 49
-19
+21
 1
 47
 101
-20
+22
 7
-21
+23
 63
 3
 47
 49
-22
+24
 1
 8
-119
+103
 1
-15
-20
-0
-11
 11
 I
-6
+5
 I
-2
+1
 I
 0
 I
 0
 n
 p
-23
+25
 x
 11
 new_config?
 x
+9
+FileUtils
+n
+x
 7
 options
 x
@@ -2776,8 +2633,8 @@ x
 2
 []
 x
-6
-remove
+5
+rm_rf
 x
 5
 force
@@ -2832,12 +2689,12 @@ p
 I
 0
 I
-60
+5c
 I
 c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 1
 x
@@ -2909,7 +2766,7 @@ x
 3
 run
 i
-86
+76
 58
 37
 19
@@ -2938,7 +2795,7 @@ i
 2
 30
 8
-82
+72
 26
 93
 1
@@ -2957,22 +2814,12 @@ i
 10
 48
 8
-77
+67
 15
 24
 19
 2
 15
-21
-2
-0
-79
-81
-5
-22
-2
-0
-15
 5
 20
 0
@@ -2982,11 +2829,11 @@ i
 2
 47
 49
-6
+5
 3
 25
 8
-82
+72
 15
 92
 1
@@ -3006,7 +2853,7 @@ I
 2
 n
 p
-7
+6
 x
 19
 compile_if_required
@@ -3021,54 +2868,39 @@ x
 3
 ===
 x
-1
-+
-x
 16
 handle_exception
 p
-19
+13
 I
 0
 I
-64
+60
 I
 a
 I
-66
-I
-1d
-I
-0
+62
 I
 22
 I
-67
+63
 I
 31
 I
-6a
+65
 I
 32
 I
-67
-I
-35
-I
-68
-I
-3f
-I
-69
+63
 I
-52
+35
 I
-0
+64
 I
-56
+4c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 3
 x
@@ -3088,12 +2920,12 @@ p
 I
 0
 I
-64
+60
 I
 f
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -3131,77 +2963,54 @@ x
 4
 puts
 p
-31
+21
 I
 -1
 I
-57
+54
 I
 0
 I
-58
+55
 I
-4
+7
 I
-59
+57
 I
-b
+16
 I
-5b
+58
 I
 25
 I
-0
+55
 I
-26
+27
 I
 5c
 I
-35
-I
-59
-I
-36
-I
-0
-I
-37
-I
-60
-I
-40
-I
-63
-I
-4a
-I
-6d
-I
-54
+30
 I
-6e
+5f
 I
-76
+3a
 I
-6d
+68
 I
-77
+44
 I
-0
+69
 I
-78
+66
 I
-70
+68
 I
-7c
+68
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
-2
-x
-13
-failure_count
+1
 x
 6
 result
@@ -3307,32 +3116,28 @@ x
 6
 record
 p
-11
+9
 I
 -1
 I
-73
+6d
 I
 0
 I
-74
+6e
 I
 b
 I
-75
+6f
 I
 16
 I
-77
-I
-32
-I
-0
+71
 I
 33
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -3468,16 +3273,16 @@ p
 I
 -1
 I
-80
+7a
 I
 0
 I
-81
+7b
 I
 3
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -3488,36 +3293,36 @@ p
 I
 -1
 I
-7b
+75
 I
 0
 I
-7c
+76
 I
 9
 I
-7d
+77
 I
 e
 I
-7e
+78
 I
 17
 I
-7f
+79
 I
 26
 I
-80
+7a
 I
 32
 I
-83
+7d
 I
 35
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 3
 x
@@ -3540,7 +3345,7 @@ x
 7
 compile
 i
-114
+116
 1
 19
 3
@@ -3649,11 +3454,13 @@ i
 49
 25
 0
+7
+26
 20
 1
 49
-26
-1
+27
+2
 11
 I
 e
@@ -3665,7 +3472,7 @@ I
 2
 n
 p
-27
+28
 x
 6
 logger
@@ -3755,12 +3562,12 @@ p
 I
 0
 I
-8b
+85
 I
 f
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -3771,12 +3578,12 @@ p
 I
 0
 I
-8a
+84
 I
 8
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -3848,43 +3655,42 @@ x
 13
 configuration
 x
-20
-run_stylesheet_saved
+16
+stylesheet_saved
+x
+12
+run_callback
 p
-15
+13
 I
 -1
 I
-87
+81
 I
 0
 I
-88
+82
 I
 6
 I
-89
+83
 I
 11
 I
-8e
-I
-3b
-I
-8e
+88
 I
 3e
 I
-8f
+89
 I
 66
 I
-90
+8a
 I
-72
+74
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 6
 x
@@ -3967,16 +3773,16 @@ p
 I
 -1
 I
-93
+8d
 I
 0
 I
-94
+8e
 I
 16
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -4218,24 +4024,24 @@ p
 I
 -1
 I
-98
+92
 I
 0
 I
-99
+93
 I
 2d
 I
-9a
+94
 I
 59
 I
-9b
+95
 I
 8c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 4
 x
@@ -4261,7 +4067,7 @@ x
 16
 handle_exception
 i
-102
+104
 7
 0
 20
@@ -4318,13 +4124,15 @@ i
 49
 12
 0
+7
+13
 20
 0
 20
 3
 49
-13
-2
+14
+3
 15
 5
 20
@@ -4336,32 +4144,32 @@ i
 0
 47
 49
-14
+15
 2
 5
 48
-15
+16
 44
 43
-16
+17
 79
 49
-17
+18
 1
 13
 7
-18
+19
 2
 49
-19
+20
 2
 15
 49
-20
+21
 1
 47
 49
-21
+22
 3
 11
 I
@@ -4374,7 +4182,7 @@ I
 3
 n
 p
-22
+23
 s
 6
 (Line 
@@ -4413,8 +4221,11 @@ x
 13
 configuration
 x
-20
-run_stylesheet_error
+16
+stylesheet_error
+x
+12
+run_callback
 x
 14
 error_contents
@@ -4444,32 +4255,32 @@ p
 I
 -1
 I
-a1
+9b
 I
 0
 I
-a2
+9c
 I
 1b
 I
-a3
+9d
 I
 25
 I
-a4
+9e
 I
 32
 I
-a5
+9f
 I
-40
+42
 I
-a6
+a0
 I
-66
+68
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 5
 x
@@ -4666,40 +4477,36 @@ x
 4
 send
 p
-15
+13
 I
 -1
 I
-aa
+a4
 I
 0
 I
-ab
+a5
 I
 c
 I
-ac
+a6
 I
 18
 I
-ad
+a7
 I
 37
 I
-af
+a9
 I
 5d
 I
-b0
-I
-69
-I
-0
+aa
 I
 6a
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 2
 x
@@ -4766,16 +4573,16 @@ p
 I
 -1
 I
-b5
+af
 I
 0
 I
-b6
+b0
 I
 e
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 p
@@ -4795,88 +4602,88 @@ I
 I
 2d
 I
-18
+15
 I
 3b
 I
-1c
+19
 I
 49
 I
-21
+1e
 I
 57
 I
-25
+22
 I
 65
 I
-2d
+2a
 I
 73
 I
-31
+2e
 I
 81
 I
-35
+32
 I
 8f
 I
-3a
+37
 I
 9d
 I
-41
+3e
 I
 ab
 I
-46
+43
 I
 b9
 I
-50
+4d
 I
 c7
 I
-57
+54
 I
 d5
 I
-73
+6d
 I
 e3
 I
-7b
+75
 I
 f1
 I
-87
+81
 I
 ff
 I
-93
+8d
 I
 10d
 I
-98
+92
 I
 11b
 I
-a1
+9b
 I
 129
 I
-aa
+a4
 I
 137
 I
-b5
+af
 I
 145
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -4891,8 +4698,8 @@ I
 I
 1d
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0
 x
@@ -4907,7 +4714,7 @@ I
 I
 1c
 x
-55
-/Users/crispee/Projects/compass/lib/compass/compiler.rb
+53
+/Users/chris/Projects/compass/lib/compass/compiler.rb
 p
 0