hamlet 0.3.0 → 0.4.0

data/README.md

@@ -60,3 +60,14 @@ I added the same syntax that hamlet.js uses to indicate whitespace: a closing br
 ## Limitations
 
 I just hacked this up the other day - let me know if there are any issues. After some more experience using Slim's syntax I plan on trying to reduce the total available syntax.
+
+## Development
+
+Run tests with
+
+    rake test
+
+or
+
+    ruby -r ./test/slim/helper.rb TEST
+

data/hamlet.gemspec

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

data/lib/hamlet/parser.rb

@@ -45,57 +45,128 @@ module Hamlet
     end
 
   private
+    def parse_line
+      if @line =~ /\A\s*\Z/
+        @stacks.last << [:newline]
+        return
+      end
+
+      indent = get_indent(@line)
+
+      # Remove the indentation
+      @line.lstrip!
+      indent +=1 if @line[0] == '>'
+
+      # If there's more stacks than indents, it means that the previous
+      # line is expecting this line to be indented.
+      expecting_indentation = @stacks.size > @indents.size
+
+      if indent > @indents.last
+        # This line was actually indented, so we'll have to check if it was
+        # supposed to be indented or not.
+        unless expecting_indentation
+          syntax_error!('Unexpected indentation')
+        end
+
+        @indents << indent
+      else
+        # This line was *not* indented more than the line before,
+        # so we'll just forget about the stack that the previous line pushed.
+        @stacks.pop if expecting_indentation
+
+        # This line was deindented.
+        # Now we're have to go through the all the indents and figure out
+        # how many levels we've deindented.
+        while indent < @indents.last
+          @indents.pop
+          @stacks.pop
+        end
+
+        # This line's indentation happens lie "between" two other line's
+        # indentation:
+        #
+        #   hello
+        #       world
+        #     this      # <- This should not be possible!
+        syntax_error!('Malformed indentation') if indent != @indents.last
+      end
+
+      parse_line_indicators
+    end
 
     def parse_line_indicators
-      case @line
-      when /\A-/ # code block.
+      if @needs_space
+        @stacks.last << [:slim, :interpolate, "\n" ]
+        @stacks.last << [:newline]
+      end
+      @needs_space = false
+      case @line[0]
+      when '-' # code block.
         block = [:multi]
         @line.slice!(0)
         @stacks.last << [:slim, :control, parse_broken_line, block]
         @stacks << block
-      when /\A=/ # output block.
+      when '=' # output block.
         @line =~ /\A=(=?)('?)/
         @line = $'
         block = [:multi]
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] unless $2.empty?
         @stacks << block
-      when /\A<(\w+):\s*\Z/ # Embedded template. It is treated as block.
-        block = [:multi]
-        @stacks.last << [:newline] << [:slim, :embedded, $1, block]
-        @stacks << block
-        parse_text_block(nil, true)
-        return # Don't append newline, this has already been done before
-      when /\A<([#\.]|\w[:\w-]*)/ # HTML tag.
-        parse_tag($1)
-      when /\A<!--( ?)(.*)\Z/ # HTML comment
-        block = [:multi]
-        @stacks.last <<  [:html, :comment, block]
-        @stacks << block
-        @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
-        parse_text_block($2.empty? ? nil : @indents.last + $1.size + 2)
-      when %r{\A#\[\s*(.*?)\s*\]\s*\Z} # HTML conditional comment
-        block = [:multi]
-        @stacks.last << [:slim, :condcomment, $1, block]
-        @stacks << block
-      when /\A(?:\s*>( *))?/ # text block.
-        @stacks.last << [:slim, :interpolate, $1 ? $1 << $' : $']
-        parse_text_block($'.empty? ? nil : @indents.last + $1.to_s.size)
+      when '<'
+        case @line
+        when /\A<(\w+):\s*\Z/ # Embedded template. It is treated as block.
+          block = [:multi]
+          @stacks.last << [:newline] << [:slim, :embedded, $1, block]
+          @stacks << block
+          parse_text_block(nil, :from_embedded)
+          return # Don't append newline, this has already been done before
+        when /\A<([#\.]|\w[:\w-]*)/ # HTML tag.
+          parse_tag($1)
+        when /\A<!--( ?)(.*)\Z/ # HTML comment
+          block = [:multi]
+          @stacks.last <<  [:html, :comment, block]
+          @stacks << block
+          @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
+          parse_text_block($2.empty? ? nil : @indents.last + $1.size + 2)
+        end
       else
-        syntax_error! 'Unknown line indicator'
+        if @line =~ %r!\A#\[\s*(.*?)\s*\]\s*\Z! # HTML conditional comment
+          block = [:multi]
+          @stacks.last << [:slim, :condcomment, $1, block]
+          @stacks << block
+        else
+          push_text
+        end
       end
       @stacks.last << [:newline]
     end
 
-    def parse_text_block(text_indent = nil, special = nil)
-      empty_lines = 0
-      multi_line = false
-      if special == :from_tag
-        multi_line = true
-        special = nil
+    def push_text
+      @needs_space = true
+      if @line[0] == '>'
+        @line.slice!(0)
+      end
+      if @line =~ /(\A|[^\\])#([^{]|\Z)/
+        @line = $` + $1
       end
+      @stacks.last << [:slim, :interpolate, @line]
+    end
 
+    # This is fundamentally broken
+    # Can keep this for multi-lie html comment perhaps
+    # But don't lookahead on text otherwise
+    def parse_text_block(text_indent = nil, from = nil)
+      empty_lines = 0
       first_line = true
+      embedded = nil
+      case from
+      when :from_tag
+        first_line = true
+      when :from_embedded
+        embedded = true
+      end
+
       close_bracket = false
       until @lines.empty?
         if @lines.first =~ /\A\s*>?\s*\Z/
@@ -135,7 +206,7 @@ module Hamlet
           if @line =~ /(\A|[^\\])#([^{]|\Z)/
             @line = $` + $1
           end
-          @stacks.last << [:newline] if multi_line && !special
+          @stacks.last << [:newline] if !first_line && !embedded
           @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + @line] << [:newline]
 
           # The indentation of first line of the text block
@@ -143,7 +214,6 @@ module Hamlet
           text_indent ||= indent
 
           first_line = false
-          multi_line = true
         end
       end
     end
@@ -161,6 +231,7 @@ module Hamlet
 
       case @line
       when /\A=(=?)('?)/ # Handle output code
+        @needs_space = true
         block = [:multi]
         @line = $'
         content = [:slim, :output, $1 != '=', parse_broken_line, block]
@@ -175,10 +246,10 @@ module Hamlet
       when %r!\A/>!
         # Do nothing for closing tag
       else # Text content
+        @needs_space = true
         content = [:multi, [:slim, :interpolate, @line]]
         tag << content
         @stacks << content
-        parse_text_block(@orig_line.size - @line.size, :from_tag)
       end
     end
 

data/test/slim/helper.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 
-require 'rubygems'
+require 'bundler'
+Bundler.setup
 require 'minitest/unit'
 require 'hamlet'
 require 'slim/grammar'
+$:.unshift(File.expand_path('..', __FILE__))
 
 MiniTest::Unit.autorun
 

data/test/slim/test_html_structure.rb

@@ -11,7 +11,7 @@ class TestSlimHtmlStructure < TestSlim
     <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
+    assert_html "<html><head><title>Simple Test Title</title></head>\n<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><p>World</p>", source
+    assert_html "<p>Hello</p>\n<p>World</p>", source
   end
 
   def test_html_namespaces
@@ -68,7 +68,7 @@ class TestSlimHtmlStructure < TestSlim
   = hello_world
 }
 
-    assert_html '<h1 id="title">This is my title</h1><div class="hello world" id="notice">Hello World from @env</div>', source
+    assert_html %Q{<h1 id="title">This is my title</h1>\n<div class="hello world" id="notice">Hello World from @env</div>}, source
   end
 
   def test_render_with_overwritten_default_tag
@@ -96,17 +96,18 @@ class TestSlimHtmlStructure < TestSlim
 <p>Some more markup
 }
 
-    assert_html '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p><p>Some more markup</p>', source
+    assert_html "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>\n<p>Some more markup</p>", source
   end
 
   def test_render_with_text_block_with_trailing_whitespace
     source = %q{
-this is
-  a link to
-<a href="link">page
+<p>
+   this is
+  >  a link to
+   <a href="link">page
 }
 
-    assert_html "this is\n  a link to<a href=\"link\">page</a>", source
+    assert_html "<p>this is\n  a link to\n<a href=\"link\">page</a></p>", source
   end
 
   def test_nested_text
@@ -119,45 +120,44 @@ this is
 <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
+    assert_html "<p>This is line one.\n This is line two.\n  This is line three.\n   This is line four.</p>\n<p>This is a new paragraph.</p>", source
   end
 
   def test_nested_text_with_nested_html_one_same_line
     source = %q{
 <p
- This is line one.
+  This is line one.
  > This is line two.
- <span.bold>This is a bold line in the paragraph.
+  <span.bold>This is a bold line in the paragraph.
  > 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
+    assert_html "<p>This is line one.\n This is line two.\n<span class=\"bold\">This is a bold line in the paragraph.</span>\n This is more content.</p>", source
   end
 
   def test_nested_text_with_nested_html_one_same_line2
     source = %q{
 <p
- This is line one.
+  This is line one.
  > This is line two.
- <span.bold>This is a bold line in the paragraph.
+  <span.bold>This is a bold line in the paragraph.
  >  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
+    assert_html "<p>This is line one.\n This is line two.\n<span class=\"bold\">This is a bold line in the paragraph.</span>\n  This is more content.</p>", source
   end
 
   def test_nested_text_with_nested_html
     source = %q{
-<p
- >This is line one.
- > This is line two.
- >  This is line three.
- >   This is line four.
- <span.bold>This is a bold line in the paragraph.
- >  This is more content.
+<p>This is line one.
+  > This is line two.
+  >  This is line three.
+  >   This is line four.
+   <span.bold>This is a bold line in the paragraph.
+  > This is more content.
 }
 
-    assert_html "<p>This is line one.\n This is line two.\n  This is line three.\n   This is line four.<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.\n This is line two.\n  This is line three.\n   This is line four.\n<span class=\"bold\">This is a bold line in the paragraph.</span>\n This is more content.</p>", source
   end
 
   def test_simple_paragraph_with_padding
@@ -202,7 +202,7 @@ this is
 <p>    =hello_world
 }
 
-    assert_html '<p>Hello World from @env</p><p> = hello_world</p><p>    =hello_world</p>', source
+    assert_html "<p>Hello World from @env</p>\n<p> = hello_world</p>\n<p>    =hello_world</p>", source
   end
 
   def test_single_quoted_attributes
@@ -333,7 +333,7 @@ this is
 <p>World
 }
 
-    assert_html "<p>Hello</p><!--This is a comment\n\nAnother comment--><p>World</p>", source
+    assert_html "<p>Hello</p>\n<!--This is a comment\n\nAnother comment--><p>World</p>", source
   end
 
   def test_render_with_html_conditional_and_tag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlet
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000 Z
+date: 2011-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &3510320 !ruby/object:Gem::Requirement
+  requirement: &3510800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3510320
+  version_requirements: *3510800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3485760 !ruby/object:Gem::Requirement
+  requirement: &3486040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *3485760
+  version_requirements: *3486040
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &3484840 !ruby/object:Gem::Requirement
+  requirement: &3485160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *3484840
+  version_requirements: *3485160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &3483280 !ruby/object:Gem::Requirement
+  requirement: &3483060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3483280
+  version_requirements: *3483060
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &3481100 !ruby/object:Gem::Requirement
+  requirement: &3481600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3481100
+  version_requirements: *3481600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3480020 !ruby/object:Gem::Requirement
+  requirement: &3480640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3480020
+  version_requirements: *3480640
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &3441840 !ruby/object:Gem::Requirement
+  requirement: &3442060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3441840
+  version_requirements: *3442060
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &3440280 !ruby/object:Gem::Requirement
+  requirement: &3440300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3440280
+  version_requirements: *3440300
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &3439140 !ruby/object:Gem::Requirement
+  requirement: &3439300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3439140
+  version_requirements: *3439300
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &3437460 !ruby/object:Gem::Requirement
+  requirement: &3437480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3437460
+  version_requirements: *3437480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &3434620 !ruby/object:Gem::Requirement
+  requirement: &3435020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3434620
+  version_requirements: *3435020
 description: Hamlet is a template language whose goal is reduce HTML syntax to the
   essential parts.
 email: