hamlit 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3179fc842accfe9d500d85b4ab45abccd47cb1eb
-  data.tar.gz: 38eb7023728651efbd6d741b8d3de821e5dfc782
+  metadata.gz: 9c08c9aec751d231ce8bfa1c8a2f47ee8f7d3be0
+  data.tar.gz: 479dc3dac50ba716b8a77a78b52e334a8d670b9e
 SHA512:
-  metadata.gz: 74173d10d57f2419290f473b9b8a419a5f1cee0e371008bcbc1a7c18862796f7ecd18d0ce0bff63c2b44cf63f7f2e8c3be3e7c63919a97cfd061474a20ad0788
-  data.tar.gz: adfacd5b5d7625d66741e9fee4fa5ce3206a490cd91915406ebc758f47c53fe6732ef8bca5e23ca5a74846da9272565067351dba85f9c7d10a64de398c3ef3a5
+  metadata.gz: 068959a68a071911879281fbe37e5d7b8c5feca7b8b7e4529396dcc71f99d2e127b3d4f600dc5b5edcd0ed244033976e20216f8dea58fdbe45a63a2404e6ac1a
+  data.tar.gz: a9680ba6c4321d62f48edaf7deb83e7c90e1d2ca53e0de234440abd85c5dd0ccc3011f31d4e636d651c4accf02b01eb30a99034640a2599789bc3a16a294100c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.6.1
+
+- Bugfix of line numbers for better error backtrace
+  - https://github.com/k0kubun/hamlit/pull/19
+
 ## v0.6.0
 
 - Automatically escape html in all situations

data/README.md

@@ -41,7 +41,7 @@ so it is able to parse such an attribute.
 ### Passing haml-spec
 
 [haml/haml-spec](https://github.com/haml/haml-spec) is a basic suite of tests for Haml interpreters.
-For all test cases in haml-spec, Hamlit behaves the same as Haml (ugly mode only, which is used on production).
+For all test cases in haml-spec, Hamlit behaves the same as Haml (ugly and escape\_html mode only, which is used on production).
 
 Hamlit is used on [githubranking.com](http://githubranking.com/).
 

data/lib/hamlit/parser.rb

@@ -55,7 +55,7 @@ module Hamlit
         width = next_width
         if width != @current_indent * 2
           if width != Hamlit::EOF && (width > @current_indent * 2 || width.odd?)
-            ast << [:multi, [:newline], [:newline]]
+            ast << [:newline]
             ast << syntax_error(
               "inconsistent indentation: #{2 * @current_indent} spaces used for indentation, "\
               "but the rest of the document was indented using #{width} spaces"
@@ -69,8 +69,9 @@ module Hamlit
         if @outer_removal.include?(@current_indent) && ast.last == [:static, "\n"]
           ast.delete_at(-1)
         end
+        ast << [:newline] if @current_indent > 0
         ast << node
-        ast << [:newline]
+        ast << [:newline] if @current_indent == 0
         ast << [:static, "\n"] unless skip_newline?(node)
       end
       ast

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/hamlit/engine_spec.rb

@@ -16,4 +16,43 @@ describe Hamlit::Engine do
       )
     end
   end
+
+  describe '#call' do
+    let(:haml) do
+      <<-HAML.unindent
+        !!! html
+
+        %html
+          %head
+            %title Simple Haml
+          %body
+            %h1= 'header'
+            - unless false
+              %ul
+                - for i in [1, 2, 3]
+                  - if i
+                    %li
+                      %strong= 'hello'
+                  - else
+                    %li
+                      %a{:href => i}= i
+            - else
+              %p last line
+      HAML
+    end
+    let(:engine) { described_class.new }
+
+    it 'generates code with the same lineno as a template' do
+      lines = engine.call(haml).split("\n")
+      expect(lines[0]).to include('DOCTYPE')
+      expect(lines[6]).to include('header')
+      expect(lines[7]).to include('unless')
+      expect(lines[9]).to include('for i in')
+      expect(lines[10]).to include('if i')
+      expect(lines[12]).to include('hello')
+      expect(lines[13]).to include('else')
+      expect(lines[16]).to include('else')
+      expect(lines[17]).to include('last line')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Takashi Kokubun