hamlet 0.2 → 0.2.1

data/hamlet.gemspec

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

data/lib/hamlet/forked_slim_parser.rb

@@ -189,6 +189,12 @@ module ForkedSlim
           # Slim comment
           parse_comment_block
         end
+      when /\A([\|'])( ?)(.*)\Z/
+        # Found a text block.
+        trailing_ws = $1 == "'"
+        @stacks.last << [:slim, :interpolate, $3] unless $3.empty?
+        parse_text_block($3.empty? ? nil : @indents.last + $2.size + 1)
+        @stacks.last << [:static, ' '] if trailing_ws
       when /\A-/
         # Found a code block.
         # We expect the line to be broken or the next line to be indented.
@@ -205,7 +211,7 @@ module ForkedSlim
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] unless $2.empty?
         @stacks << block
-      when /\A<(\w+):\s*\Z/
+      when /\A(\w+):\s*\Z/
         # Embedded template detected. It is treated as block.
         block = [:multi]
         @stacks.last << [:newline] << [:slim, :embedded, $1, block]
@@ -215,15 +221,9 @@ module ForkedSlim
       when /\Adoctype\s+/i
         # Found doctype declaration
         @stacks.last << [:html, :doctype, $'.strip]
-      when /\A<([#\.]|\w[:\w-]*)/
+      when /\A([#\.]|\w[:\w-]*)/
         # Found a HTML tag.
-        parse_tag($1)
-      when /\A(> *)?(.*)?\Z/
-        # Found a text block.
-        trailing_ws = !$1
-        @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
-        parse_text_block($2.empty? ? nil : @indents.last + $1.to_s.size)
-        @stacks.last << [:static, ' '] if trailing_ws
+        parse_tag($&)
       else
         syntax_error! 'Unknown line indicator'
       end
@@ -282,7 +282,6 @@ module ForkedSlim
     end
 
     def parse_tag(tag)
-      @line.slice!(0,1) # get rid of leading '<'
       if tag == '#' || tag == '.'
         tag = options[:default_tag]
       else
@@ -293,7 +292,7 @@ module ForkedSlim
       @stacks.last << tag
 
       case @line
-      when /\A\s*>?=(=?)('?)/
+      when /\A\s*=(=?)('?)/
         # Handle output code
         block = [:multi]
         @line = $'
@@ -303,12 +302,12 @@ module ForkedSlim
         @stacks << block
       when /\A\s*\//
         # Closed tag. Do nothing
-      when /\A\s*>?\s*\Z/
+      when /\A\s*\Z/
         # Empty content
         content = [:multi]
         tag << content
         @stacks << content
-      when /\A( ?)>?(.*)\Z/
+      when /\A( ?)(.*)\Z/
         # Text content
         content = [:multi, [:slim, :interpolate, $2]]
         tag << content
@@ -381,6 +380,7 @@ module ForkedSlim
       attributes
     end
 
+=begin
     def parse_ruby_attribute(outer_delimiter)
       value, count, delimiter, close_delimiter = '', 0, nil, nil
 
@@ -411,6 +411,7 @@ module ForkedSlim
 
       value
     end
+=end
 
     def parse_quoted_attribute(quote)
       value, count = '', 0

data/lib/hamlet/parser.rb

@@ -54,25 +54,16 @@ module Hamlet
       when /\A<([#\.]|\w[:\w-]*)/
         # Found a HTML tag.
         parse_tag($1)
-      when /\A(> *)?(.*)?\Z/
+      when /\A(?:>( *))?(.*)?\Z/
         # Found a text block.
-        trailing_ws = !$1
-        @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
+        @stacks.last << [:slim, :interpolate, $1 ? $1 << $2 : $2] unless $2.empty?
         parse_text_block($2.empty? ? nil : @indents.last + $1.to_s.size)
-        @stacks.last << [:static, ' '] if trailing_ws
       else
         syntax_error! 'Unknown line indicator'
       end
       @stacks.last << [:newline]
     end
 
-    def parse_comment_block
-      while !@lines.empty? && (@lines.first =~ /\A\s*\Z/ || get_indent(@lines.first) > @indents.last)
-        next_line
-        @stacks.last << [:newline]
-      end
-    end
-
     def parse_text_block(text_indent = nil)
       empty_lines = 0
       until @lines.empty?
@@ -143,5 +134,68 @@ module Hamlet
         parse_text_block(@orig_line.size - @line.size + $1.size)
       end
     end
+
+    def parse_attributes
+      attributes = [:html, :attrs]
+
+      # Find any literal class/id attributes
+      while @line =~ CLASS_ID_REGEX
+        # The class/id attribute is :static instead of :slim :text,
+        # because we don't want text interpolation in .class or #id shortcut
+        attributes << [:html, :attr, ATTR_SHORTCUT[$1], [:static, $2]]
+        @line = $'
+      end
+
+      # Check to see if there is a delimiter right after the tag name
+      delimiter = nil
+      if @line =~ DELIMITER_REGEX
+        delimiter = DELIMITERS[$&]
+        @line.slice!(0)
+      end
+
+      orig_line = @orig_line
+      lineno = @lineno
+      while true
+        # Parse attributes
+        attr_regex = delimiter ? /#{ATTR_NAME_REGEX}(=|\s|(?=#{Regexp.escape delimiter}))/ : /#{ATTR_NAME_REGEX}=/
+        while @line =~ attr_regex
+          @line = $'
+          name = $1
+          if delimiter && $2 != '='
+            attributes << [:slim, :attr, name, false, 'true']
+          elsif @line =~ /\A["']/
+            # Value is quoted (static)
+            @line = $'
+            attributes << [:html, :attr, name, [:slim, :interpolate, parse_quoted_attribute($&)]]
+          else
+            @line =~ /[^ >]+/
+            @line = $'
+            attributes << [:html, :attr, name, [:slim, :interpolate, $&]]
+          end
+        end
+
+        # No ending delimiter, attribute end
+        break unless delimiter
+
+        # Find ending delimiter
+        if @line =~ /\A\s*#{Regexp.escape delimiter}/
+          @line = $'
+          break
+        end
+
+        # Found something where an attribute should be
+        @line.lstrip!
+        syntax_error!('Expected attribute') unless @line.empty?
+
+        # Attributes span multiple lines
+        @stacks.last << [:newline]
+        next_line || syntax_error!("Expected closing delimiter #{delimiter}",
+                                   :orig_line => orig_line,
+                                   :lineno => lineno,
+                                   :column => orig_line.size)
+      end
+
+      attributes
+    end
   end
 end

data/test/slim/test_html_structure.rb

@@ -4,11 +4,11 @@ class TestSlimHtmlStructure < TestSlim
   def test_simple_render
     # Keep the trailing space behind "body "!
     source = %q{
-html
-  head
-    title Simple Test Title
-  body 
-    p Hello World, meet Slim.
+<html
+  <head
+    <title Simple Test Title
+  <body 
+    <p Hello World, meet Slim.
 }
 
     assert_html '<html><head><title>Simple Test Title</title></head><body><p>Hello World, meet Slim.</p></body></html>', source
@@ -17,9 +17,9 @@ html
   def test_html_tag_with_text_and_empty_line
     # Keep the trailing space behind "body "!
     source = %q{
-p Hello
+<p Hello
 
-p World
+<p World
 }
 
     assert_html "<p>Hello</p><p>World</p>", source
@@ -27,7 +27,7 @@ p World
 
   def test_html_namespaces
     source = %q{
-html:body
+<html:body
   html:p html:id="test" Text
 }
 
@@ -37,7 +37,7 @@ html:body
   def test_doctype
     source = %q{
 doctype 1.1
-html
+<html
 }
 
     assert_html '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html></html>', source, :format => :xhtml
@@ -46,7 +46,7 @@ html
   def test_doctype_new_syntax
     source = %q{
 doctype 5
-html
+<html
 }
 
     assert_html '<!DOCTYPE html><html></html>', source, :format => :xhtml
@@ -55,7 +55,7 @@ html
   def test_doctype_new_syntax_html5
     source = %q{
 doctype html
-html
+<html
 }
 
     assert_html '<!DOCTYPE html><html></html>', source, :format => :xhtml
@@ -63,8 +63,8 @@ html
 
   def test_render_with_shortcut_attributes
     source = %q{
-h1#title This is my title
-#notice.hello.world
+<h1#title This is my title
+<#notice.hello.world
   = hello_world
 }
 
@@ -73,7 +73,7 @@ h1#title This is my title
 
   def test_render_with_overwritten_default_tag
     source = %q{
-#notice.hello.world
+<section #notice.hello.world
   = hello_world
 }
 
@@ -82,8 +82,7 @@ h1#title This is my title
 
   def test_render_with_text_block
     source = %q{
-p
-  |
+<p
    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 }
 
@@ -92,10 +91,9 @@ p
 
   def test_render_with_text_block_with_subsequent_markup
     source = %q{
-p
-  |
+<p
     Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-p Some more markup
+<p Some more markup
 }
 
     assert_html '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p><p>Some more markup</p>', source
@@ -105,7 +103,7 @@ p Some more markup
     source = %q{
 ' this is
   a link to
-a href="link" page
+<a href="link" page
 }
 
     assert_html "this is\na link to <a href=\"link\">page</a>", source
@@ -113,13 +111,12 @@ a href="link" page
 
   def test_nested_text
     source = %q{
-p
- |
+<p
   This is line one.
    This is line two.
     This is line three.
      This is line four.
-p This is a new paragraph.
+<p This is a new paragraph.
 }
 
     assert_html "<p>This is line one.\n This is line two.\n  This is line three.\n   This is line four.</p><p>This is a new paragraph.</p>", source
@@ -127,11 +124,11 @@ p This is a new paragraph.
 
   def test_nested_text_with_nested_html_one_same_line
     source = %q{
-p
- | This is line one.
-    This is line two.
+<p
+ This is line one.
+  > This is line two.
  span.bold This is a bold line in the paragraph.
- |  This is more content.
+ > This is more content.
 }
 
     assert_html "<p>This is line one.\n This is line two.<span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>", source
@@ -139,7 +136,7 @@ p
 
   def test_nested_text_with_nested_html_one_same_line2
     source = %q{
-p
+<p
  |This is line one.
    This is line two.
  span.bold This is a bold line in the paragraph.
@@ -151,7 +148,7 @@ p
 
   def test_nested_text_with_nested_html
     source = %q{
-p
+<p
  |
   This is line one.
    This is line two.
@@ -166,7 +163,7 @@ p
 
   def test_simple_paragraph_with_padding
     source = %q{
-p    There will be 3 spaces in front of this line.
+<p    There will be 3 spaces in front of this line.
 }
 
     assert_html '<p>   There will be 3 spaces in front of this line.</p>', source
@@ -174,7 +171,7 @@ p    There will be 3 spaces in front of this line.
 
   def test_paragraph_with_nested_text
     source = %q{
-p This is line one.
+<p This is line one.
    This is line two.
 }
 
@@ -183,7 +180,7 @@ p This is line one.
 
   def test_paragraph_with_padded_nested_text
     source = %q{
-p  This is line one.
+<p  This is line one.
    This is line two.
 }
 
@@ -192,7 +189,7 @@ p  This is line one.
 
   def test_paragraph_with_attributes_and_nested_text
     source = %q{
-p#test class="paragraph" This is line one.
+<p#test class="paragraph">This is line one.
                          This is line two.
 }
 
@@ -201,9 +198,9 @@ p#test class="paragraph" This is line one.
 
   def test_output_code_with_leading_spaces
     source = %q{
-p= hello_world
-p = hello_world
-p    = hello_world
+<p= hello_world
+<p = hello_world
+<p    = hello_world
 }
 
     assert_html '<p>Hello World from @env</p><p>Hello World from @env</p><p>Hello World from @env</p>', source
@@ -211,7 +208,7 @@ p    = hello_world
 
   def test_single_quoted_attributes
     source = %q{
-p class='underscored_class_name' = output_number
+<p class='underscored_class_name'>= output_number
 }
 
     assert_html '<p class="underscored_class_name">1337</p>', source
@@ -219,7 +216,7 @@ p class='underscored_class_name' = output_number
 
   def test_nonstandard_attributes
     source = %q{
-p id="dashed-id" class="underscored_class_name" = output_number
+<p id="dashed-id" class="underscored_class_name">= output_number
 }
 
     assert_html '<p class="underscored_class_name" id="dashed-id">1337</p>', source
@@ -227,7 +224,7 @@ p id="dashed-id" class="underscored_class_name" = output_number
 
   def test_nonstandard_shortcut_attributes
     source = %q{
-p#dashed-id.underscored_class_name = output_number
+<p#dashed-id.underscored_class_name>= output_number
 }
 
     assert_html '<p class="underscored_class_name" id="dashed-id">1337</p>', source
@@ -235,7 +232,7 @@ p#dashed-id.underscored_class_name = output_number
 
   def test_dashed_attributes
     source = %q{
-p data-info="Illudium Q-36" = output_number
+<p data-info="Illudium Q-36">= output_number
 }
 
     assert_html '<p data-info="Illudium Q-36">1337</p>', source
@@ -243,7 +240,7 @@ p data-info="Illudium Q-36" = output_number
 
   def test_dashed_attributes_with_shortcuts
     source = %q{
-p#marvin.martian data-info="Illudium Q-36" = output_number
+<p#marvin.martian data-info="Illudium Q-36">= output_number
 }
 
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
@@ -251,15 +248,15 @@ p#marvin.martian data-info="Illudium Q-36" = output_number
 
   def test_parens_around_attributes
     source = %q{
-p(id="marvin" class="martian" data-info="Illudium Q-36") = output_number
+<p id="marvin" class="martian" data-info="Illudium Q-36"> = output_number
 }
 
-    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin"> = output_number</p>', source
   end
 
   def test_square_brackets_around_attributes
     source = %q{
-p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
+<p id="marvin" class="martian" data-info="Illudium Q-36"> = output_number
 }
 
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
@@ -267,7 +264,7 @@ p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
 
   def test_parens_around_attributes_with_equal_sign_snug_to_right_paren
     source = %q{
-p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number
+<p id="marvin" class="martian" data-info="Illudium Q-36">= output_number
 }
 
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
@@ -275,7 +272,7 @@ p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number
 
   def test_static_empty_attribute
     source = %q{
-p(id="marvin" class="" data-info="Illudium Q-36")= output_number
+<p id="marvin" class="" data-info="Illudium Q-36">= output_number
 }
 
     assert_html '<p class="" data-info="Illudium Q-36" id="marvin">1337</p>', source
@@ -283,7 +280,7 @@ p(id="marvin" class="" data-info="Illudium Q-36")= output_number
 
   def test_dynamic_empty_attribute
     source = %q{
-p(id="marvin" class=nil other_empty=("".to_s) data-info="Illudium Q-36")= output_number
+<p id="marvin" class=nil other_empty=#{"".to_s} data-info="Illudium Q-36">= output_number
 }
 
     assert_html '<p data-info="Illudium Q-36" id="marvin">1337</p>', source
@@ -291,24 +288,24 @@ p(id="marvin" class=nil other_empty=("".to_s) data-info="Illudium Q-36")= output
 
   def test_closed_tag
     source = %q{
-closed/
+<closed/
 }
 
     assert_html '<closed />', source, :format => :xhtml
   end
 
   def test_attributs_with_parens_and_spaces
-    source = %q{label{ for='filter' }= hello_world}
+    source = %q{<label for=filter>= hello_world}
     assert_html '<label for="filter">Hello World from @env</label>', source
   end
 
   def test_attributs_with_parens_and_spaces2
-    source = %q{label{ for='filter' } = hello_world}
+    source = %q{<label for=filter>= hello_world}
     assert_html '<label for="filter">Hello World from @env</label>', source
   end
 
   def test_attributs_with_multiple_spaces
-    source = %q{label  for='filter'  class="test" = hello_world}
+    source = %q{<label for=filter class="test">= hello_world}
     assert_html '<label class="test" for="filter">Hello World from @env</label>', source
   end
 
@@ -322,7 +319,7 @@ closed id="test" /
 
   def test_closed_tag_with_attributes_and_parens
     source = %q{
-closed(id="test")/
+<closed id="test">/
 }
 
     assert_html '<closed id="test" />', source, :format => :xhtml
@@ -330,11 +327,11 @@ closed(id="test")/
 
   def test_render_with_html_comments
     source = %q{
-p Hello
+<p Hello
 /! This is a comment
 
    Another comment
-p World
+<p World
 }
 
     assert_html "<p>Hello</p><!--This is a comment\n\nAnother comment--><p>World</p>", source
@@ -358,81 +355,65 @@ p World
     assert_html "<!--[if IE]>hello<![endif]-->", source
   end
 
+=begin
   def test_multiline_attributes_with_method
-    source = %q{
-p<id="marvin"
+    str = %q{
+<p id="marvin"
 class="martian"
  data-info="Illudium Q-36"> = output_number
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
-    end
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
   end
 
   def test_multiline_attributes_with_text_on_same_line
-    source = %q{
-p<id="marvin"
+    str = %q{
+<p id="marvin"
   class="martian"
  data-info="Illudium Q-36"> THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
-    end
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
   end
 
   def test_multiline_attributes_with_nested_text
-    source = %q{
-p<id="marvin"
+    str = %q{
+<p id="marvin"
   class="martian"
 data-info="Illudium Q-36">
-  | THE space modulator
+  THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
-    end
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
   end
 
   def test_multiline_attributes_with_dynamic_attr
     source = %q{
-p<id=id_helper
+<p id=id_helper
   class="martian"
   data-info="Illudium Q-36">
-  | THE space modulator
+  THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
-    end
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
   end
 
   def test_multiline_attributes_with_nested_tag
     source = %q{
-p<id=id_helper
+<p id=id_helper
   class="martian"
   data-info="Illudium Q-36">
   span.emphasis THE
-  |  space modulator
+  > space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
-    end
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', source
   end
 
   def test_multiline_attributes_with_nested_text_and_extra_indentation
     source = %q{
-li< id="myid"
+<li id="myid"
     class="myclass"
 data-info="myinfo">
-  a href="link" My Link
+  <a href="link" My Link
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
-      str = source.sub('<',k).sub('>',v)
-      assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
-    end
+    assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
   end
+=end
 
 end

data/test/slim/test_ruby_errors.rb

@@ -3,8 +3,8 @@ require 'helper'
 class TestSlimRubyErrors < TestSlim
   def test_multline_attribute
     source = %q{
-<p(data-1=1
-data2-=1)
+<p data-1=1
+data2-=1>
   <p
     = unknown_ruby_method
 }
@@ -150,7 +150,7 @@ data2-=1)
 
   def test_invalid_nested_output
     source = %q{
-p
+<p
   = "Hello Ruby!"
     = "Hello from within a block! "
 }
@@ -160,7 +160,7 @@ p
   def test_invalid_embedded_engine
     source = %q{
 <p
-  embed_unknown:
+  <embed_unknown:
     1+1
 }
 
@@ -180,7 +180,7 @@ p
 
   def test_id_attribute_merging2
     source = %{
-#alpha id="beta" Test it
+<#alpha id="beta" Test it
 }
     assert_runtime_error 'Multiple id attributes specified', source
   end

data/test/slim/test_sections.rb

@@ -11,9 +11,9 @@ class TestSlimLogicLess < TestSlim
 
   def test_sections
     source = %q{
-p
+<p
  - person
-  .name = name
+  <.name = name
 }
 
     hash = {
@@ -28,9 +28,9 @@ p
 
   def test_sections_string_access
     source = %q{
-p
+<p
  - person
-  .name = name
+  <.name = name
 }
 
     hash = {
@@ -45,12 +45,12 @@ p
 
   def test_flag_section
     source = %q{
-p
+<p
  - show_person
    - person
-    .name = name
+    <.name = name
  - show_person
-   | shown
+   shown
 }
 
     hash = {
@@ -66,13 +66,13 @@ p
 
   def test_inverted_section
     source = %q{
-p
+<p
  - person
-  .name = name
+  <.name = name
  -! person
-  | No person
+  No person
  - !person
-  |  No person 2
+  > No person 2
 }
 
     hash = {}
@@ -82,7 +82,7 @@ p
 
   def test_output_with_content
     source = %{
-p = method_with_block do
+<p = method_with_block do
   block
 }
     assert_runtime_error 'Output statements with content are forbidden in sections mode', source, :sections => true

data/test/slim/test_slim_template.rb

@@ -83,8 +83,7 @@ class TestSlimTemplate < TestSlim
   end
 
   def test_backtrace_file_and_line_reporting_without_locals
-    data = File.read(__FILE__).split("\n__END__\n").last
-    fail unless data[0] == ?h
+    data = load_file_data
     template = Hamlet::Template.new('test.slim', 10) { data }
     begin
       template.render(Scope.new)
@@ -95,9 +94,14 @@ class TestSlimTemplate < TestSlim
     end
   end
 
-  def test_backtrace_file_and_line_reporting_with_locals
+  def load_file_data
     data = File.read(__FILE__).split("\n__END__\n").last
-    fail unless data[0] == ?h
+    fail unless data[0] == ?<
+    data
+  end
+
+  def test_backtrace_file_and_line_reporting_with_locals
+    data = load_file_data
     template = Hamlet::Template.new('test.slim') { data }
     begin
       res = template.render(Scope.new, :name => 'Joe', :foo => 'bar')
@@ -109,8 +113,8 @@ class TestSlimTemplate < TestSlim
 end
 
 __END__
-html
-  body
+<html>
+  <body>
     <h1>= "Hey #{name}"
 
     = raise MockError

data/test/slim/test_text_interpolation.rb

@@ -20,7 +20,7 @@ class TestSlimTextInterpolation < TestSlim
   def test_interpolation_in_text
     source = %q{
 <p
- > #{hello_world} with "quotes"
+ #{hello_world} with "quotes"
 <p
 
  >A message from the compiler: #{hello_world}
@@ -55,7 +55,7 @@ class TestSlimTextInterpolation < TestSlim
 
   def test_interpolation_with_escaping
     source = %q{
-> #{evil_method}
+#{evil_method}
 }
 
     assert_html '&lt;script&gt;do_something_evil();&lt;&#47;script&gt;', source
@@ -63,7 +63,7 @@ class TestSlimTextInterpolation < TestSlim
 
   def test_interpolation_without_escaping
     source = %q{
-> #{{evil_method}}
+#{{evil_method}}
 }
 
     assert_html '<script>do_something_evil();</script>', source
@@ -71,7 +71,7 @@ class TestSlimTextInterpolation < TestSlim
 
   def test_interpolation_with_escaping_and_delimiter
     source = %q{
-> #{(evil_method)}
+#{(evil_method)}
 }
     assert_html '&lt;script&gt;do_something_evil();&lt;&#47;script&gt;', source
   end

data/test/slim/test_wrapper.rb

@@ -14,7 +14,7 @@ class TestSlimWrapper < TestSlim
     source = %q{
 <p
  - person
-  <.name = name
+  <.name>= name
 }
     assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :sections => true
   end
@@ -31,9 +31,9 @@ class TestSlimWrapper < TestSlim
 
   def test_method
     source = %q{
-<a href=output_number Link
+<a href=output_number>Link
 }
-    assert_html '<a href="1337">Link</a>', source, :sections => true
+    assert_html '<a href="output_number">Link</a>', source, :sections => true
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlet
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &3486700 !ruby/object:Gem::Requirement
+  requirement: &3779800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3486700
+  version_requirements: *3779800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3485880 !ruby/object:Gem::Requirement
+  requirement: &3778760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *3485880
+  version_requirements: *3778760
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &3484300 !ruby/object:Gem::Requirement
+  requirement: &3777880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *3484300
+  version_requirements: *3777880
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &3482000 !ruby/object:Gem::Requirement
+  requirement: &3777100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3482000
+  version_requirements: *3777100
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &3481000 !ruby/object:Gem::Requirement
+  requirement: &3776500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3481000
+  version_requirements: *3776500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3442840 !ruby/object:Gem::Requirement
+  requirement: &3775820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3442840
+  version_requirements: *3775820
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &3441240 !ruby/object:Gem::Requirement
+  requirement: &3775060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3441240
+  version_requirements: *3775060
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &3440020 !ruby/object:Gem::Requirement
+  requirement: &3774140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3440020
+  version_requirements: *3774140
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &3438600 !ruby/object:Gem::Requirement
+  requirement: &3773380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3438600
+  version_requirements: *3773380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &3435800 !ruby/object:Gem::Requirement
+  requirement: &3720320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3435800
+  version_requirements: *3720320
 description: Hamlet is a template language whose goal is reduce HTML syntax to the
   essential parts.
 email: