RubyGems - haml - Versions diffs - 4.1.0.beta.1 → 5.0.0.beta.2 - Mend

haml 4.1.0.beta.1 → 5.0.0.beta.2

Potentially problematic release.

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

Files changed (75) hide show

checksums.yaml +4 -4
data/.yardopts +1 -1
data/CHANGELOG.md +36 -6
data/FAQ.md +4 -14
data/MIT-LICENSE +1 -1
data/README.md +81 -48
data/REFERENCE.md +86 -50
data/Rakefile +28 -41
data/lib/haml/attribute_builder.rb +163 -0
data/lib/haml/attribute_compiler.rb +214 -0
data/lib/haml/attribute_parser.rb +112 -0
data/lib/haml/buffer.rb +24 -126
data/lib/haml/compiler.rb +62 -281
data/lib/haml/engine.rb +16 -23
data/lib/haml/error.rb +2 -0
data/lib/haml/escapable.rb +48 -0
data/lib/haml/exec.rb +23 -12
data/lib/haml/filters.rb +3 -4
data/lib/haml/generator.rb +36 -0
data/lib/haml/helpers.rb +61 -48
data/lib/haml/helpers/action_view_extensions.rb +1 -1
data/lib/haml/helpers/action_view_mods.rb +32 -50
data/lib/haml/helpers/safe_erubi_template.rb +26 -0
data/lib/haml/helpers/safe_erubis_template.rb +2 -0
data/lib/haml/helpers/xss_mods.rb +17 -12
data/lib/haml/options.rb +32 -36
data/lib/haml/parser.rb +61 -38
data/lib/haml/{template/plugin.rb → plugin.rb} +5 -2
data/lib/haml/railtie.rb +14 -6
data/lib/haml/template.rb +11 -6
data/lib/haml/temple_engine.rb +119 -0
data/lib/haml/temple_line_counter.rb +28 -0
data/lib/haml/util.rb +17 -112
data/lib/haml/version.rb +1 -1
data/test/attribute_parser_test.rb +105 -0
data/test/engine_test.rb +202 -106
data/test/filters_test.rb +32 -19
data/test/gemfiles/Gemfile.rails-4.0.x +7 -1
data/test/gemfiles/Gemfile.rails-4.0.x.lock +57 -71
data/test/gemfiles/Gemfile.rails-4.1.x +5 -0
data/test/gemfiles/Gemfile.rails-4.2.x +5 -0
data/test/gemfiles/Gemfile.rails-5.0.x +4 -0
data/test/helper_test.rb +156 -109
data/test/options_test.rb +21 -0
data/test/parser_test.rb +49 -4
data/test/results/eval_suppressed.xhtml +4 -4
data/test/results/helpers.xhtml +43 -41
data/test/results/helpful.xhtml +6 -3
data/test/results/just_stuff.xhtml +21 -20
data/test/results/list.xhtml +9 -9
data/test/results/nuke_inner_whitespace.xhtml +22 -22
data/test/results/nuke_outer_whitespace.xhtml +84 -92
data/test/results/original_engine.xhtml +17 -17
data/test/results/partial_layout.xhtml +4 -3
data/test/results/partial_layout_erb.xhtml +4 -3
data/test/results/partials.xhtml +11 -10
data/test/results/silent_script.xhtml +63 -63
data/test/results/standard.xhtml +156 -159
data/test/results/tag_parsing.xhtml +19 -19
data/test/results/very_basic.xhtml +2 -2
data/test/results/whitespace_handling.xhtml +77 -76
data/test/template_test.rb +21 -48
data/test/template_test_helper.rb +38 -0
data/test/templates/just_stuff.haml +1 -0
data/test/templates/standard_ugly.haml +1 -0
data/test/temple_line_counter_test.rb +40 -0
data/test/test_helper.rb +10 -10
data/test/util_test.rb +1 -48
metadata +49 -35
data/lib/haml/temple.rb +0 -85
data/test/gemfiles/Gemfile.rails-3.2.x +0 -4
data/test/templates/_av_partial_1_ugly.haml +0 -9
data/test/templates/_av_partial_2_ugly.haml +0 -5
data/test/templates/action_view_ugly.haml +0 -47
data/test/templates/standard_ugly.haml +0 -43

data/test/results/original_engine.xhtml CHANGED

@@ -1,20 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-  <head>
-    <title>Stop. haml time</title>
-    <div id='content'>
-      <h1>This is a title!</h1>
-      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit</p>
-      <p class='foo'>Cigarettes!</p>
-      <h2>Man alive!</h2>
-      <ul class='things'>
-        <li>Slippers</li>
-        <li>Shoes</li>
-        <li>Bathrobe</li>
-        <li>Coffee</li>
-      </ul>
-      <pre>This is some text that's in a pre block!
-      Let's see what happens when it's rendered! What about now, since we're on a new line?</pre>
-    </div>
-  </head>
+<head>
+<title>Stop. haml time</title>
+<div id='content'>
+<h1>This is a title!</h1>
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit</p>
+<p class='foo'>Cigarettes!</p>
+<h2>Man alive!</h2>
+<ul class='things'>
+<li>Slippers</li>
+<li>Shoes</li>
+<li>Bathrobe</li>
+<li>Coffee</li>
+</ul>
+<pre>This is some text that's in a pre block!
+Let's see what happens when it's rendered! What about now, since we're on a new line?</pre>
+</div>
+</head>
 </html>

data/test/results/partial_layout.xhtml CHANGED

@@ -1,5 +1,6 @@
 <h1>Partial layout used with for block:</h1>
 <div class='partial-layout'>
-  <h2>This is inside a partial layout</h2>
-  <p>Some content within a layout</p>
-</div>
+<h2>This is inside a partial layout</h2>
+<p>Some content within a layout</p>
+</div>

data/test/results/partial_layout_erb.xhtml CHANGED

@@ -1,5 +1,6 @@
 <h1>Partial layout used with for block:</h1>
 <div class='partial-layout'>
-  <h2>This is inside a partial layout</h2>
-  Some content within a layout
-</div>
+<h2>This is inside a partial layout</h2>
+Some content within a layout
+</div>

data/test/results/partials.xhtml CHANGED

@@ -1,21 +1,22 @@
 <p>
-  @foo =
-  value one
+@foo =
+value one
 </p>
 <p>
-  @foo =
-  value two
+@foo =
+value two
 </p>
 <p>
-  @foo =
-  value two
+@foo =
+value two
 </p>
 Toplevel? false
 <p>
-  @foo =
-  value three
+@foo =
+value three
 </p>
 <p>
-  @foo =
-  value three
+@foo =
+value three
 </p>

data/test/results/silent_script.xhtml CHANGED

@@ -1,68 +1,68 @@
 <div>
-  <h1>I can count!</h1>
-  1
-  2
-  3
-  4
-  5
-  6
-  7
-  8
-  9
-  10
-  11
-  12
-  13
-  14
-  15
-  16
-  17
-  18
-  19
-  20
-  <h1>I know my ABCs!</h1>
-  <ul>
-    <li>a</li>
-    <li>b</li>
-    <li>c</li>
-    <li>d</li>
-    <li>e</li>
-    <li>f</li>
-    <li>g</li>
-    <li>h</li>
-    <li>i</li>
-    <li>j</li>
-    <li>k</li>
-    <li>l</li>
-    <li>m</li>
-    <li>n</li>
-    <li>o</li>
-    <li>p</li>
-    <li>q</li>
-    <li>r</li>
-    <li>s</li>
-    <li>t</li>
-    <li>u</li>
-    <li>v</li>
-    <li>w</li>
-    <li>x</li>
-    <li>y</li>
-    <li>z</li>
-  </ul>
-  <h1>I can catch errors!</h1>
-  Oh no! "foo" happened!
-  <p>
-    "false" is:
-    false
-  </p>
-  Even!
-  Odd!
-  Even!
-  Odd!
-  Even!
+<h1>I can count!</h1>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+<h1>I know my ABCs!</h1>
+<ul>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d</li>
+<li>e</li>
+<li>f</li>
+<li>g</li>
+<li>h</li>
+<li>i</li>
+<li>j</li>
+<li>k</li>
+<li>l</li>
+<li>m</li>
+<li>n</li>
+<li>o</li>
+<li>p</li>
+<li>q</li>
+<li>r</li>
+<li>s</li>
+<li>t</li>
+<li>u</li>
+<li>v</li>
+<li>w</li>
+<li>x</li>
+<li>y</li>
+<li>z</li>
+</ul>
+<h1>I can catch errors!</h1>
+Oh no! "foo" happened!
+<p>
+"false" is:
+false
+</p>
+Even!
+Odd!
+Even!
+Odd!
+Even!
 </div>
 <div class='foo'>
-  <strong>foobar</strong>
+<strong>foobar</strong>
 </div>
 <strong>0</strong>
 <strong>1</strong>
@@ -70,5 +70,5 @@
 <strong>3</strong>
 <strong>4</strong>
 <div class='test'>
-  <p>boom</p>
+<p>boom</p>
 </div>

data/test/results/standard.xhtml CHANGED

@@ -1,162 +1,159 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang='en-US' xml:lang='en-US' xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>Hampton Catlin Is Totally Awesome</title>
-    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-  </head>
-  <body>
-    <!-- You're In my house now! -->
-    <div class='header'>
-      Yes, ladies and gentileman. He is just that egotistical.
-      Fantastic! This should be multi-line output
-      The question is if this would translate! Ahah!
-      20
-    </div>
-    <div id='body'> Quotes should be loved! Just like people!</div>
-    0
-    1
-    2
-    3
-    4
-    5
-    6
-    7
-    8
-    9
-    10
-    11
-    12
-    13
-    14
-    15
-    16
-    17
-    18
-    19
-    20
-    21
-    22
-    23
-    24
-    25
-    26
-    27
-    28
-    29
-    30
-    31
-    32
-    33
-    34
-    35
-    36
-    37
-    38
-    39
-    40
-    41
-    42
-    43
-    44
-    45
-    46
-    47
-    48
-    49
-    50
-    51
-    52
-    53
-    54
-    55
-    56
-    57
-    58
-    59
-    60
-    61
-    62
-    63
-    64
-    65
-    66
-    67
-    68
-    69
-    70
-    71
-    72
-    73
-    74
-    75
-    76
-    77
-    78
-    79
-    80
-    81
-    82
-    83
-    84
-    85
-    86
-    87
-    88
-    89
-    90
-    91
-    92
-    93
-    94
-    95
-    96
-    97
-    98
-    99
-    100
-    101
-    102
-    103
-    104
-    105
-    106
-    107
-    108
-    109
-    110
-    111
-    112
-    113
-    114
-    115
-    116
-    117
-    118
-    119
-    Wow.|
-    <p code='3'>
-      Holy cow        multiline       tags!           A pipe (|) even!
-      PipesIgnored|PipesIgnored|PipesIgnored|
-      1|2|3
-    </p>
-    <div class='silent' foo='17'>
-      this shouldn't evaluate but now it should!
-    </div>
-    <ul class='really cool'>
-      <li>a</li>
-      <li>b</li>
-      <li>c</li>
-      <li>d</li>
-      <li>e</li>
-      <li>f</li>
-    </ul>
-    <div class='of_divs_with_underscore' id='combo'>with this text</div>
-    foo
-    <div class='footer'>
-      <strong class='shout'>
-        This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid.
-        So, I'm just making it *really* long. God, I hope this works
-      </strong>
-    </div>
-  </body>
+<head>
+<title>Hampton Catlin Is Totally Awesome</title>
+<meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
+</head>
+<body>
+<!-- You're In my house now! -->
+<div class='header'>
+Yes, ladies and gentileman. He is just that egotistical.
+Fantastic! This should be multi-line output
+The question is if this would translate! Ahah!
+20
+</div>
+<div id='body'> Quotes should be loved! Just like people!</div>
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+Wow.|
+<p code='3'>
+Holy cow        multiline       tags!           A pipe (|) even!
+PipesIgnored|PipesIgnored|PipesIgnored|
+1|2|3
+</p>
+<div class='silent' foo='17'>
+this shouldn't evaluate but now it should!
+</div>
+<ul class='really cool'>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d</li>
+<li>e</li>
+<li>f</li>
+</ul>
+<div class='of_divs_with_underscore' id='combo'>with this text</div>
+foo<div class='footer'>
+<strong class='shout'>This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid.
+So, I'm just making it *really* long. God, I hope this works</strong>
+</div>
+</body>
 </html>