RubyGems - hamlet - Versions diffs - 0.4.2 → 0.5.0 - Mend

hamlet 0.4.2 → 0.5.0

Files changed (19) hide show

data/README.md +1 -1
data/extra/test.hamlet +22 -22
data/hamlet.gemspec +1 -1
data/lib/hamlet/forked_slim_parser.rb +6 -11
data/lib/hamlet/parser.rb +16 -10
data/test/slim/helper.rb +1 -1
data/test/slim/test_chain_manipulation.rb +3 -3
data/test/slim/test_code_evaluation.rb +11 -11
data/test/slim/test_code_output.rb +4 -4
data/test/slim/test_code_structure.rb +3 -3
data/test/slim/test_html_escaping.rb +2 -2
data/test/slim/test_html_structure.rb +12 -12
data/test/slim/test_parser_errors.rb +23 -21
data/test/slim/test_ruby_errors.rb +5 -5
data/test/slim/test_sections.rb +2 -2
data/test/slim/test_slim_template.rb +4 -4
data/test/slim/test_text_interpolation.rb +1 -1
data/test/slim/test_wrapper.rb +1 -1
metadata +24 -24

data/README.md CHANGED

@@ -82,7 +82,7 @@ A new line is automatically added *after* tags with inner text. If you have mult
 ## Limitations
-I just hacked this up the other day - let me know if there are any issues.
+A space is not automatically added after a tag when looping through an array
 ## Development

data/extra/test.hamlet CHANGED

@@ -1,9 +1,9 @@
 <doctype html
-<html
-  <head
-    <title Slim Test
-    <meta name="keywords" content="slim, syntax"
+<html>
+  <head>
+    <title Slim Test>
+    <meta name="keywords" content="slim, syntax">
     <javascript:
       $(function() {
@@ -16,22 +16,22 @@
     <erb:
       <%= some_method(@request) %>
-  <body
-    / comment block
-      with multiple lines
+  <body>
+    # comment block
+    # with multiple lines
+    # This is another line
+    <h1>= @page_title
+    <p#notice.message>
+      Welcome to the the syntax test.
+      This file is to exercise the various markup.
       This is another line
-    <h1 = @page_title
-    <p#notice.message
-      | Welcome to the the syntax test.
-        This file is to exercise the various markup.
-        This is another line
     - unless @users.empty?
-      <table
+      <table>
         - for user in users do
-          <tr
-            <td.user id=some_ruby('ere', @rme) data-test="some text #{with @ruby}" = @post.name
+          <tr>
+            <td.user id=#{some_ruby('ere', @rme)} data-test="some text #{with @ruby}">= @post.name
     - else
-      <p There are no users.
+      <p>There are no users.
     / Single comment line
     #content Hello #{@user.name}! Welcome to the test page!
@@ -39,12 +39,12 @@
     = function_with_many_parameters(:a, @variable, :option => 1)
-    <p.text
-      ' Another text block
-        with multiple lines
+    <p.text>
+      Another text block
+      with multiple lines
     = link_to('Test', @site)
-    .text#footer
-      ' Footer text block
-        with multiple lines
+    <.text#footer>
+      Footer text block
+      with multiple lines

data/hamlet.gemspec CHANGED

@@ -4,7 +4,7 @@ require 'date'
 Gem::Specification.new do |s|
   s.name              = 'hamlet'
-  s.version           = '0.4.2'
+  s.version           = '0.5.0'
   s.date              = Date.today.to_s
   s.authors           = ['Greg Weber']
   s.email             = ['greg@gregweber.info']

data/lib/hamlet/forked_slim_parser.rb CHANGED

@@ -249,15 +249,10 @@ module ForkedSlim
           next_line
-          # The text block lines must be at least indented
-          # as deep as the first line.
-          if text_indent && indent < text_indent
-            @line.lstrip!
-            syntax_error!('Unexpected text indentation')
-          end
-          @line.slice!(0, text_indent || indent)
-          @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + @line] << [:newline]
+          @line.lstrip!
+          offset = text_indent ? indent - text_indent : 0
+          syntax_error!('Unexpected text indentation') if offset < 0
+          @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + (' ' * offset) + @line] << [:newline]
           # The indentation of first line of the text block
           # determines the text base indentation.
@@ -267,10 +262,10 @@ module ForkedSlim
     end
     def parse_broken_line
-      broken_line = @line.strip
+      broken_line = @line.sub(/[^\\]#[^{].*/, '').strip
       while broken_line[-1] == ?\\
         next_line || syntax_error!('Unexpected end of file')
-        broken_line << "\n" << @line.strip
+        broken_line << "\n" << @line.sub(/[^\\]#[^{].*/, '').strip
       end
       broken_line
     end

data/lib/hamlet/parser.rb CHANGED

@@ -30,7 +30,7 @@ module Hamlet
         @stacks.last << [:newline]
         next_line
       end
-      if @lines.first and @lines.first =~ /\A<doctype\s+([^>]*)/i
+      if @lines.first and @lines.first =~ /\A<doctype\s+([^>]*)>?/i
         if !$'.empty? and $'[0] !~ /\s*#/
           fail("did not expect content after doctype")
         end
@@ -111,8 +111,7 @@ module Hamlet
         @stacks << block
       when '<'
         if @needs_space && !(@line[0] == '>')
-          @stacks.last << [:slim, :interpolate, "\n" ]
-          @stacks.last << [:newline]
+          @stacks.last << [:slim, :interpolate, " " ]
         end
         @needs_space = false
         case @line
@@ -133,6 +132,8 @@ module Hamlet
           @stacks << block
           @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
           parse_text_block($2.empty? ? nil : @indents.last + $1.size + 2)
+        else
+          syntax_error! 'Unknown line indicator'
         end
       else
         if @line[0] == '#' and @line[1] != '{'
@@ -146,7 +147,7 @@ module Hamlet
           end
         else
           if @needs_space and not @line[0] == '>'
-            @stacks.last << [:slim, :interpolate, "\n" ]
+            @stacks.last << [:slim, :interpolate, " " ]
             @stacks.last << [:newline]
           end
           @needs_space = true
@@ -214,10 +215,12 @@ module Hamlet
           end
           @line.slice!(0, text_indent || indent)
-          @line = $' if @line =~ /\A>/
-          # a code comment
-          if @line =~ /(\A|[^\\])#([^{]|\Z)/
-            @line = $` + $1
+          unless embedded
+            @line = $' if @line =~ /\A>/
+            # a code comment
+            if @line =~ /(\A|[^\\])#([^{]|\Z)/
+              @line = $` + $1
+            end
           end
           @stacks.last << [:newline] if !first_line && !embedded
           @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + @line] << [:newline]
@@ -287,15 +290,18 @@ module Hamlet
         while @line =~ /#{ATTR_NAME_REGEX}\s*(=\s*)?/
           name = $1
           @line = $'
-          if !$2
+          value = $2
+          if !value
             attributes << [:slim, :attr, name, false, 'true']
           elsif @line =~ /\A["']/
             # Value is quoted (static)
             @line = $'
             attributes << [:html, :attr, name, [:slim, :interpolate, parse_quoted_attribute($&)]]
-          elsif @line =~ /\A[^ >]+/
+          elsif @line =~ /\A(([^# >]+)|[^ >#]*#\{[^\}]+\}[^ >]*)/
             @line = $'
             attributes << [:html, :attr, name, [:slim, :interpolate, $&]]
+          elsif value =~ /\A=\s*\Z/
+            syntax_error!('Invalid empty attribute')
           end
         end

data/test/slim/helper.rb CHANGED

@@ -33,7 +33,7 @@ class TestSlim < MiniTest::Unit::TestCase
   def assert_syntax_error(message, source, options = {})
     render(source, options)
     raise 'Syntax error expected'
-  rescue Slim::Parser::SyntaxError => ex
+  rescue ForkedSlim::Parser::SyntaxError => ex
     assert_equal message, ex.message
   end

data/test/slim/test_chain_manipulation.rb CHANGED

@@ -16,15 +16,15 @@ p Test
   def test_before
     source = %q{
-p Test
+<p>Test
 }
     chain = proc do |engine|
       engine.before(Hamlet::Parser, :WrapInput) do |input|
-        "p Header\n#{input}\np Footer"
+        "<p>Header\n#{input}\n<p>Footer"
       end
     end
-    assert_html '<p>Header</p><p>Test</p><p>Footer</p>', source, :chain => chain
+    assert_html '<p>Header</p> <p>Test</p> <p>Footer</p>', source, :chain => chain
   end
   def test_after

data/test/slim/test_code_evaluation.rb CHANGED

@@ -11,7 +11,7 @@ class TestSlimCodeEvaluation < TestSlim
   def test_render_with_call_to_set_custom_attributes
     source = %q{
-<p data-id="#{id_helper}" data-class>="hello world"
+<p data-id="#{id_helper}" data-class="hello world">
   = hello_world
 }
@@ -100,7 +100,7 @@ class TestSlimCodeEvaluation < TestSlim
   def test_bypassing_escape_in_attribute
     source = %q{
-<form action==#{action_path(:page, :save)} method='post'>
+<form action=#{{action_path(:page, :save)}} method='post'>
 }
     assert_html '<form action="/action-page-save" method="post"></form>', source
@@ -119,7 +119,7 @@ class TestSlimCodeEvaluation < TestSlim
 <p id=#{hash[:a]}> Test it
 }
-    assert_html '<p id="The letter a">Test it</p>', source
+    assert_html '<p id="The letter a"> Test it</p>', source
   end
   def test_hash_call_in_attribute_with_ruby_evaluation
@@ -135,7 +135,7 @@ class TestSlimCodeEvaluation < TestSlim
 <p id=#{hash[:a] + hash[:a]}> Test it
 }
-    assert_html '<p id="The letter aThe letter a">Test it</p>', source
+    assert_html '<p id="The letter aThe letter a"> Test it</p>', source
   end
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_2
@@ -143,7 +143,7 @@ class TestSlimCodeEvaluation < TestSlim
 <p id=#{hash[:a] + hash[:a]}> Test it
 }
-    assert_html '<p id="The letter aThe letter a">Test it</p>', source
+    assert_html '<p id="The letter aThe letter a"> Test it</p>', source
   end
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_3
@@ -205,7 +205,7 @@ class TestSlimCodeEvaluation < TestSlim
     source = %{
 <.alpha class="beta" class=nil class="gamma">Test it
 }
-    assert_html '<div class="alpha beta gamma">Test it</div>', source
+    assert_html '<div class="alpha beta nil gamma">Test it</div>', source
   end
   def test_id_attribute_merging
@@ -224,7 +224,7 @@ class TestSlimCodeEvaluation < TestSlim
   def test_boolean_attribute_false
     source = %{
-<option selected=false>Text
+<option selected=>Text
 }
     assert_html '<option>Text</option>', source
@@ -232,7 +232,7 @@ class TestSlimCodeEvaluation < TestSlim
   def test_boolean_attribute_true
     source = %{
-<option selected=true>Text
+<option selected=selected>Text
 }
     assert_html '<option selected="selected">Text</option>', source
@@ -240,7 +240,7 @@ class TestSlimCodeEvaluation < TestSlim
   def test_boolean_attribute_dynamic
     source = %{
-<option selected=#{method_which_returns_true}>Text
+<option selected=selected>Text
 }
     assert_html '<option selected="selected">Text</option>', source
@@ -268,11 +268,11 @@ class TestSlimCodeEvaluation < TestSlim
 <option selected class="clazz">Text
 }
-    assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
+    assert_html '<option class="clazz" selected="selected">Text</option> <option class="clazz" selected="selected">Text</option>', source
   end
   def test_array_attribute
-    source = %{
+    source = %q{
 <.alpha class="beta" class=#{[:gamma, nil, :delta, [true, false]]}
 }

data/test/slim/test_code_output.rb CHANGED

@@ -89,7 +89,7 @@ p==' hello_world
   = hello_world
 }
-    assert_html '<h1>This is my title</h1><p>Hello World from @env</p>', source
+    assert_html '<h1>This is my title</h1> <p>Hello World from @env</p>', source
   end
   def test_render_with_attribute_starts_with_keyword
@@ -114,7 +114,7 @@ p==' hello_world
 <p>=hello_world
 }
