hamlet 0.4.0 → 0.4.1

data/README.md

@@ -33,7 +33,7 @@ This Hamlet works on top of [slim](https://github.com/stonean/slim/). Please tak
 
 ## Difference with Slim
 
-The most important difference is that hamlet always uses angle brackets. Hamlet also does not require attributes to be quoted - unquoted is considered a normal html attribute value and quotes will be added. Hamlet also uses a '#' for code comments and the normal <!-- for HTML comments. Hamlet also uses different whitespace indicators - see the next section.
+The most important difference is that hamlet always uses angle brackets. Hamlet also does not require attributes to be quoted - unquoted is considered a normal html attribute value and quotes will automatically be added. Hamlet also uses a '#' for code comments and the normal <!-- for HTML comments. Hamlet also uses different whitespace indicators - see the next section.
 
 In Slim you have:
 
@@ -51,15 +51,38 @@ In hamlet you have:
 
 ## Whitespace
 
-I added the same syntax that hamlet.js uses to indicate whitespace: a closing bracket to the left and a code comment to the right. I will probably take out some of the slim white space techniques.
+Using indentation does have some consequences with respect to white space. This library is designed to do the right thing most of the time. This is a slightly different design from the original Haskell implementation of Hamlet and Slim, but the same design as hamlet.js
 
-    <p>   White space to the left        # and to the right
-      >   White space to the left again# None to the right
+A closing tag is placed immediately after the tag contents. If you want to have a space before a closing tag, use a comment sign `#` on the line to indicate where the end of the line is.
+
+``` html
+<b>spaces  # 2 spaces are included
+
+```
+
+A new line is automatically added *after* tags with inner text. If you have multiple lines of inner text without tags (not a common use case) they will also get a new line added. If you do not want white space, you point it out with a `>` character, that you could think of as the end of the last tag, although you can still use it when separating content without tags onto different lines. You can also use a `>` if you want more than one space.
+
+``` html
+<b>spaces  # 2 spaces are included
+```
+
+``` html
+<b>spaces  </b>
+```
+
+``` html
+<b>no space
+>none after bold.
+>  Two spaces after a period is bad!
+```
+
+``` html
+<b>no space</b>none after bold.  Two spaces after a period is bad!
 
 
 ## 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.
+I just hacked this up the other day - let me know if there are any issues.
 
 ## Development
 

data/hamlet.gemspec

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

data/lib/hamlet/parser.rb

@@ -95,7 +95,7 @@ module Hamlet
     end
 
     def parse_line_indicators
-      if @needs_space
+      if @needs_space and not @line[0] == '>'
         @stacks.last << [:slim, :interpolate, "\n" ]
         @stacks.last << [:newline]
       end

data/test/slim/test_html_structure.rb

@@ -107,7 +107,7 @@ class TestSlimHtmlStructure < TestSlim
    <a href="link">page
 }
 
-    assert_html "<p>this is\n  a link to\n<a href=\"link\">page</a></p>", source
+    assert_html "<p>this is  a link to\n<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.\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
+    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
   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.\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
+    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
   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.\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
+    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
   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.\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
+    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
   end
 
   def test_simple_paragraph_with_padding
@@ -174,7 +174,7 @@ class TestSlimHtmlStructure < TestSlim
   > This is line two.
 }
 
-    assert_html "<p>This is line one.\n This is line two.</p>", source
+    assert_html "<p>This is line one. This is line two.</p>", source
   end
 
   def test_paragraph_with_padded_nested_text
@@ -183,7 +183,7 @@ class TestSlimHtmlStructure < TestSlim
   > This is line two.
 }
 
-    assert_html "<p> This is line one.\n This is line two.</p>", source
+    assert_html "<p> This is line one. This is line two.</p>", source
   end
 
   def test_paragraph_with_attributes_and_nested_text

metadata

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