RubyGems - haml - Versions diffs - 3.0.4 → 3.0.5 - Mend

haml 3.0.4 → 3.0.5

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (100) hide show

data/VERSION +1 -1
data/lib/haml.rbc +581 -0
data/lib/haml/buffer.rbc +3992 -0
data/lib/haml/engine.rbc +3753 -0
data/lib/haml/error.rbc +363 -0
data/lib/haml/exec.rb +3 -2
data/lib/haml/filters.rb +7 -1
data/lib/haml/filters.rbc +5719 -0
data/lib/haml/helpers.rbc +7017 -0
data/lib/haml/helpers/action_view_mods.rb +40 -1
data/lib/haml/precompiler.rbc +21418 -0
data/lib/haml/railtie.rbc +508 -0
data/lib/haml/root.rbc +157 -0
data/lib/haml/shared.rbc +1103 -0
data/lib/haml/template.rb +22 -0
data/lib/haml/util.rb +21 -2
data/lib/haml/util.rbc +9071 -0
data/lib/haml/util/subset_map.rbc +1336 -0
data/lib/haml/version.rb +2 -2
data/lib/haml/version.rbc +1639 -0
data/lib/sass.rbc +496 -0
data/lib/sass/callbacks.rbc +407 -0
data/lib/sass/engine.rbc +15109 -0
data/lib/sass/environment.rb +14 -2
data/lib/sass/environment.rbc +1485 -0
data/lib/sass/error.rb +4 -1
data/lib/sass/error.rbc +2641 -0
data/lib/sass/files.rbc +3013 -0
data/lib/sass/less.rbc +11077 -0
data/lib/sass/plugin.rbc +4347 -0
data/lib/sass/plugin/configuration.rbc +1410 -0
data/lib/sass/plugin/rails.rb +7 -6
data/lib/sass/plugin/staleness_checker.rbc +2041 -0
data/lib/sass/script.rbc +1175 -0
data/lib/sass/script/bool.rbc +386 -0
data/lib/sass/script/color.rbc +7998 -0
data/lib/sass/script/css_lexer.rbc +828 -0
data/lib/sass/script/css_parser.rbc +649 -0
data/lib/sass/script/funcall.rbc +1880 -0
data/lib/sass/script/functions.rbc +8329 -0
data/lib/sass/script/interpolation.rb +9 -2
data/lib/sass/script/interpolation.rbc +1140 -0
data/lib/sass/script/lexer.rb +5 -4
data/lib/sass/script/lexer.rbc +7110 -0
data/lib/sass/script/literal.rbc +3275 -0
data/lib/sass/script/node.rbc +1352 -0
data/lib/sass/script/number.rbc +5850 -0
data/lib/sass/script/operation.rbc +1762 -0
data/lib/sass/script/parser.rb +30 -4
data/lib/sass/script/parser.rbc +7386 -0
data/lib/sass/script/string.rbc +1342 -0
data/lib/sass/script/string_interpolation.rbc +1625 -0
data/lib/sass/script/unary_operation.rbc +1141 -0
data/lib/sass/script/variable.rbc +871 -0
data/lib/sass/scss.rbc +256 -0
data/lib/sass/scss/css_parser.rbc +1118 -0
data/lib/sass/scss/parser.rbc +18391 -0
data/lib/sass/scss/rx.rbc +2866 -0
data/lib/sass/scss/sass_parser.rbc +311 -0
data/lib/sass/scss/script_lexer.rbc +466 -0
data/lib/sass/scss/script_parser.rbc +512 -0
data/lib/sass/scss/static_parser.rbc +1295 -0
data/lib/sass/selector.rbc +4208 -0
data/lib/sass/selector/abstract_sequence.rbc +832 -0
data/lib/sass/selector/comma_sequence.rbc +1644 -0
data/lib/sass/selector/sequence.rbc +4772 -0
data/lib/sass/selector/simple.rbc +1561 -0
data/lib/sass/selector/simple_sequence.rbc +2321 -0
data/lib/sass/tree/comment_node.rbc +2418 -0
data/lib/sass/tree/debug_node.rbc +778 -0
data/lib/sass/tree/directive_node.rbc +1281 -0
data/lib/sass/tree/extend_node.rbc +1266 -0
data/lib/sass/tree/for_node.rbc +1150 -0
data/lib/sass/tree/if_node.rbc +1114 -0
data/lib/sass/tree/import_node.rbc +2203 -0
data/lib/sass/tree/mixin_def_node.rbc +1022 -0
data/lib/sass/tree/mixin_node.rb +23 -3
data/lib/sass/tree/mixin_node.rbc +2671 -0
data/lib/sass/tree/node.rbc +5410 -0
data/lib/sass/tree/prop_node.rbc +3883 -0
data/lib/sass/tree/root_node.rbc +2391 -0
data/lib/sass/tree/rule_node.rbc +5507 -0
data/lib/sass/tree/variable_node.rbc +858 -0
data/lib/sass/tree/warn_node.rbc +1051 -0
data/lib/sass/tree/while_node.rbc +740 -0
data/test/haml/engine_test.rbc +30038 -0
data/test/haml/util_test.rb +1 -0
data/test/linked_rails.rb +7 -0
data/test/linked_rails.rbc +638 -0
data/test/sass/engine_test.rb +57 -0
data/test/sass/engine_test.rbc +24953 -0
data/test/sass/extend_test.rbc +8941 -0
data/test/sass/less_conversion_test.rbc +5292 -0
data/test/sass/plugin_test.rb +0 -29
data/test/sass/plugin_test.rbc +10726 -0
data/test/sass/script_conversion_test.rb +43 -0
data/test/sass/script_test.rb +57 -1
data/test/sass/scss/scss_test.rb +0 -48
data/test/test_helper.rbc +1973 -0
metadata +81 -3

@@ -1,12 +1,13 @@
 unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
-  Sass::Plugin.options.merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
-                              :css_location      => Haml::Util.rails_root + '/public/stylesheets',
-                              :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
-                              :always_check      => Haml::Util.rails_env == "development",
-                              :quiet             => Haml::Util.rails_env != "production",
-                              :full_exception    => Haml::Util.rails_env != "production")
+  # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
+  Sass::Plugin.options.reverse_merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
+                                      :css_location      => Haml::Util.rails_root + '/public/stylesheets',
+                                      :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
+                                      :always_check      => Haml::Util.rails_env == "development",
+                                      :quiet             => Haml::Util.rails_env != "production",
+                                      :full_exception    => Haml::Util.rails_env != "production")
   if defined?(ActionController::Metal)
     # Rails >= 3.0

data/lib/sass/plugin/staleness_checker.rbc ADDED

@@ -0,0 +1,2041 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+31
+45
+0
+1
+7
+2
+65
+49
+3
+2
+13
+45
+0
+4
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+48
+5
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+8
+Rubinius
+n
+x
+4
+Sass
+x
+11
+open_module
+n
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Sass
+i
+31
+5
+66
+45
+0
+1
+7
+2
+65
+49
+3
+2
+13
+45
+0
+4
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+48
+5
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+8
+Rubinius
+n
+x
+6
+Plugin
+x
+11
+open_module
+n
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+6
+Plugin
+i
+32
+5
+66
+45
+0
+1
+7
+2
+1
+65
+49
+3
+3
+13
+45
+0
+4
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+48
+5
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+8
+Rubinius
+n
+x
+16
+StalenessChecker
+x
+10
+open_class
+n
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+16
+StalenessChecker
+i
+177
+5
+66
+65
+7
+0
+7
+1
+7
+2
+49
+3
+1
+49
+4
+2
+15
+44
+43
+5
+78
+49
+6
+1
+38
+7
+15
+5
+45
+8
+9
+12
+49
+10
+1
+13
+45
+8
+11
+12
+7
+12
+12
+7
+13
+12
+65
+12
+49
+14
+4
+15
+48
+12
+15
+45
+8
+15
+7
+16
+7
+17
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+20
+7
+21
+7
+22
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+23
+7
+21
+7
+24
+65
+5
+49
+14
+4
+15
+5
+47
+48
+25
+15
+45
+8
+26
+7
+27
+7
+28
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+29
+7
+30
+7
+31
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+32
+7
+33
+7
+34
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+35
+7
+36
+7
+37
+65
+67
+48
+18
+49
+19
+4
+15
+45
+8
+38
+7
+39
+7
+40
+65
+67
+48
+18
+49
+19
+4
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+41
+x
+7
+DELETED
+d
+ +0.500000000000000000000000000000000000000000000000000000     1
+d
+ +0.000000000000000000000000000000000000000000000000000000     0
+x
+1
+/
+x
+9
+const_set
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+19
+@dependencies_cache
+x
+8
+Rubinius
+n
+x
+16
+object_metaclass
+n
+x
+18
+__metaclass_init__
+M
+1
+n
+n
+x
+18
+__metaclass_init__
+i
+10
+5
+66
+5
+7
+0
+47
+49
+1
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+2
+x
+18
+dependencies_cache
+x
+13
+attr_accessor
+p
+3
+I
+2
+I
+1e
+I
+a
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0
+x
+13
+attach_method
+n
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+32
+5
+48
+0
+48
+1
+38
+2
+15
+44
+43
+3
+78
+49
+4
+1
+44
+43
+3
+78
+49
+4
+1
+17
+2
+38
+5
+15
+38
+6
+15
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+5
+class
+x
+18
+dependencies_cache
+x
+13
+@dependencies
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+7
+@mtimes
+x
+19
+@dependencies_stale
+p
+7
+I
+0
+I
+23
+I
+0
+I
+24
+I
+8
+I
+29
+I
+20
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+n
+x
+24
+stylesheet_needs_update?
+M
+1
+n
+n
+x
+24
+stylesheet_needs_update?
+i
+49
+45
+0
+1
+20
+1
+49
+2
+1
+5
+20
+0
+47
+49
+3
+1
+17
+2
+19
+1
+15
+19
+2
+15
+2
+15
+20
+2
+45
+4
+5
+83
+6
+13
+10
+48
+15
+5
+20
+2
+47
+49
+7
+1
+20
+1
+49
+8
+1
+11
+I
+6
+I
+3
+I
+2
+I
+2
+n
+p
+9
+x
+4
+File
+n
+x
+11
+expand_path
+x
+5
+mtime
+x
+7
+DELETED
+n
+x
+2
+==
+x
+19
+dependency_updated?
+x
+4
+call
+p
+7
+I
+0
+I
+32
+I
+0
+I
+33
+I
+19
+I
+35
+I
+31
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+3
+x
+8
+css_file
+x
+13
+template_file
+x
+9
+css_mtime
+n
+M
+1
+n
+n
+x
+24
+stylesheet_needs_update?
+i
+28
+5
+13
+72
+0
+47
+9
+17
+47
+48
+1
+13
+47
+48
+2
+15
+8
+20
+47
+48
+0
+20
+0
+20
+1
+49
+3
+2
+11
+I
+5
+I
+2
+I
+2
+I
+2
+n
+p
+4
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+24
+stylesheet_needs_update?
+p
+5
+I
+0
+I
+42
+I
+0
+I
+43
+I
+1c
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+2
+x
+8
+css_file
+x
+13
+template_file
+x
+7
+private
+n
+x
+19
+dependencies_stale?
+M
+1
+n
+n
+x
+19
+dependencies_stale?
+i
+84
+39
+0
+20
+0
+14
+2
+49
+1
+1
+13
+10
+29
+15
+44
+43
+2
+78
+49
+3
+1
+13
+18
+3
+49
+4
+2
+15
+8
+33
+18
+2
+16
+2
+19
+2
+15
+20
+2
+56
+5
+50
+6
+0
+15
+20
+2
+20
+1
+5
+20
+0
+47
+49
+7
+1
+5
+20
+1
+47
+49
+8
+1
+13
+70
+10
+73
+44
+43
+9
+12
+49
+10
+1
+50
+11
+0
+13
+18
+3
+49
+4
+2
+15
+11
+I
+8
+I
+3
+I
+2
+I
+2
+n
+p
+12
+x
+19
+@dependencies_stale
+x
+2
+[]
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+3
+[]=
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+19
+dependencies_stale?
+i
+58
+58
+36
+37
+19
+0
+15
+37
+19
+1
+15
+15
+20
+0
+21
+1
+1
+49
+0
+1
+13
+9
+31
+15
+20
+1
+10
+30
+2
+8
+31
+3
+9
+37
+3
+31
+8
+57
+20
+0
+21
+1
+1
+85
+1
+13
+9
+50
+15
+20
+1
+9
+56
+2
+31
+8
+57
+1
+11
+I
+5
+I
+2
+I
+2
+I
+2
+n
+p
+2
+x
+2
+<=
+x
+1
+>
+p
+13
+I
+0
+I
+4a
+I
+b
+I
+4b
+I
+21
+I
+4c
+I
+25
+I
+4d
+I
+34
+I
+4e
+I
+38
+I
+4d
+I
+3a
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+2
+x
+17
+checked_css_mtime
+x
+8
+is_stale
+x
+9
+each_pair
+x
+12
+dependencies
+x
+19
+dependency_updated?
+x
+4
+Proc
+x
+14
+__from_block__
+x
+4
+any?
+p
+9
+I
+0
+I
+48
+I
+0
+I
+49
+I
+24
+I
+4a
+I
+2c
+I
+51
+I
+54
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+3
+x
+13
+template_file
+x
+9
+css_mtime
+x
+10
+timestamps
+n
+x
+5
+mtime
+M
+1
+n
+n
+x
+5
+mtime
+i
+89
+39
+0
+20
+0
+14
+2
+49
+1
+1
+13
+10
+84
+15
+26
+93
+0
+15
+29
+33
+0
+45
+2
+3
+20
+0
+49
+4
+1
+48
+5
+30
+8
+72
+26
+93
+1
+15
+24
+13
+45
+6
+7
+43
+8
+12
+49
+9
+1
+10
+52
+8
+67
+15
+39
+10
+20
+0
+49
+11
+1
+15
+45
+12
+13
+25
+8
+72
+15
+92
+1
+27
+34
+92
+0
+27
+13
+18
+3
+49
+14
+2
+15
+8
+88
+18
+2
+16
+2
+11
+I
+8
+I
+1
+I
+1
+I
+1
+n
+p
+15
+x
+7
+@mtimes
+x
+2
+[]
+x
+4
+File
+n
+x
+5
+mtime
+x
+4
+to_i
+x
+5
+Errno
+n
+x
+6
+ENOENT
+x
+3
+===
+x
+13
+@dependencies
+x
+6
+delete
+x
+7
+DELETED
+n
+x
+3
+[]=
+p
+13
+I
+0
+I
+54
+I
+0
+I
+55
+I
+d
+I
+56
+I
+26
+I
+57
+I
+35
+I
+58
+I
+3d
+I
+59
+I
+59
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+1
+x
+8
+filename
+n
+x
+12
+dependencies
+M
+1
+n
+n
+x
+12
+dependencies
+i
+80
+39
+0
+20
+0
+49
+1
+1
+97
+37
+19
+1
+15
+37
+19
+2
+15
+15
+2
+15
+20
+1
+10
+26
+2
+8
+27
+3
+13
+10
+42
+15
+20
+1
+5
+20
+0
+47
+49
+2
+1
+84
+3
+9
+75
+39
+0
+20
+0
+5
+20
+0
+47
+49
+2
+1
+5
+20
+0
+47
+49
+4
+1
+19
+2
+35
+2
+13
+18
+3
+49
+5
+2
+15
+8
+76
+1
+15
+20
+2
+11
+I
+8
+I
+3
+I
+1
+I
+1
+n
+p
+6
+x
+13
+@dependencies
+x
+2
+[]
+x
+5
+mtime
+x
+1
+<
+x
+20
+compute_dependencies
+x
+3
+[]=
+p
+13
+I
+0
+I
+5d
+I
+0
+I
+5e
+I
+13
+I
+60
+I
+2c
+I
+61
+I
+4b
+I
+60
+I
+4d
+I
+64
+I
+50
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+3
+x
+8
+filename
+x
+12
+stored_mtime
+x
+12
+dependencies
+n
+x
+19
+dependency_updated?
+M
+1
+n
+n
+x
+19
+dependency_updated?
+i
+8
+5
+56
+0
+47
+50
+1
+0
+11
+I
+3
+I
+1
+I
+1
+I
+1
+n
+p
+2
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+19
+dependency_updated?
+i
+73
+57
+19
+0
+15
+26
+93
+0
+15
+29
+40
+0
+5
+20
+0
+47
+49
+0
+1
+21
+1
+0
+85
+1
+13
+10
+37
+15
+5
+20
+0
+21
+1
+0
+47
+49
+2
+2
+30
+8
+69
+26
+93
+1
+15
+24
+13
+45
+3
+4
+43
+5
+12
+49
+6
+1
+10
+59
+8
+64
+15
+2
+25
+8
+69
+15
+92
+1
+27
+34
+92
+0
+27
+11
+I
+7
+I
+1
+I
+1
+I
+1
+n
+p
+7
+x
+5
+mtime
+x
+1
+>
+x
+19
+dependencies_stale?
+x
+4
+Sass
+n
+x
+11
+SyntaxError
+x
+3
+===
+p
+9
+I
+0
+I
+68
+I
+4
+I
+6a
+I
+2d
+I
+6b
+I
+3c
+I
+6d
+I
+49
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+1
+x
+3
+dep
+x
+6
+lambda
+p
+5
+I
+0
+I
+67
+I
+0
+I
+68
+I
+8
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+1
+x
+9
+css_mtime
+n
+x
+20
+compute_dependencies
+M
+1
+n
+n
+x
+20
+compute_dependencies
+i
+73
+26
+93
+0
+15
+29
+35
+0
+45
+0
+1
+20
+0
+45
+2
+3
+48
+4
+49
+5
+2
+45
+6
+7
+43
+8
+56
+9
+50
+10
+1
+48
+11
+30
+8
+69
+26
+93
+1
+15
+24
+13
+45
+12
+13
+43
+14
+12
+49
+15
+1
+10
+54
+8
+64
+15
+24
+19
+1
+15
+35
+0
+25
+8
+69
+15
+92
+1
+27
+34
+92
+0
+27
+11
+I
+7
+I
+2
+I
+1
+I
+1
+n
+p
+16
+x
+5
+Files
+n
+x
+6
+Plugin
+n
+x
+14
+engine_options
+x
+8
+tree_for
+x
+4
+Tree
+n
+x
+10
+ImportNode
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+20
+compute_dependencies
+i
+45
+57
+19
+0
+15
+20
+0
+48
+0
+7
+1
+13
+70
+9
+26
+15
+45
+2
+3
+7
+4
+78
+49
+5
+2
+6
+1
+49
+6
+1
+9
+34
+1
+8
+44
+45
+7
+8
+20
+0
+48
+0
+49
+9
+1
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+10
+x
+13
+full_filename
+n
+x
+6
+Regexp
+n
+s
+6
+\.css$
+x
+3
+new
+x
+2
+=~
+x
+4
+File
+n
+x
+11
+expand_path
+p
+5
+I
+0
+I
+73
+I
+4
+I
+74
+I
+2d
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+1
+x
+1
+n
+x
+4
+grep
+x
+7
+compact
+x
+4
+Sass
+n
+x
+11
+SyntaxError
+x
+3
+===
+p
+11
+I
+0
+I
+72
+I
+0
+I
+73
+I
+28
+I
+76
+I
+37
+I
+78
+I
+3b
+I
+77
+I
+49
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+2
+x
+8
+filename
+x
+1
+e
+p
+25
+I
+2
+I
+19
+I
+10
+I
+1a
+I
+1a
+I
+1c
+I
+36
+I
+23
+I
+45
+I
+32
+I
+54
+I
+42
+I
+61
+I
+46
+I
+66
+I
+48
+I
+75
+I
+54
+I
+84
+I
+5d
+I
+93
+I
+67
+I
+a2
+I
+72
+I
+b1
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+18
+I
+20
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+2
+I
+1f
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1f
+x
+57
+/home/nex3/code/haml/lib/sass/plugin/staleness_checker.rb
+p
+0