-    assert_html '<p>Hello World from @env</p><p>Hello World from @env</p>', source
+    assert_html '<p>Hello World from @env</p> <p>Hello World from @env</p>', source
   end
   def test_class_output_without_space
@@ -123,7 +123,7 @@ p==' hello_world
 <#test>==hello_world
 }
-    assert_html '<div class="test">Hello World from @env</div><div id="test">Hello World from @env</div>', source
+    assert_html '<div class="test">Hello World from @env</div> <div id="test">Hello World from @env</div>', source
   end
   def test_attribute_output_without_space
@@ -132,7 +132,7 @@ p==' hello_world
 <p id="test">==hello_world
 }
-    assert_html '<p id="test">Hello World from @env</p><p id="test">Hello World from @env</p>', source
+    assert_html '<p id="test">Hello World from @env</p> <p id="test">Hello World from @env</p>', source
   end
   def test_render_with_backslash_end

data/test/slim/test_code_structure.rb CHANGED

@@ -22,7 +22,7 @@ class TestSlimCodeStructure < TestSlim
       <p>The second paragraph
 }
-    assert_html "<div><p>The first paragraph</p>\n<p>The second paragraph</p></div>", source
+    assert_html "<div><p>The first paragraph</p> <p>The second paragraph</p></div>", source
   end
   def test_render_with_parameterized_conditional
@@ -45,7 +45,7 @@ class TestSlimCodeStructure < TestSlim
   = var
 }
-    assert_html "<div><p>The first paragraph</p>\n42</div>", source
+    assert_html "<div><p>The first paragraph</p>42</div>", source
   end
   def test_render_with_inline_condition
@@ -78,7 +78,7 @@ class TestSlimCodeStructure < TestSlim
 <p>World
 }
-    assert_html "<p>Hello</p>\n<p>World</p>", source
+    assert_html "<p>Hello</p> <p>World</p>", source
   end
   def test_render_with_yield

data/test/slim/test_html_escaping.rb CHANGED

@@ -16,7 +16,7 @@ class TestSlimHtmlEscaping < TestSlim
   > meet "Slim".
 }
-    assert_html "<p><Hello> World,\n meet \"Slim\".</p>", source
+    assert_html "<p><Hello> World, meet \"Slim\".</p>", source
   end
   def test_html_with_escaped_interpolation
@@ -32,7 +32,7 @@ class TestSlimHtmlEscaping < TestSlim
   def test_html_nested_escaping
     source = %q{
 = hello_world do
-  | escaped &
+  escaped &
 }
     assert_html 'Hello World from @env escaped &amp; Hello World from @env', source
   end

data/test/slim/test_html_structure.rb CHANGED

@@ -11,7 +11,7 @@ class TestSlimHtmlStructure < TestSlim
     <p>Hello World, meet Slim.
 }
-    assert_html "<html><head><title>Simple Test Title</title></head>\n<body><p>Hello World, meet Slim.</p></body></html>", source
+    assert_html "<html><head><title>Simple Test Title</title></head> <body><p>Hello World, meet Slim.</p></body></html>", source
   end
   def test_html_tag_with_text_and_empty_line
@@ -22,7 +22,7 @@ class TestSlimHtmlStructure < TestSlim
 <p>World
 }
-    assert_html "<p>Hello</p>\n<p>World</p>", source
+    assert_html "<p>Hello</p> <p>World</p>", source
   end
   def test_html_namespaces
@@ -68,7 +68,7 @@ class TestSlimHtmlStructure < TestSlim
   = hello_world
 }
-    assert_html %Q{<h1 id="title">This is my title</h1>\n<div class="hello world" id="notice">Hello World from @env</div>}, source
+    assert_html %Q{<h1 id="title">This is my title</h1> <div class="hello world" id="notice">Hello World from @env</div>}, source
   end
   def test_render_with_overwritten_default_tag
@@ -96,7 +96,7 @@ class TestSlimHtmlStructure < TestSlim
 <p>Some more markup
 }
-    assert_html "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>\n<p>Some more markup</p>", source
+    assert_html "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p> <p>Some more markup</p>", source
   end
   def test_render_with_text_block_with_trailing_whitespace
@@ -107,7 +107,7 @@ class TestSlimHtmlStructure < TestSlim
    <a href="link">page
 }
-    assert_html "<p>this is  a link to\n<a href=\"link\">page</a></p>", source
+    assert_html "<p>this is  a link to <a href=\"link\">page</a></p>", source
   end
   def test_nested_text
@@ -120,7 +120,7 @@ class TestSlimHtmlStructure < TestSlim
 <p>This is a new paragraph.
 }
-    assert_html "<p>This is line one. This is line two.  This is line three.   This is line four.</p>\n<p>This is a new paragraph.</p>", source
+    assert_html "<p>This is line one. This is line two.  This is line three.   This is line four.</p> <p>This is a new paragraph.</p>", source
   end
   def test_nested_text_with_nested_html_one_same_line
@@ -132,7 +132,7 @@ class TestSlimHtmlStructure < TestSlim
  > This is more content.
 }
-    assert_html "<p>This is line one. This is line two.\n<span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>", source
+    assert_html "<p>This is line one. This is line two. <span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>", source
   end
   def test_nested_text_with_nested_html_one_same_line2
@@ -144,7 +144,7 @@ class TestSlimHtmlStructure < TestSlim
  >  This is more content.
 }
-    assert_html "<p>This is line one. This is line two.\n<span class=\"bold\">This is a bold line in the paragraph.</span>  This is more content.</p>", source
+    assert_html "<p>This is line one. This is line two. <span class=\"bold\">This is a bold line in the paragraph.</span>  This is more content.</p>", source
   end
   def test_nested_text_with_nested_html
@@ -157,7 +157,7 @@ class TestSlimHtmlStructure < TestSlim
   > This is more content.
 }
-    assert_html "<p>This is line one. This is line two.  This is line three.   This is line four.\n<span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>", source
+    assert_html "<p>This is line one. This is line two.  This is line three.   This is line four. <span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>", source
   end
   def test_simple_paragraph_with_padding
@@ -192,7 +192,7 @@ class TestSlimHtmlStructure < TestSlim
                           This is line two.
 }
-    assert_html "<p class=\"paragraph\" id=\"test\">This is line one.\nThis is line two.</p>", source
+    assert_html "<p class=\"paragraph\" id=\"test\">This is line one. This is line two.</p>", source
   end
   def test_output_code_with_leading_spaces
@@ -202,7 +202,7 @@ class TestSlimHtmlStructure < TestSlim
 <p>    =hello_world
 }
-    assert_html "<p>Hello World from @env</p>\n<p> = hello_world</p>\n<p>    =hello_world</p>", source
+    assert_html "<p>Hello World from @env</p> <p> = hello_world</p> <p>    =hello_world</p>", source
   end
   def test_single_quoted_attributes
@@ -333,7 +333,7 @@ class TestSlimHtmlStructure < TestSlim
 <p>World
 }
-    assert_html "<p>Hello</p>\n<!--This is a comment\n\nAnother comment--><p>World</p>", source
+    assert_html "<p>Hello</p> <!--This is a comment\n\nAnother comment--><p>World</p>", source
   end
   def test_render_with_html_conditional_and_tag

data/test/slim/test_parser_errors.rb CHANGED

@@ -1,22 +1,24 @@
 require 'helper'
 class TestParserErrors < TestSlim
+=begin
   def test_correct_filename
     source = %q{
-<doctype 5
-  div Invalid
+<doctype 5>
+  <div>Invalid
 }
-    assert_syntax_error "Unexpected indentation\n  test.slim, Line 3\n    div Invalid\n    ^\n", source, :file => 'test.slim'
+    assert_syntax_error "Unexpected indentation\n  test.slim, Line 3\n   <div> Invalid\n    ^\n", source, :file => 'test.slim'
   end
+=end
   def test_unexpected_indentation
     source = %q{
-<doctype 5
-  div Invalid
+<doctype 5>
+  <div>Invalid
 }
-    assert_syntax_error "Unexpected indentation\n  (__TEMPLATE__), Line 3\n    div Invalid\n    ^\n", source
+    assert_syntax_error "Unexpected indentation\n  (__TEMPLATE__), Line 3\n    <div>Invalid\n    ^\n", source
   end
   def test_unexpected_text_indentation
@@ -26,29 +28,29 @@ class TestParserErrors < TestSlim
   text
 }
-    assert_syntax_error "Unexpected text indentation\n  (__TEMPLATE__), Line 4\n    text\n    ^\n", source
+    assert_syntax_error "Malformed indentation\n  (__TEMPLATE__), Line 4\n    text\n    ^\n", source
   end
   def test_malformed_indentation
     source = %q{
 <p
-  <div Valid
- <div Invalid
+  <div>Valid
+ <div>Invalid
 }
-    assert_syntax_error "Malformed indentation\n  (__TEMPLATE__), Line 4\n    div Invalid\n    ^\n", source
+    assert_syntax_error "Malformed indentation\n  (__TEMPLATE__), Line 4\n    <div>Invalid\n    ^\n", source
   end
   def test_unknown_line_indicator
     source = %q{
 <p
-  <div Valid
-  <.valid
-  <#valid
-  <?invalid
+  <div>Valid
+  <.valid>
+  <#valid>
+  <?invalid>
 }
-    assert_syntax_error "Unknown line indicator\n  (__TEMPLATE__), Line 6\n    <?invalid\n    ^\n", source
+    assert_syntax_error "Unknown line indicator\n  (__TEMPLATE__), Line 6\n    <?invalid>\n    ^\n", source
   end
 =begin
@@ -65,7 +67,7 @@ class TestParserErrors < TestSlim
   def test_expected_closing_attribute_delimiter
     source = %q!
 <p
-  <img src=#{hash[1] + hash[2]}
+  <img src=#{hash[1] + hash[2]
 !
     assert_syntax_error "Expected closing attribute delimiter ]\n  (__TEMPLATE__), Line 3\n    img src=[hash[1] + hash[2]\n                              ^\n", source
@@ -73,11 +75,11 @@ class TestParserErrors < TestSlim
   def test_expected_attribute
     source = %q{
-<p
+<p>
   <img src='img.png' whatsthis?!>
 }
-    assert_syntax_error "Expected attribute\n  (__TEMPLATE__), Line 3\n    img(src='img.png' whatsthis?!)\n                      ^\n", source
+    assert_syntax_error "Expected attribute\n  (__TEMPLATE__), Line 3\n    <img src='img.png' whatsthis?!>\n                                ^\n", source
   end
   def test_invalid_empty_attribute
@@ -86,7 +88,7 @@ class TestParserErrors < TestSlim
   <img src= >
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src= }\n            ^\n", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    <img src= >\n             ^\n", source
   end
   def test_invalid_empty_attribute2
@@ -95,7 +97,7 @@ class TestParserErrors < TestSlim
   <img src=>
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src=}\n            ^\n", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    <img src=>\n             ^\n", source
   end
   def test_invalid_empty_attribute3
@@ -104,6 +106,6 @@ class TestParserErrors < TestSlim
   <img src=
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img src=\n            ^\n", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    <img src=\n             ^\n", source
   end
 end

data/test/slim/test_ruby_errors.rb CHANGED

@@ -72,15 +72,15 @@ data2-=1>
 = unknown_ruby_method
 }
-    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
   end
   def test_text_block2
     source = %q{
-> Text line 1
-> Text line 2
-= unknown_ruby_method
+<p>
+  > Text line 1
+  > Text line 2
+   = unknown_ruby_method
 }
     assert_ruby_error NameError,"(__TEMPLATE__):5", source

data/test/slim/test_sections.rb CHANGED

@@ -61,7 +61,7 @@ class TestSlimLogicLess < TestSlim
       ]
     }
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div>shown</p>', source, :scope => hash, :sections => true
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div> shown</p>', source, :scope => hash, :sections => true
   end
   def test_inverted_section
@@ -77,7 +77,7 @@ class TestSlimLogicLess < TestSlim
     hash = {}
-    assert_html '<p>No person No person 2</p>', source, :scope => hash, :sections => true
+    assert_html '<p> No person No person 2</p>', source, :scope => hash, :sections => true
   end
   def test_output_with_content

data/test/slim/test_slim_template.rb CHANGED

@@ -84,13 +84,13 @@ class TestSlimTemplate < TestSlim
   def test_backtrace_file_and_line_reporting_without_locals
     data = load_file_data
-    template = Hamlet::Template.new('test.slim', 10) { data }
+    template = Hamlet::Template.new('test.hamlet', 10) { data }
     begin
       template.render(Scope.new)
       fail 'should have raised an exception'
     rescue => ex
       assert_kind_of NameError, ex
-      assert_backtrace(ex, 'test.slim:12')
+      assert_backtrace(ex, 'test.hamlet:12')
     end
   end
@@ -102,12 +102,12 @@ class TestSlimTemplate < TestSlim
   def test_backtrace_file_and_line_reporting_with_locals
     data = load_file_data
-    template = Hamlet::Template.new('test.slim') { data }
+    template = Hamlet::Template.new('test.hamlet') { data }
     begin
       res = template.render(Scope.new, :name => 'Joe', :foo => 'bar')
     rescue => ex
       assert_kind_of MockError, ex
-      assert_backtrace(ex, 'test.slim:5')
+      assert_backtrace(ex, 'test.hamlet:5')
     end
   end
 end

data/test/slim/test_text_interpolation.rb CHANGED

@@ -26,7 +26,7 @@ class TestSlimTextInterpolation < TestSlim
  >A message from the compiler: #{hello_world}
 }
-    assert_html "<p>Hello World from @env with \"quotes\"</p>\n<p>A message from the compiler: Hello World from @env</p>", source
+    assert_html "<p>Hello World from @env with \"quotes\"</p> <p>A message from the compiler: Hello World from @env</p>", source
   end
   def test_interpolation_in_tag

data/test/slim/test_wrapper.rb CHANGED

@@ -26,7 +26,7 @@ class TestSlimWrapper < TestSlim
   <li>= name
   <li>= city
 }
-    assert_html '<ul><li>Andy</li><li>Atlanta</li><li>Fred</li><li>Melbourne</li><li>Daniel</li><li>Karlsruhe</li></ul>', source, :sections => true
+    assert_html '<ul><li>Andy</li> <li>Atlanta</li><li>Fred</li> <li>Melbourne</li><li>Daniel</li> <li>Karlsruhe</li></ul>', source, :sections => true
   end
   def test_method

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlet
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000 Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &3510300 !ruby/object:Gem::Requirement
+  requirement: &23503320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3510300
+  version_requirements: *23503320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3485740 !ruby/object:Gem::Requirement
+  requirement: &23502680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *3485740
+  version_requirements: *23502680
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &3484820 !ruby/object:Gem::Requirement
+  requirement: &23502160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *3484820
+  version_requirements: *23502160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &3483240 !ruby/object:Gem::Requirement
+  requirement: &23501620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3483240
+  version_requirements: *23501620
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &3481080 !ruby/object:Gem::Requirement
+  requirement: &23501080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3481080
+  version_requirements: *23501080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3480000 !ruby/object:Gem::Requirement
+  requirement: &23500440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3480000
+  version_requirements: *23500440
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &3441840 !ruby/object:Gem::Requirement
+  requirement: &23499840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3441840
+  version_requirements: *23499840
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &3440200 !ruby/object:Gem::Requirement
+  requirement: &23493700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3440200
+  version_requirements: *23493700
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &3439100 !ruby/object:Gem::Requirement
+  requirement: &23492760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3439100
+  version_requirements: *23492760
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &3437320 !ruby/object:Gem::Requirement
+  requirement: &23491740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3437320
+  version_requirements: *23491740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &3434540 !ruby/object:Gem::Requirement
+  requirement: &23490860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3434540
+  version_requirements: *23490860
 description: Hamlet is a template language whose goal is reduce HTML syntax to the
   essential parts.
 email: