hamlit 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17fccee0547b3167279c8273055849258c7260d
-  data.tar.gz: 5af28ebd2215a7c46071937e0deb80ae160b1eab
+  metadata.gz: 1cd8171af3715df926bcc809abc6bac110e99fb1
+  data.tar.gz: 94789c593c71581ff6d36ed947914acee93e5e6f
 SHA512:
-  metadata.gz: e9d03161eaf316804f4f036f47adb97ef18f187130ea638a573f8ebb06a4e5137a69f086ec5ce70f732295c448e96571e6db9f473832d615bf27d6e6119fc93c
-  data.tar.gz: fcf649a051f1aa761fdb6ed9fefdbca8658a34c7e4c74e5cbc8a72cd634dab8c9300f8c1eb88126e021836338ee3c9788f30f499262709653898211bc9f29088
+  metadata.gz: 32471cca6c6628befa00c74685089ebac83cdde4497f51e2ba103d41a2657e925ca1360792d24c054b578fbfa091738d42848707b873811a9dcc4dc8800e6b7f
+  data.tar.gz: 082bf0f71595fe4c730a747f197665d5a17944ce738d8bbc9c427cdd21746a6a263a1115f56b4c474523e477f9dc6aeb23d1ba1bf71db4b726ffc3330b19836d

data/lib/hamlit/concerns/error.rb

@@ -11,6 +11,10 @@ module Hamlit
         [:code, code]
       end
 
+      def syntax_error!(message)
+        raise Hamlit::SyntaxError.new(message)
+      end
+
       def copmile_error!(message)
         raise CompileError.new(message)
       end

data/lib/hamlit/concerns/indentable.rb

@@ -48,6 +48,41 @@ module Hamlit
         return false unless line
         count_indent(line) == @current_indent
       end
+
+      # Validate the template is using consitent indentation, 2 spaces or a tab.
+      def validate_indentation!(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
+
+          last_indent = indent
+        end
+      end
+
+      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
+
+      # 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
     end
   end
 end

data/lib/hamlit/parser.rb

@@ -39,7 +39,10 @@ module Hamlit
 
     # Reset the parser state.
     def reset(template)
+      validate_indentation!(template)
+      template = replace_hard_tabs(template)
       template = preprocess_multilines(template)
+
       reset_lines(template.split("\n"))
       reset_indent
       reset_outer_removal

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/hamlit/engine/error_spec.rb

@@ -43,5 +43,14 @@ describe Hamlit::Engine do
         end
       end
     end
+
+    it 'raises syntax error for an inconsistent indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %a
+          %b
+        \t\t%b
+      HAML
+        to raise_error(Hamlit::SyntaxError, 'Inconsistent indentation: 2 tabs used for indentation, but the rest of the document was indented using 2 spaces.')
+    end
   end
 end

data/spec/hamlit/engine/indent_spec.rb

@@ -0,0 +1,14 @@
+describe Hamlit::Engine do
+  describe 'tab indent' do
+    it 'accepts tab indentation' do
+      assert_render(<<-HAML, <<-HTML)
+        %p
+        \t%a
+      HAML
+        <p>
+        <a></a>
+        </p>
+      HTML
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -361,6 +361,7 @@ files:
 - spec/hamlit/engine/comment_spec.rb
 - spec/hamlit/engine/doctype_spec.rb
 - spec/hamlit/engine/error_spec.rb
+- spec/hamlit/engine/indent_spec.rb
 - spec/hamlit/engine/multiline_spec.rb
 - spec/hamlit/engine/new_attribute_spec.rb
 - spec/hamlit/engine/old_attributes_spec.rb
@@ -474,6 +475,7 @@ test_files:
 - spec/hamlit/engine/comment_spec.rb
 - spec/hamlit/engine/doctype_spec.rb
 - spec/hamlit/engine/error_spec.rb
+- spec/hamlit/engine/indent_spec.rb
 - spec/hamlit/engine/multiline_spec.rb
 - spec/hamlit/engine/new_attribute_spec.rb
 - spec/hamlit/engine/old_attributes_spec.rb