himl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bf41980a84e9ae83b46f6bc7066ae6b8e8eacbd52ad8df5da3fbb3a23d9617
-  data.tar.gz: aa083fd9b6d315151b4549e9de289a0c5a31d4c199e697482dcb3ce475aac9b1
+  metadata.gz: ed14ef24b0bebebbd88c3c5dd187b8a373f2aebd52b9441c83e3f86d4437ebbd
+  data.tar.gz: 323c1b623fb6c48909a6b553ad2885a83c5c6da514760251f554fd6f08507e08
 SHA512:
-  metadata.gz: 79df19e4b753f89b853457026a9065f63a02272745056e65b2e93d01fc5fb3b5a228254ff74b0902f3c9f451db3407fd00191a0372c5c49348f562de77fe9781
-  data.tar.gz: fe1df061276d7696d73bb15356500cf17980976510eeda51a564508f9abc4adf10e665c9d6565960d2c8cad3ac70fbc2c866d3f746b1c50945c3400a82df1652
+  metadata.gz: 1d2151d637bf63d6c23e0f89390c660a92f63263368afbc454dc7414116054f9c82d530c1fcd25ec26ad9c72fc8b5fa233423ccb14d24620949a5f71af860d1d
+  data.tar.gz: 6cbc3d7b27695c328037df788cf02ef3434ae147b66f97e6748684698928c8c2c2ac3cae254bcc10298556adafe692e7aa04be2dd799fdfd9051309cd97b6227

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.0.1
+  - 2.6.2
+before_install: gem i bundler

data/README.md

@@ -5,7 +5,7 @@ Himl is an HTML-based Indented Markup Language for Ruby.
 
 ## What's This?
 
-Himl is a yet another template engine for Haml-lovers and non Haml lovers, deriving HTML validity from Haml and syntax intuitiveness from ERB.
+Himl is a yet another template engine for Haml-lovers and non Haml-lovers, deriving HTML validity from Haml and syntax intuitiveness from ERB.
 
 
 ## Motivation
@@ -24,7 +24,7 @@ HTML has tags. HTML has indentations. Why can't we just use them?
 ## Syntax
 
 Himl syntax is a hybrid of ERB and Haml.
-Himl is besically just a kind of ERB. Indeed, Himl documents are compiled to ERB internally, then rendered by the ERB handler.
+Himl is basically just a kind of ERB. Indeed, Himl documents are compiled to ERB internally, then rendered by the ERB handler.
 
 So, the following Himl template opening and closing a tag will be compiled to exactly the same ERB template.
 
@@ -86,6 +86,49 @@ ERB
 </section>
 ```
 
+Ruby blocks in the ERB tag can also automatically be closed.
+
+Himl
+```erb
+<ul>
+  <%= @users.each do |user| %>
+    <li>
+      <%= user.name %>
+```
+
+ERB
+```erb
+<ul>
+  <%= @users.each do |user| %>
+    <li>
+      <%= user.name %>
+    </li>
+  <% end %>
+</ul>
+```
+
+Or manually be closed.
+
+Himl
+```erb
+<ul>
+  <%= @users.each do |user| %>
+    <li>
+      <%= user.name %>
+  <% end %>
+```
+
+ERB
+```erb
+<ul>
+  <%= @users.each do |user| %>
+    <li>
+      <%= user.name %>
+    </li>
+  <% end %>
+</ul>
+```
+
 You can open and close tags in the same line.
 
 Himl
@@ -117,10 +160,40 @@ ERB
 </section>
 ```
 
+More detailed syntax may be covered in [the tests](https://github.com/amatsuda/himl/blob/master/test/himl_test.rb).
+
+
+## Document Validations
+
+Himl's strongest advantage is not that you just can reduce the template LOC, but the engine validates the structure of the document and detects some syntax errors.
+For example, Himl raises `SyntaxError` while parsing these templates.
+
+Mismatched closing tag
+```erb
+<div>
+  hello?
+  </div>
+```
+
+Mismatched ERB `end` expression
+```erb
+  <% if @current_user.admin? %>
+    TOP SECRET
+<% end %>
+```
+
+Extra ERB `end` expression
+```erb
+<% @books.each do |book| %>
+  <% book.read %>
+<% end %>
+<% end %>
+```
+
 
 ## Example
 
-Following is a comparison of ERB, Haml, and Himl templates that renderes similar HTML results (the Haml example is taken from the [Haml documentation](http://haml.info/)).
+Following is a comparison of ERB, Haml, and Himl templates that renders similar HTML results (the Haml example is taken from the [Haml documentation](http://haml.info/)).
 You'll notice that Himl consumes the same LOC with the Haml version for expressing the structure of this document, without introducing any new syntax from the ERB version.
 
 ### ERB Template

data/lib/himl/handler.rb

@@ -9,9 +9,7 @@ module Himl
     end
 
     def call(template, source)
-      parser = Himl::Parser.new
-      parser.call(source)
-      erb = parser.to_erb
+      erb = Himl::Parser.new(source).call(source).to_erb
 
       escape = ERB_HANDLER.respond_to?(:escape_ignore_list) ? ERB_HANDLER.escape_ignore_list.include?(template.type) : ERB_HANDLER.escape_whitelist.include?(template.type)
 

data/lib/himl/parser.rb

@@ -82,10 +82,15 @@ module Himl
         return if last_tag.name == ROOT_NODE
 
         if (name == ERB_TAG) && last_tag.is_a?(ErbEndMarker)
-          raise SyntaxError "end of block indentation mismatch at line: #{current_line}, column: #{current_indentation}" if last_tag.indentation != @tags[-2].indentation
+          raise SyntaxError, "end of block indentation mismatch at line: #{current_line}, column: #{current_indentation}" if last_tag.indentation != @tags[-2].indentation
 
           @tags.pop
-          @tags.pop
+
+          if (ErbBlockStartMarker === @tags.last) && (@tags.last.indentation == last_tag.indentation)
+            @tags.pop
+          else
+            raise SyntaxError, "end of block mismatch at line: #{current_line}, column: #{current_indentation}" unless (ErbBlockStartMarker === @tags.last) && (@tags.last.indentation == last_tag.indentation)
+          end
         end
 
         if name == last_tag.name
@@ -127,8 +132,9 @@ module Himl
       private
 
       def current_indentation
-        line = @lines[current_line]
-        line.slice(0, context.column).rindex('<')
+        line = current_line
+        line -=1 until (ret = @lines[line].slice(0, context.column).rindex('<'))
+        ret
       end
 
       def current_line
@@ -169,6 +175,8 @@ module Himl
       end
 
       @document.close_document!
+
+      self
     end
   end
 end

data/lib/himl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Himl
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: himl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri