hamlit 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a47c046855e5faac3109a4e63a42c5502b9acbd
-  data.tar.gz: 2ea9635b5945fd898e6f42f7f32646bc7e038a6b
+  metadata.gz: 4848cd3ee1ccb8ba77acac4389eaadeca802b145
+  data.tar.gz: 13c163d9c67e46d506686337b09979a65020cf62
 SHA512:
-  metadata.gz: abfde39c2619670875b887f41700a4b0f7335f9b724f12ede0fcbfe833acff62dd100781e1fb9be2b3023c2826cb67f7f053f0d261199548f7925e09f9252291
-  data.tar.gz: 4782d6de4f657b871ab423e6af14b4f8d2f72ab82a6b8e6c903dfeec5fa264b02f4499ac72eabd6c588f89d3c24f5b013f43302fc67c4881850e57aa048e3269
+  metadata.gz: babb6f83c927734400646d758cf9c2e412ceeb416e77613031b97465b93cf71158d5f0549c940e81c58bec086634e7968d23b3d2b8649bb6b1f32cc48b3a6e94
+  data.tar.gz: a7afb822afce6b75d1fffd69d292146c3d2b86edc0b66a57ff3b865a9847d8f1eab291fe733f9216a8e39ce6fa5ec18b819244eef8234852b858ca9377a931c4

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+## v1.6.1
+
+- Parse N-space indentation
+
 ## v1.6.0
 
 - Fix line number of compiled code for new attributes
 - Render HTML entities normally for plain text
+  - https://github.com/k0kubun/hamlit/issues/27
+  - Thanks to @jeffblake
 
 ## v1.5.9
 

data/doc/engine/indent.md

@@ -22,3 +22,32 @@
 
 ```
 
+
+# [indent\_spec.rb:28](/spec/hamlit/engine/indent_spec.rb#L28)
+## Input
+```haml
+%p
+	%span
+		foo
+
+```
+
+## Output
+### Haml, Hamlit
+```html
+<p>
+<span>
+foo
+</span>
+</p>
+
+```
+
+### Faml
+```html
+<p></p>
+%span
+foo
+
+```
+

data/doc/engine/text.md

@@ -50,7 +50,7 @@ Haml::SyntaxError: Illegal element: classes and ids must have values.
 ```
 
 ## Output
-### Haml
+### Haml, Hamlit
 ```html
  
  
@@ -59,7 +59,7 @@ Haml::SyntaxError: Illegal element: classes and ids must have values.
 
 ```
 
-### Faml, Hamlit
+### Faml
 ```html
 nbsp;
  

data/doc/faml/engine/indent.md

@@ -22,3 +22,32 @@
 
 ```
 
+
+# [indent\_spec.rb:28](/spec/hamlit/engine/indent_spec.rb#L28)
+## Input
+```haml
+%p
+	%span
+		foo
+
+```
+
+## Output
+### Faml
+```html
+<p></p>
+%span
+foo
+
+```
+
+### Hamlit
+```html
+<p>
+<span>
+foo
+</span>
+</p>
+
+```
+

data/doc/faml/engine/text.md

@@ -33,3 +33,33 @@
 
 ```
 
+
+# [text\_spec.rb:118](/spec/hamlit/engine/text_spec.rb#L118)
+## Input
+```haml
+ 
+\ 
+!hello
+\!hello
+
+```
+
+## Output
+### Faml
+```html
+nbsp;
+ 
+hello
+!hello
+
+```
+
+### Hamlit
+```html
+ 
+ 
+!hello
+!hello
+
+```
+

data/doc/haml/engine/text.md

@@ -27,33 +27,3 @@ Haml::SyntaxError: Illegal element: classes and ids must have values.
 
 ```
 
-
-# [text\_spec.rb:118](/spec/hamlit/engine/text_spec.rb#L118)
-## Input
-```haml
- 
-\ 
-!hello
-\!hello
-
-```
-
-## Output
-### Haml
-```html
- 
- 
-!hello
-!hello
-
-```
-
-### Hamlit
-```html
-nbsp;
- 
-hello
-!hello
-
-```
-

data/lib/hamlit/concerns/indentable.rb

@@ -8,12 +8,14 @@ module Hamlit
       include Concerns::Error
 
       def reset_indent
+        @indent_logs    = []
         @current_indent = 0
       end
 
       # Return nearest line's indent level since next line. This method ignores
       # empty line. It returns -1 if next_line does not exist.
       def next_indent
+        return 1 if !@indent_space && fetch_indent(next_line).length > 0
         count_indent(next_line)
       end
 
@@ -28,19 +30,16 @@ module Hamlit
         @current_indent -= 1
       end
 
-      def count_indent(line, strict: false)
+      def count_indent(line)
         return EOF unless line
-        width = count_width(line)
+        return 0 if indent_rule == 0
 
-        return (width + 1) / 2 unless strict
-        compile_error!('Expected to count even-width indent') if width.odd?
-
-        width / 2
+        line.match(/\A[ \t]+/).to_s.length / indent_rule
       end
 
       def count_width(line)
         return EOF unless line
-        line[/\A +/].to_s.length
+        line[/\A[ \t]+/].to_s.length
       end
 
       def same_indent?(line)
@@ -50,31 +49,30 @@ module Hamlit
 
       # Validate current line's indentation
       def validate_indentation!(ast)
-        width = next_width
-        return false if width == @current_indent * 2
-
-        if width != Hamlit::EOF && (width > @current_indent * 2 || width.odd?)
-          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"
-          )
+        return true unless next_line
+
+        indent = fetch_indent(next_line)
+        if indent.include?(' ') && indent.include?("\t")
+          syntax_error!("Indentation can't use both tabs and spaces.")
+        end
+        @indent_logs << indent
+
+        if !@indent_space && @indent_logs.last != ''
+          @indent_space = @indent_logs.last
         end
-        true
+        validate_indentation_consistency!(indent)
+
+        next_indent != @current_indent
       end
 
       # Validate the template is using consitent indentation, 2 spaces or a tab.
-      def validate_indentation_consistency!(template)
-        last_indent = ''
-
-        indents = template.scan(/^[ \t]+/)
-        indents.each do |indent|
-          if last_indent.include?(' ') && indent.include?("\t") ||
-              last_indent.include?("\t") && indent.include?(' ')
-            syntax_error!(%Q{Inconsistent indentation: #{indent_label(indent)} used for indentation, but the rest of the document was indented using #{indent_label(last_indent)}.})
-          end
+      def validate_indentation_consistency!(indent)
+        return false if indent.empty?
+        return false if !@indent_space || @indent_space.empty?
 
-          last_indent = indent
+        if indent[0] != @indent_space[0] || indent.length < @indent_space.length
+          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
 
@@ -87,20 +85,44 @@ module Hamlit
         "#{length} #{label}#{'s' if length > 1}"
       end
 
-      # Replace hard tabs into 2 spaces
-      def replace_hard_tabs(template)
-        lines = []
-        template.each_line do |line|
-          lines << line.gsub(/^\t+/) do |match|
-            ' ' * (match.length * 2)
-          end
-        end
-        lines.join
-      end
-
       def has_block?
+        return false unless next_line
+        return fetch_indent(next_line).length > 0 unless @indent_space
+
         next_indent > @current_indent
       end
+
+      private
+
+      def indent_label(indent)
+        return %Q{"#{indent}"} if indent.include?(' ') && indent.include?("\t")
+
+        label  = indent.include?(' ') ? 'space' : 'tab'
+        length = indent.match(/[ \t]+/).to_s.length
+
+        "#{length} #{label}#{'s' if length > 1}"
+      end
+
+      def count_width(line)
+        return EOF unless line
+        line[/\A +/].to_s.length
+      end
+
+      def next_space
+        next_line[/\A +/].to_s
+      end
+
+      def next_width
+        count_width(next_line)
+      end
+
+      def indent_rule
+        (@indent_space || '').length
+      end
+
+      def fetch_indent(str)
+        str.match(/^[ \t]+/).to_s
+      end
     end
   end
 end

data/lib/hamlit/concerns/line_reader.rb

@@ -25,7 +25,7 @@ module Hamlit
       end
 
       def skip_lines
-        while next_indent >= @current_indent
+        while next_line && next_indent >= @current_indent
           @current_lineno += 1
         end
       end
@@ -47,7 +47,8 @@ module Hamlit
       end
 
       def read_line?
-        return true if count_indent(next_line, strict: false) >= @current_indent
+        return false unless next_line
+        return true if next_line.index(/^#{@indent_logs.last}[ \t]/)
 
         line = @lines[@current_lineno + 1]
         return false unless line

data/lib/hamlit/parser.rb

@@ -38,7 +38,6 @@ module Hamlit
     # Reset the parser state.
     def reset(template)
       validate_indentation_consistency!(template)
-      template = replace_hard_tabs(template)
       template = preprocess_multilines(template)
 
       reset_lines(template.split("\n"))
@@ -62,6 +61,9 @@ module Hamlit
         ast << [:static, "\n"] unless skip_newline?(node)
       end
       ast
+    rescue => e
+      ast << syntax_error(e.message)
+      ast
     end
 
     # Parse current line and return AST.
@@ -69,7 +71,7 @@ module Hamlit
       return [:multi] if empty_line?(line)
 
       scanner = wrap_scanner(line)
-      scanner.scan(/ +/)
+      scanner.scan(/[ \t]+/)
 
       unless inline
         ast = parse_outer_line(scanner)

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/hamlit/engine/error_spec.rb

@@ -11,16 +11,18 @@ describe Hamlit::Engine do
       expect { render_string(<<-HAML.unindent) }.
         %a
             %b
+         %a
       HAML
-        to raise_error(Hamlit::SyntaxError, 'inconsistent indentation: 2 spaces used for indentation, but the rest of the document was indented using 4 spaces')
+        to raise_error(Hamlit::SyntaxError, 'Inconsistent indentation: 1 space used for indentation, but the rest of the document was indented using 4 spaces.')
     end
 
     it 'raises syntax error for illegal indentation' do
       expect { render_string(<<-HAML.unindent) }.
         %a
-         %b
+        \t\t%a
+        \t%a
       HAML
-        to raise_error(Hamlit::SyntaxError, 'inconsistent indentation: 2 spaces used for indentation, but the rest of the document was indented using 1 spaces')
+        to raise_error(Hamlit::SyntaxError, 'Inconsistent indentation: 1 tab used for indentation, but the rest of the document was indented using 2 tabs.')
     end
 
     it 'raises syntax error which has correct line number in backtrace' do
@@ -59,5 +61,13 @@ describe Hamlit::Engine do
       HAML
         to raise_error(Hamlit::SyntaxError, 'Unbalanced brackets.')
     end
+
+    it 'raises syntax error for an inconsistent indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %p
+        \t %span
+      HAML
+        to raise_error(Hamlit::SyntaxError, "Indentation can't use both tabs and spaces.")
+    end
   end
 end

data/spec/hamlit/engine/indent_spec.rb

@@ -10,5 +10,33 @@ describe Hamlit::Engine do
         </p>
       HTML
     end
+
+    it 'accepts N-space indentation' do
+      assert_render(<<-HAML, <<-HTML)
+        %p
+           %span
+              foo
+      HAML
+        <p>
+        <span>
+        foo
+        </span>
+        </p>
+      HTML
+    end
+
+    it 'accepts N-tab indentation' do
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+        %p
+        \t%span
+        \t\tfoo
+      HAML
+        <p>
+        <span>
+        foo
+        </span>
+        </p>
+      HTML
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -603,3 +603,4 @@ test_files:
 - spec/spec_helper/document_generator.rb
 - spec/spec_helper/render_helper.rb
 - spec/spec_helper/test_case.rb
+has_rdoc: