hamlet 0.4.1 → 0.4.2

data/hamlet.gemspec

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

data/lib/hamlet/parser.rb

@@ -95,11 +95,6 @@ module Hamlet
     end
 
     def parse_line_indicators
-      if @needs_space and not @line[0] == '>'
-        @stacks.last << [:slim, :interpolate, "\n" ]
-        @stacks.last << [:newline]
-      end
-      @needs_space = false
       case @line[0]
       when '-' # code block.
         block = [:multi]
@@ -107,6 +102,7 @@ module Hamlet
         @stacks.last << [:slim, :control, parse_broken_line, block]
         @stacks << block
       when '=' # output block.
+        @needs_space = true
         @line =~ /\A=(=?)('?)/
         @line = $'
         block = [:multi]
@@ -114,16 +110,24 @@ module Hamlet
         @stacks.last << [:static, ' '] unless $2.empty?
         @stacks << block
       when '<'
+        if @needs_space && !(@line[0] == '>')
+          @stacks.last << [:slim, :interpolate, "\n" ]
+          @stacks.last << [:newline]
+        end
+        @needs_space = false
         case @line
         when /\A<(\w+):\s*\Z/ # Embedded template. It is treated as block.
+          @needs_space = false
           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.
+          @needs_space = false
           parse_tag($1)
         when /\A<!--( ?)(.*)\Z/ # HTML comment
+          @needs_space = false
           block = [:multi]
           @stacks.last <<  [:html, :comment, block]
           @stacks << block
@@ -131,11 +135,21 @@ module Hamlet
           parse_text_block($2.empty? ? nil : @indents.last + $1.size + 2)
         end
       else
-        if @line =~ %r!\A#\[\s*(.*?)\s*\]\s*\Z! # HTML conditional comment
-          block = [:multi]
-          @stacks.last << [:slim, :condcomment, $1, block]
-          @stacks << block
+        if @line[0] == '#' and @line[1] != '{'
+          @needs_space = false
+          if @line =~ %r!\A#\[\s*(.*?)\s*\]\s*\Z! # HTML conditional comment
+            block = [:multi]
+            @stacks.last << [:slim, :condcomment, $1, block]
+            @stacks << block
+          else
+            # otherwise the entire line is commented - ignore
+          end
         else
+          if @needs_space and not @line[0] == '>'
+            @stacks.last << [:slim, :interpolate, "\n" ]
+            @stacks.last << [:newline]
+          end
+          @needs_space = true
           push_text
         end
       end
@@ -143,7 +157,6 @@ module Hamlet
     end
 
     def push_text
-      @needs_space = true
       if @line[0] == '>'
         @line.slice!(0)
       end

data/test/slim/test_code_structure.rb

@@ -22,7 +22,7 @@ class TestSlimCodeStructure < TestSlim
       <p>The second paragraph
 }
 
-    assert_html '<div><p>The first paragraph</p><p>The second paragraph</p></div>', source
+    assert_html "<div><p>The first paragraph</p>\n<p>The second paragraph</p></div>", source
   end
 
   def test_render_with_parameterized_conditional
@@ -33,7 +33,6 @@ class TestSlimCodeStructure < TestSlim
   - else
       <p>The second paragraph
 }
-
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
@@ -46,7 +45,7 @@ class TestSlimCodeStructure < TestSlim
   = var
 }
 
-    assert_html '<div><p>The first paragraph</p>42</div>', source
+    assert_html "<div><p>The first paragraph</p>\n42</div>", source
   end
 
   def test_render_with_inline_condition
@@ -65,7 +64,7 @@ class TestSlimCodeStructure < TestSlim
     1
   - when 42
     42
-  > is the answer
+ > is the answer
 }
 
     assert_html '<p>42 is the answer</p>', source
@@ -79,7 +78,7 @@ class TestSlimCodeStructure < 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_render_with_yield

data/test/slim/test_text_interpolation.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlet
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &3486060 !ruby/object:Gem::Requirement
+  requirement: &3510300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3486060
+  version_requirements: *3510300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3484800 !ruby/object:Gem::Requirement
+  requirement: &3485740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *3484800
+  version_requirements: *3485740
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &3482880 !ruby/object:Gem::Requirement
+  requirement: &3484820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *3482880
+  version_requirements: *3484820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &3481440 !ruby/object:Gem::Requirement
+  requirement: &3483240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3481440
+  version_requirements: *3483240
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &3480460 !ruby/object:Gem::Requirement
+  requirement: &3481080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3480460
+  version_requirements: *3481080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3442220 !ruby/object:Gem::Requirement
+  requirement: &3480000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3442220
+  version_requirements: *3480000
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &3441000 !ruby/object:Gem::Requirement
+  requirement: &3441840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3441000
+  version_requirements: *3441840
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &3439960 !ruby/object:Gem::Requirement
+  requirement: &3440200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3439960
+  version_requirements: *3440200
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &3439320 !ruby/object:Gem::Requirement
+  requirement: &3439100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3439320
+  version_requirements: *3439100
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &3438520 !ruby/object:Gem::Requirement
+  requirement: &3437320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3438520
+  version_requirements: *3437320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &3435820 !ruby/object:Gem::Requirement
+  requirement: &3434540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3435820
+  version_requirements: *3434540
 description: Hamlet is a template language whose goal is reduce HTML syntax to the
   essential parts.
 email: