hamlit 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fcdd736eed726e665a108fc41bad6d5525bedca
-  data.tar.gz: a6bd7ab15f0a06995eef5704105ea272288314e7
+  metadata.gz: cc6af6b57be662141cab0bb717a24bdaf2e2406f
+  data.tar.gz: 65ce818ede5672f94b126ec19cc3a210a28c705e
 SHA512:
-  metadata.gz: f2727bfa9938f2aa332f160bcf716b91f70a14b6a4f1562bc21a0a94f5ff23285aa9f033928149f6ffdfe91a1570073569d5d92422ab28830a2f0eafdf688a3c
-  data.tar.gz: f50b2affcf6a6a0b6150f7f6ac729aaeed8c8821126a5e654cf1f8220b7c7ec5e1989ee51e3da202feeb3415048645cd42d79257ac592014f086d7bbe5282836
+  metadata.gz: b1e3e8153d7f4978de1ab3992d46b67dd00399d7bb789a93a8d2b6e7c6c91a20e7662d93d99369f7f7faf4f7f12b260b499d98c34dea286fede0177ee81548e0
+  data.tar.gz: 04d290e8d75dc51ecd31e5c0f404bdb200b7d42fb528f2612054a05efeb59f8fb09c37b9297c780bf22087de3174070a5e51d1febca667c2a45080fd73eec1b1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.6.4
+
+- Show human-friendly error messages
+- Fix line number of runtime syntax error
+- Increase the number of checked cases for illegal nesting
+  - Thanks to @eagletmt
+
 ## v1.6.3
 
 - Fix ! and & parsing inside a tag

data/lib/hamlit/concerns/indentable.rb

@@ -52,8 +52,9 @@ module Hamlit
           @indent_space = @indent_logs.last
         end
         validate_indentation_consistency!(indent)
+        reject_too_deep_indentation!
 
-        next_indent != @current_indent
+        next_indent < @current_indent
       end
 
       def has_block?
@@ -70,12 +71,30 @@ module Hamlit
         return false if indent.empty?
         return false if !@indent_space || @indent_space.empty?
 
-        if indent[0] != @indent_space[0] || indent.length < @indent_space.length
+        unless acceptable_indent?(indent)
           syntax_error!("Inconsistent indentation: #{indent_label(indent)} used for indentation, "\
                         "but the rest of the document was indented using #{indent_label(@indent_space)}.")
         end
       end
 
+      def acceptable_indent?(indent)
+        indent = indent.dup
+        while indent.match(/^#{@indent_space}/)
+          indent.gsub!(/^#{@indent_space}/, '')
+        end
+        indent.empty?
+      end
+
+      def reject_too_deep_indentation!
+        return if next_indent <= @current_indent
+
+        if @indent_logs.length == 1
+          syntax_error!('Indenting at the beginning of the document is illegal.')
+        else
+          syntax_error!("The line was indented #{next_indent - count_indent(current_line)} levels deeper than the previous line.")
+        end
+      end
+
       def indent_label(indent)
         return %Q{"#{indent}"} if indent.include?(' ') && indent.include?("\t")
 

data/lib/hamlit/parser.rb

@@ -62,6 +62,7 @@ module Hamlit
       end
       ast
     rescue => e
+      ast << [:newline]
       ast << syntax_error(e.message)
       ast
     end
@@ -117,7 +118,7 @@ module Hamlit
       when '=', '~'
         parse_script(scanner)
       else
-        parse_text(scanner, lstrip: true)
+        parse_text(scanner, lstrip: true, inline: inline)
       end
     end
 

data/lib/hamlit/parsers/comment.rb

@@ -16,6 +16,9 @@ module Hamlit
           content = with_indented { parse_lines }
           return ast << [:multi, [:static, "\n"], *content]
         elsif !text.match(/\[.*\]/)
+          if has_block?
+            syntax_error!('Illegal nesting: nesting within a tag that already has content is illegal.')
+          end
           return ast << [:static, " #{text} "]
         end
 

data/lib/hamlit/parsers/tag.rb

@@ -32,6 +32,7 @@ module Hamlit
         elsif scanner.match?(/\//)
           return syntax_error("Illegal nesting: nesting within a self-closing tag is illegal.")
         end
+        validate_content_existence!(tag, scanner)
 
         content = [:multi, [:static, "\n"]]
         if inner_removal || Helpers::DEFAULT_PRESERVE_TAGS.include?(tag)
@@ -64,6 +65,14 @@ module Hamlit
         end
         ast
       end
+
+      def validate_content_existence!(tag, scanner)
+        scanner.scan(/ */)
+
+        if scanner.match?(/[^ ]/)
+          syntax_error!("Illegal nesting: content can't be both given on the same line as %#{tag} and nested within it.")
+        end
+      end
     end
   end
 end

data/lib/hamlit/parsers/text.rb

@@ -5,12 +5,24 @@ module Hamlit
     module Text
       include Concerns::Error
 
-      def parse_text(scanner, lstrip: false, escape: true, scan: nil)
+      def parse_text(scanner, lstrip: false, escape: true, scan: nil, inline: true)
+        reject_text_nesting! unless inline
+
         scanner.scan(scan) if scan
         text = (scanner.scan(/.+/) || '')
         text = text.lstrip if lstrip
         [:haml, :text, text, escape]
       end
+
+      private
+
+      def reject_text_nesting!
+        return unless next_line
+
+        if next_indent > @current_indent
+          syntax_error!('Illegal nesting: nesting within plain text is illegal.')
+        end
+      end
     end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/spec/hamlit/engine/error_spec.rb

@@ -84,5 +84,52 @@ describe Hamlit::Engine do
       HAML
         to raise_error(Hamlit::SyntaxError, "Illegal nesting: nesting within a self-closing tag is illegal.")
     end
+
+    it 'rejects illegal indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        hello
+          world
+      HAML
+        to raise_error(Hamlit::SyntaxError, 'Illegal nesting: nesting within plain text is illegal.')
+    end
+
+    it 'rejects illegal indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %span hello
+          world
+      HAML
+        to raise_error(Hamlit::SyntaxError, "Illegal nesting: content can't be both given on the same line as %span and nested within it.")
+    end
+
+    it 'rejects illegal indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        / hello
+          world
+      HAML
+        to raise_error(Hamlit::SyntaxError, 'Illegal nesting: nesting within a tag that already has content is illegal.')
+    end
+
+    it 'rejects illegal indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %span
+          %span
+              %span
+      HAML
+        to raise_error(Hamlit::SyntaxError, 'The line was indented 2 levels deeper than the previous line.')
+    end
+
+    it 'rejects illegal indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %span
+            %span
+              %span
+      HAML
+        to raise_error(Hamlit::SyntaxError, "Inconsistent indentation: 6 spaces used for indentation, but the rest of the document was indented using 4 spaces.")
+    end
+
+    it 'rejects illegal indentation' do
+      expect { render_string('  hello') }.
+        to raise_error(Hamlit::SyntaxError, 'Indenting at the beginning of the document is illegal.')
+    end
   end
 end

metadata

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