RubyGems - haml - Versions diffs - 4.0.7 → 5.2.2 - Mend

haml 4.0.7 → 5.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (124) hide show

checksums.yaml +5 -5
data/.github/workflows/test.yml +36 -0
data/.gitignore +19 -0
data/.gitmodules +3 -0
data/.yardopts +2 -3
data/CHANGELOG.md +146 -4
data/FAQ.md +4 -14
data/Gemfile +16 -0
data/MIT-LICENSE +2 -2
data/README.md +90 -47
data/REFERENCE.md +160 -74
data/Rakefile +44 -63
data/TODO +24 -0
data/benchmark.rb +70 -0
data/haml.gemspec +45 -0
data/lib/haml/.gitattributes +1 -0
data/lib/haml/attribute_builder.rb +219 -0
data/lib/haml/attribute_compiler.rb +237 -0
data/lib/haml/attribute_parser.rb +150 -0
data/lib/haml/buffer.rb +12 -175
data/lib/haml/compiler.rb +110 -320
data/lib/haml/engine.rb +34 -41
data/lib/haml/error.rb +28 -24
data/lib/haml/escapable.rb +77 -0
data/lib/haml/exec.rb +38 -20
data/lib/haml/filters.rb +22 -27
data/lib/haml/generator.rb +42 -0
data/lib/haml/helpers/action_view_extensions.rb +4 -2
data/lib/haml/helpers/action_view_mods.rb +45 -60
data/lib/haml/helpers/action_view_xss_mods.rb +2 -0
data/lib/haml/helpers/safe_erubi_template.rb +20 -0
data/lib/haml/helpers/safe_erubis_template.rb +5 -1
data/lib/haml/helpers/xss_mods.rb +23 -13
data/lib/haml/helpers.rb +134 -89
data/lib/haml/options.rb +63 -69
data/lib/haml/parser.rb +319 -227
data/lib/haml/plugin.rb +54 -0
data/lib/haml/railtie.rb +43 -12
data/lib/haml/sass_rails_filter.rb +18 -4
data/lib/haml/template/options.rb +13 -2
data/lib/haml/template.rb +13 -6
data/lib/haml/temple_engine.rb +124 -0
data/lib/haml/temple_line_counter.rb +30 -0
data/lib/haml/util.rb +83 -202
data/lib/haml/version.rb +3 -1
data/lib/haml.rb +2 -0
data/yard/default/.gitignore +1 -0
data/yard/default/fulldoc/html/css/common.sass +15 -0
data/yard/default/layout/html/footer.erb +12 -0
metadata +73 -115
data/lib/haml/template/plugin.rb +0 -41
data/test/engine_test.rb +0 -2013
data/test/erb/_av_partial_1.erb +0 -12
data/test/erb/_av_partial_2.erb +0 -8
data/test/erb/action_view.erb +0 -62
data/test/erb/standard.erb +0 -55
data/test/filters_test.rb +0 -254
data/test/gemfiles/Gemfile.rails-3.0.x +0 -5
data/test/gemfiles/Gemfile.rails-3.1.x +0 -6
data/test/gemfiles/Gemfile.rails-3.2.x +0 -5
data/test/gemfiles/Gemfile.rails-4.0.x +0 -5
data/test/haml-spec/LICENSE +0 -14
data/test/haml-spec/README.md +0 -106
data/test/haml-spec/lua_haml_spec.lua +0 -38
data/test/haml-spec/perl_haml_test.pl +0 -81
data/test/haml-spec/ruby_haml_test.rb +0 -23
data/test/haml-spec/tests.json +0 -660
data/test/helper_test.rb +0 -583
data/test/markaby/standard.mab +0 -52
data/test/mocks/article.rb +0 -6
data/test/parser_test.rb +0 -105
data/test/results/content_for_layout.xhtml +0 -12
data/test/results/eval_suppressed.xhtml +0 -9
data/test/results/helpers.xhtml +0 -70
data/test/results/helpful.xhtml +0 -10
data/test/results/just_stuff.xhtml +0 -70
data/test/results/list.xhtml +0 -12
data/test/results/nuke_inner_whitespace.xhtml +0 -40
data/test/results/nuke_outer_whitespace.xhtml +0 -148
data/test/results/original_engine.xhtml +0 -20
data/test/results/partial_layout.xhtml +0 -5
data/test/results/partial_layout_erb.xhtml +0 -5
data/test/results/partials.xhtml +0 -21
data/test/results/render_layout.xhtml +0 -3
data/test/results/silent_script.xhtml +0 -74
data/test/results/standard.xhtml +0 -162
data/test/results/tag_parsing.xhtml +0 -23
data/test/results/very_basic.xhtml +0 -5
data/test/results/whitespace_handling.xhtml +0 -90
data/test/template_test.rb +0 -354
data/test/templates/_av_partial_1.haml +0 -9
data/test/templates/_av_partial_1_ugly.haml +0 -9
data/test/templates/_av_partial_2.haml +0 -5
data/test/templates/_av_partial_2_ugly.haml +0 -5
data/test/templates/_layout.erb +0 -3
data/test/templates/_layout_for_partial.haml +0 -3
data/test/templates/_partial.haml +0 -8
data/test/templates/_text_area.haml +0 -3
data/test/templates/_text_area_helper.html.haml +0 -4
data/test/templates/action_view.haml +0 -47
data/test/templates/action_view_ugly.haml +0 -47
data/test/templates/breakage.haml +0 -8
data/test/templates/content_for_layout.haml +0 -8
data/test/templates/eval_suppressed.haml +0 -11
data/test/templates/helpers.haml +0 -55
data/test/templates/helpful.haml +0 -11
data/test/templates/just_stuff.haml +0 -85
data/test/templates/list.haml +0 -12
data/test/templates/nuke_inner_whitespace.haml +0 -32
data/test/templates/nuke_outer_whitespace.haml +0 -144
data/test/templates/original_engine.haml +0 -17
data/test/templates/partial_layout.haml +0 -3
data/test/templates/partial_layout_erb.erb +0 -4
data/test/templates/partialize.haml +0 -1
data/test/templates/partials.haml +0 -12
data/test/templates/render_layout.haml +0 -2
data/test/templates/silent_script.haml +0 -45
data/test/templates/standard.haml +0 -43
data/test/templates/standard_ugly.haml +0 -43
data/test/templates/tag_parsing.haml +0 -21
data/test/templates/very_basic.haml +0 -4
data/test/templates/whitespace_handling.haml +0 -87
data/test/test_helper.rb +0 -81
data/test/util_test.rb +0 -63

data/test/parser_test.rb DELETED Viewed

@@ -1,105 +0,0 @@
-require 'test_helper'
-module Haml
-  class ParserTest < MiniTest::Unit::TestCase
-    test "should raise error for 'else' at wrong indent level" do
-      begin
-        parse("- if true\n  #first\n    text\n  - else\n    #second")
-        flunk("Should have raised a Haml::SyntaxError")
-      rescue SyntaxError => e
-        assert_equal Error.message(:bad_script_indent, 'else', 0, 1), e.message
-      end
-    end
-    test "should raise error for 'elsif' at wrong indent level" do
-      begin
-        parse("- if true\n  #first\n    text\n  - elsif false\n    #second")
-        flunk("Should have raised a Haml::SyntaxError")
-      rescue SyntaxError => e
-        assert_equal Error.message(:bad_script_indent, 'elsif', 0, 1), e.message
-      end
-    end
-    test "should raise error for 'else' at wrong indent level after unless" do
-      begin
-        parse("- unless true\n  #first\n    text\n  - else\n    #second")
-        flunk("Should have raised a Haml::SyntaxError")
-      rescue SyntaxError => e
-        assert_equal Error.message(:bad_script_indent, 'else', 0, 1), e.message
-      end
-    end
-    test "should raise syntax error for else with no if" do
-      begin
-        parse("- else\n  'foo'")
-        flunk("Should have raised a Haml::SyntaxError")
-      rescue SyntaxError => e
-        assert_equal Error.message(:missing_if, 'else'), e.message
-      end
-    end
-    test "should raise syntax error for nested else with no" do
-      begin
-        parse("#foo\n  - else\n    'foo'")
-        flunk("Should have raised a Haml::SyntaxError")
-      rescue SyntaxError => e
-        assert_equal Error.message(:missing_if, 'else'), e.message
-      end
-    end
-    test "else after if containing case is accepted" do
-      # see issue 572
-      begin
-        parse "- if true\n  - case @foo\n  - when 1\n    bar\n- else\n  bar"
-        assert true
-      rescue SyntaxError
-        flunk 'else clause after if containing case should be accepted'
-      end
-    end
-    test "else after if containing unless is accepted" do
-      begin
-        parse "- if true\n  - unless @foo\n  bar\n- else\n  bar"
-        assert true
-      rescue SyntaxError
-        flunk 'else clause after if containing unless should be accepted'
-      end
-    end
-    test "loud script with else is accepted" do
-      begin
-        parse "= if true\n  - 'A'\n-else\n  - 'B'"
-        assert true
-      rescue SyntaxError
-        flunk 'loud script (=) should allow else'
-      end
-    end
-    test "else after nested loud script is accepted" do
-      begin
-        parse "-if true\n  =if true\n    - 'A'\n-else\n  B"
-        assert true
-      rescue SyntaxError
-        flunk 'else after nested loud script should be accepted'
-      end
-    end
-    test "case with indented whens should allow else" do
-      begin
-        parse "- foo = 1\n-case foo\n  -when 1\n    A\n  -else\n    B"
-        assert true
-      rescue SyntaxError
-        flunk 'case with indented whens should allow else'
-      end
-    end
-    private
-    def parse(haml, options = nil)
-      options ||= Options.new
-      parser = Parser.new(haml, options)
-      parser.parse
-    end
-  end
-end

data/test/results/content_for_layout.xhtml DELETED Viewed

@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head></head>
-  <body>
-    <div id='yieldy'>
-      Lorem ipsum dolor sit amet
-    </div>
-    <div id='nosym'>
-      Lorem ipsum dolor sit amet
-    </div>
-  </body>
-</html>

data/test/results/eval_suppressed.xhtml DELETED Viewed

@@ -1,9 +0,0 @@
-<p></p>
-<p></p>
-<h1>Me!</h1>
-<div id='foo'>
-  <p id='bar'>All</p>
-  <br />
-  <p class='baz'>This</p>
-  Should render
-</div>

data/test/results/helpers.xhtml DELETED Viewed

@@ -1,70 +0,0 @@
-&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;
-<div>
-  <p class='title'>Title</p>
-  <p class='text'>
-    Woah this is really crazy
-    I mean wow,
-    man.
-  </p>
-</div>
-<div>
-  <p class='title'>Title</p>
-  <p class='text'>
-    Woah this is really crazy
-    I mean wow,
-    man.
-  </p>
-</div>
-<div>
-  <p class='title'>Title</p>
-  <p class='text'>
-    Woah this is really crazy
-    I mean wow,
-    man.
-  </p>
-</div>
-<p>foo</p>
-  <p>reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong</p>
-<div class='woah'>
-  <div id='funky'>
-    <div>
-      <h1>Big!</h1>
-      <p>Small</p>
-      <!-- Invisible -->
-    </div>
-    <div class='dilly'>
-      <p>foo</p>
-      <h1>bar</h1>
-    </div>
-  </div>
-  (<strong>parentheses!</strong>)
-</div>
-*<span class='small'>Not really</span>
-click
-<a href='thing'>here</a>.
-<p>baz</p>
-                    <p>boom</p>
-foo
-<li><a href='http://www.google.com'>google</a></li>
-<p>
-  foo
-  <div>
-    bar
-  </div>
-  boom
-  baz
-  boom, again
-</p>
-<table>
-  <tr>
-    <td class='cell'>
-      <strong>strong!</strong>
-      data
-    </td>
-    <td>
-      more_data
-    </td>
-  </tr>
-</table>
-<hr />
-<div></div>

data/test/results/helpful.xhtml DELETED Viewed

@@ -1,10 +0,0 @@
-<div class='article' id='article_1'>
-  <h1>Hello</h1>
-  <div>World</div>
-</div>
-<div class='article' id='id_article_1'>id</div>
-<div class='article class' id='article_1'>class</div>
-<div class='article class' id='id_article_1'>id class</div>
-<div class='article full' id='article_1'>boo</div>
-<div class='article full' id='article_1'>moo</div>
-<div class='article articleFull' id='article_1'>foo</div>

data/test/results/just_stuff.xhtml DELETED Viewed

@@ -1,70 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<?xml version='1.0' encoding='iso-8859-1' ?>
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<strong apos="Foo's bar!">Boo!</strong>
-Embedded? false!
-Embedded? true!
-Embedded? true!
-Embedded? twice! true!
-Embedded? one af"t"er another!
-<p>Embedded? false!</p>
-<p>Embedded? true!</p>
-<p>Embedded? true!</p>
-<p>Embedded? twice! true!</p>
-<p>Embedded? one af"t"er another!</p>
-stuff followed by whitespace
-<strong>block with whitespace</strong>
-<p>
-  Escape
-  - character
-  %p foo
-  yee\ha
-</p>
-<!-- Short comment -->
-<!--
-  This is a block comment
-  cool, huh?
-  <strong>there can even be sub-tags!</strong>
-  Or script!
--->
-<p class=''>class attribute should appear!</p>
-<p>this attribute shouldn't appear</p>
-<!--[if lte IE6]> conditional comment! <![endif]-->
-<!--[if gte IE7]>
-  <p>Block conditional comment</p>
-  <div>
-    <h1>Cool, eh?</h1>
-  </div>
-<![endif]-->
-<!--[if gte IE5.2]>
-  Woah a period.
-<![endif]-->
-testtest
-<br />
-<meta foo='bar' />
-<img />
-<hr />
-<link />
-<script>Inline content</script>
-<br>
-  Nested content
-</br>
-<p class='article bar foo' id='article_1'>Blah</p>
-<p class='article foo' id='article_1'>Blah</p>
-<p class='article bar baz foo' id='article_1'>Blah</p>
-<p class='article quux qux' id='article_1'>Blump</p>
-<p class='article' id='foo_bar_baz_article_1'>Whee</p>
-Woah inner quotes
-<p class='dynamic_quote' dyn='3' quotes="single '"></p>
-<p class='dynamic_self_closing' dyn='3' />
-<body>
-  hello
-  <div>
-    <img />
-  </div>
-</body>

data/test/results/list.xhtml DELETED Viewed

@@ -1,12 +0,0 @@
-!Not a Doctype!
-<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>
-</ul>

data/test/results/nuke_inner_whitespace.xhtml DELETED Viewed

@@ -1,40 +0,0 @@
-<p>
-  <q>Foo</q>
-</p>
-<p>
-  <q a='2'>Foo</q>
-</p>
-<p>
-  <q>Foo
-  Bar</q>
-</p>
-<p>
-  <q a='2'>Foo
-  Bar</q>
-</p>
-<p>
-  <q>Foo
-  Bar</q>
-</p>
-<p>
-  <q a='2'>Foo
-  Bar</q>
-</p>
-<p>
-  <q><div>
-    Foo
-    Bar
-  </div></q>
-</p>
-<p>
-  <q a='2'><div>
-    Foo
-    Bar
-  </div></q>
-</p>
-<p>
-  <q>foo</q>
-  <q a='2'>
-    bar
-  </q>
-</p>

data/test/results/nuke_outer_whitespace.xhtml DELETED Viewed

@@ -1,148 +0,0 @@
-<p>
-  <p><q>
-      Foo
-    </q></p>
-</p>
-<p>
-  <p><q a='2'>
-      Foo
-    </q></p>
-</p>
-<p>
-  <p><q>Foo</q></p>
-</p>
-<p>
-  <p><q a='2'>Foo</q></p>
-</p>
-<p>
-  <p><q>
-      Foo
-    </q></p>
-</p>
-<p>
-  <p><q a='2'>
-      Foo
-    </q></p>
-</p>
-<p>
-  <p><q>Foo</q></p>
-</p>
-<p>
-  <p><q a='2'>Foo</q></p>
-</p>
-<p>
-  <p><q>
-      Foo
-      Bar
-    </q></p>
-</p>
-<p>
-  <p><q a='2'>
-      Foo
-      Bar
-    </q></p>
-</p>
-<p>
-  <p><q>
-      Foo
-      Bar
-    </q></p>
-</p>
-<p>
-  <p><q a='2'>
-      Foo
-      Bar
-    </q></p>
-</p>
-<p>
-  <p>
-      foo<q>
-        Foo
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>
-        Foo
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q>Foo</q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>Foo</q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q>
-        Foo
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>
-        Foo
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q>Foo</q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>Foo</q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q>
-        Foo
-        Bar
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>
-        Foo
-        Bar
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q>
-        Foo
-        Bar
-      </q>bar
-  </p>
-</p>
-<p>
-  <p>
-      foo<q a='2'>
-        Foo
-        Bar
-      </q>bar
-  </p>
-</p>
-<p>
-  <p><q></q></p>
-</p>
-<p>
-  <p><q /></p>
-</p>
-<p>
-  <p><q a='2'></q></p>
-</p>
-<p>
-  <p><q a='2' /></p>
-</p>

data/test/results/original_engine.xhtml DELETED Viewed

@@ -1,20 +0,0 @@
-<!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>
-</html>

data/test/results/partial_layout.xhtml DELETED Viewed

@@ -1,5 +0,0 @@
-<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>

data/test/results/partial_layout_erb.xhtml DELETED Viewed

@@ -1,5 +0,0 @@
-<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>

data/test/results/partials.xhtml DELETED Viewed

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

data/test/results/render_layout.xhtml DELETED Viewed

@@ -1,3 +0,0 @@
-Before
-During
-After

data/test/results/silent_script.xhtml DELETED Viewed

@@ -1,74 +0,0 @@
-<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!
-</div>
-<div class='foo'>
-  <strong>foobar</strong>
-</div>
-<strong>0</strong>
-<strong>1</strong>
-<strong>2</strong>
-<strong>3</strong>
-<strong>4</strong>
-<div class='test'>
-  <p>boom</p>
-</div>