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

data/lib/sass/script/interpolation.rb CHANGED

@@ -10,12 +10,17 @@ module Sass::Script
     # @param after [Node] The SassScript after the interpolation
     # @param wb [Boolean] Whether there was whitespace between `before` and `#{`
     # @param wa [Boolean] Whether there was whitespace between `}` and `after`
-    def initialize(before, mid, after, wb, wa)
+    # @param originally_text [Boolean]
+    #   Whether the original format of the interpolation was plain text,
+    #   not an interpolation.
+    #   This is used when converting back to SassScript.
+    def initialize(before, mid, after, wb, wa, originally_text = false)
       @before = before
       @mid = mid
       @after = after
       @whitespace_before = wb
       @whitespace_after = wa
+      @originally_text = originally_text
     end
     # @return [String] A human-readable s-expression representation of the interpolation
@@ -28,7 +33,9 @@ module Sass::Script
       res = ""
       res << @before.to_sass(opts) if @before
       res << ' ' if @before && @whitespace_before
-      res << '#{' << @mid.to_sass(opts) << '}'
+      res << '#{' unless @originally_text
+      res << @mid.to_sass(opts)
+      res << '}' unless @originally_text
       res << ' ' if @after && @whitespace_after
       res << @after.to_sass(opts) if @after
       res

data/lib/sass/script/interpolation.rbc ADDED

@@ -0,0 +1,1140 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+33
+45
+0
+1
+7
+2
+45
+3
+4
+49
+5
+2
+13
+45
+0
+6
+12
+7
+7
+12
+7
+8
+12
+65
+12
+49
+9
+4
+15
+48
+7
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+10
+x
+8
+Rubinius
+n
+x
+6
+Script
+x
+4
+Sass
+n
+x
+17
+open_module_under
+n
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+6
+Script
+i
+34
+5
+66
+45
+0
+1
+7
+2
+45
+3
+4
+65
+49
+5
+3
+13
+45
+0
+6
+12
+7
+7
+12
+7
+8
+12
+65
+12
+49
+9
+4
+15
+48
+7
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+10
+x
+8
+Rubinius
+n
+x
+13
+Interpolation
+x
+4
+Node
+n
+x
+10
+open_class
+n
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+13
+Interpolation
+i
+82
+5
+66
+45
+0
+1
+7
+2
+7
+3
+65
+67
+48
+4
+49
+5
+4
+15
+45
+0
+6
+7
+7
+7
+8
+65
+67
+48
+4
+49
+5
+4
+15
+45
+0
+9
+7
+10
+7
+11
+65
+67
+48
+4
+49
+5
+4
+15
+45
+0
+12
+7
+13
+7
+14
+65
+67
+48
+4
+49
+5
+4
+15
+5
+47
+48
+15
+15
+45
+0
+16
+7
+17
+7
+18
+65
+67
+48
+4
+49
+5
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+19
+x
+8
+Rubinius
+n
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+25
+20
+0
+38
+0
+15
+20
+1
+38
+1
+15
+20
+2
+38
+2
+15
+20
+3
+38
+3
+15
+20
+4
+38
+4
+11
+I
+6
+I
+5
+I
+5
+I
+5
+n
+p
+5
+x
+7
+@before
+x
+4
+@mid
+x
+6
+@after
+x
+18
+@whitespace_before
+x
+17
+@whitespace_after
+p
+13
+I
+0
+I
+d
+I
+0
+I
+e
+I
+5
+I
+f
+I
+a
+I
+10
+I
+f
+I
+11
+I
+14
+I
+12
+I
+19
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+5
+x
+6
+before
+x
+3
+mid
+x
+5
+after
+x
+2
+wb
+x
+2
+wa
+x
+17
+method_visibility
+x
+15
+add_defn_method
+n
+x
+7
+inspect
+M
+1
+n
+n
+x
+7
+inspect
+i
+32
+7
+0
+39
+1
+48
+2
+47
+48
+3
+7
+4
+39
+5
+48
+2
+47
+48
+3
+7
+4
+39
+6
+48
+2
+47
+48
+3
+7
+7
+63
+7
+11
+I
+7
+I
+0
+I
+0
+I
+0
+n
+p
+8
+s
+15
+(interpolation
+x
+7
+@before
+x
+7
+inspect
+x
+4
+to_s
+s
+1
+x
+4
+@mid
+x
+6
+@after
+s
+1
+)
+p
+5
+I
+0
+I
+16
+I
+0
+I
+17
+I
+20
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+0
+n
+x
+7
+to_sass
+M
+1
+n
+n
+x
+7
+to_sass
+i
+132
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
+7
+2
+64
+19
+1
+15
+39
+3
+9
+38
+20
+1
+39
+3
+20
+0
+49
+4
+1
+49
+5
+1
+8
+39
+1
+15
+39
+3
+13
+9
+48
+15
+39
+6
+9
+60
+20
+1
+7
+7
+64
+49
+5
+1
+8
+61
+1
+15
+20
+1
+7
+8
+64
+49
+5
+1
+39
+9
+20
+0
+49
+4
+1
+49
+5
+1
+7
+10
+64
+49
+5
+1
+15
+39
+11
+13
+9
+95
+15
+39
+12
+9
+107
+20
+1
+7
+7
+64
+49
+5
+1
+8
+108
+1
+15
+39
+11
+9
+127
+20
+1
+39
+11
+20
+0
+49
+4
+1
+49
+5
+1
+8
+128
+1
+15
+20
+1
+11
+I
+5
+I
+2
+I
+0
+I
+1
+n
+p
+13
+x
+4
+Hash
+x
+16
+new_from_literal
+s
+0
+x
+7
+@before
+x
+7
+to_sass
+x
+2
+<<
+x
+18
+@whitespace_before
+s
+1
+s
+2
+#{
+x
+4
+@mid
+s
+1
+}
+x
+6
+@after
+x
+17
+@whitespace_after
+p
+17
+I
+0
+I
+1b
+I
+e
+I
+1c
+I
+14
+I
+1d
+I
+28
+I
+1e
+I
+3e
+I
+1f
+I
+57
+I
+20
+I
+6d
+I
+21
+I
+81
+I
+22
+I
+84
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+2
+x
+4
+opts
+x
+3
+res
+n
+x
+8
+children
+M
+1
+n
+n
+x
+8
+children
+i
+11
+39
+0
+39
+1
+39
+2
+35
+3
+48
+3
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+7
+@before
+x
+4
+@mid
+x
+6
+@after
+x
+7
+compact
+p
+5
+I
+0
+I
+2a
+I
+0
+I
+2b
+I
+b
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+0
+x
+9
+protected
+n
+x
+8
+_perform
+M
+1
+n
+n
+x
+8
+_perform
+i
+166
+7
+0
+64
+19
+1
+15
+39
+1
+9
+26
+20
+1
+39
+1
+20
+0
+49
+2
+1
+48
+3
+49
+4
+1
+8
+27
+1
+15
+39
+1
+13
+9
+36
+15
+39
+5
+9
+48
+20
+1
+7
+6
+64
+49
+4
+1
+8
+49
+1
+15
+39
+7
+20
+0
+49
+2
+1
+19
+2
+15
+20
+1
+20
+2
+45
+8
+9
+43
+10
+43
+11
+49
+12
+1
+9
+82
+20
+2
+48
+13
+8
+86
+20
+2
+48
+3
+49
+4
+1
+15
+39
+14
+13
+9
+98
+15
+39
+15
+9
+110
+20
+1
+7
+6
+64
+49
+4
+1
+8
+111
+1
+15
+39
+14
+9
+132
+20
+1
+39
+14
+20
+0
+49
+2
+1
+48
+3
+49
+4
+1
+8
+133
+1
+15
+45
+8
+16
+43
+10
+43
+11
+13
+71
+17
+47
+9
+160
+47
+48
+18
+13
+20
+1
+47
+49
+19
+1
+15
+8
+165
+20
+1
+49
+17
+1
+11
+I
+6
+I
+3
+I
+1
+I
+1
+n
+p
+20
+s
+0
+x
+7
+@before
+x
+7
+perform
+x
+4
+to_s
+x
+2
+<<
+x
+18
+@whitespace_before
+s
+1
+x
+4
+@mid
+x
+4
+Sass
+n
+x
+6
+Script
+x
+6
+String
+x
+5
+is_a?
+x
+5
+value
+x
+6
+@after
+x
+17
+@whitespace_after
+n
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+p
+19
+I
+0
+I
+34
+I
+0
+I
+35
+I
+6
+I
+36
+I
+1c
+I
+37
+I
+32
+I
+38
+I
+3c
+I
+39
+I
+5a
+I
+3a
+I
+70
+I
+3b
+I
+86
+I
+3c
+I
+a6
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+3
+x
+11
+environment
+x
+3
+res
+x
+3
+val
+p
+13
+I
+2
+I
+d
+I
+11
+I
+16
+I
+20
+I
+1b
+I
+2f
+I
+2a
+I
+3e
+I
+2e
+I
+43
+I
+34
+I
+52
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+5
+I
+22
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+21
+x
+53
+/home/nex3/code/haml/lib/sass/script/interpolation.rb
+p
+0