hamlit 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de4f077471615790e1d0d4993e8fe0926ef84be
-  data.tar.gz: b404e0b74b3a0857287424f22d530a5923eaa2f8
+  metadata.gz: 9a6fd40edd6056710c6fb7a7e571f287355eb797
+  data.tar.gz: afbad9c5994019cf52bfd0e304a07cfe8f6ec218
 SHA512:
-  metadata.gz: f53a569a02a7aa2163559e29793f3a3890e1c6aff8f69e64864a296f738d770c99dc75196cc76643ac8bd209ada3887d916b2660ae63b97c0b7853c43424fcca
-  data.tar.gz: a21d15241aef3b22a3419ac27561b2b020abb342cb5a01357efa2451dea4f06419a35d22a03379b6b47941b513ed98efbb822f3e9f3d6d7712aca32b04a709cd
+  metadata.gz: b71d35469d13442cfdf812ff0fca240f592e825c5b73f30fca91b064b4332b49eff366de7fa55055f7cad58b8e0d91a5790827eba7d76bea06fd66413be597d8
+  data.tar.gz: 56b2b3b77f0a8a8eade006c176196952934ffff5f7a29d8ea15547ab448879299b5c1b63d31d0875290e160370744c187885467f5c0a88cf04128b6d2f78f0b4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.4.6
+
+- Support `!==`, `==` operator
+- Avoid regarding spaced block as multiline
+
 ## v1.4.5
 
 - Support Ruby 2.0 and 2.1 for v1.4.4

data/lib/hamlit/parser.rb

@@ -89,10 +89,12 @@ module Hamlit
         return parse_script(scanner, force_escape: true)
       elsif scanner.match?(/!!!/)
         return parse_doctype(scanner)
+      elsif scanner.scan(/!( |==)/)
+        return parse_text(scanner, lstrip: true, escape: false)
       elsif scanner.match?(/!=/)
         return parse_script(scanner, disable_escape: true)
-      elsif scanner.match?(/! /)
-        return parse_unescaped_text(scanner)
+      elsif scanner.scan(/==/)
+        return parse_text(scanner, lstrip: true)
       elsif scanner.match?(/[.#](\Z|[^a-zA-Z0-9_-])/)
         return parse_text(scanner)
       end

data/lib/hamlit/parsers/multiline.rb

@@ -5,6 +5,8 @@ module Hamlit
     module Multiline
       include Concerns::LineReader
 
+      SPACED_BLOCK_REGEXP = /do +\| *[^\|]+ *\|\Z/
+
       def preprocess_multilines(template)
         reset_lines(template.split("\n"))
         result = []
@@ -30,6 +32,8 @@ module Hamlit
 
       def end_with_pipe?(line)
         return false unless line
+        return false if line =~ SPACED_BLOCK_REGEXP
+
         line.strip =~ / \|\Z/
       end
 

data/lib/hamlit/parsers/tag.rb

@@ -29,8 +29,7 @@ module Hamlit
         elsif scanner.scan(/\//)
           return ast
         elsif scanner.rest.match(/[^ ]/)
-          scanner.scan(/ +/)
-          ast << parse_text(scanner)
+          ast << parse_text(scanner, lstrip: true)
           return ast
         elsif next_indent <= @current_indent
           return ast << [:multi]

data/lib/hamlit/parsers/text.rb

@@ -5,18 +5,10 @@ module Hamlit
     module Text
       include Concerns::Error
 
-      def parse_text(scanner)
-        ast = [:haml, :text]
-        ast << (scanner.scan(/.+/) || '')
-        ast
-      end
-
-      def parse_unescaped_text(scanner)
-        assert_scan!(scanner, /! /)
-        scanner.scan(/ +/)
-
+      def parse_text(scanner, lstrip: false, escape: true)
         text = (scanner.scan(/.+/) || '')
-        [:haml, :text, text, false]
+        text = text.lstrip if lstrip
+        [:haml, :text, text, escape]
       end
     end
   end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 end

data/spec/hamlit/engine/script_spec.rb

@@ -65,6 +65,15 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders block and a variable with spaces' do
+      assert_render(<<-HAML, <<-HTML)
+        - 1.times do | i |
+          = i
+      HAML
+        0
+      HTML
+    end
+
     it 'accepts a continuing script' do
       assert_render(<<-HAML, <<-HTML)
         - def foo(a, b); a + b; end

data/spec/hamlit/engine/text_spec.rb

@@ -39,6 +39,34 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders == operator' do
+      assert_render(<<-'HAML', <<-HTML)
+        ===
+        == =
+        == <a>
+        == #{'<a>'}
+      HAML
+        =
+        =
+        <a>
+        &lt;a&gt;
+      HTML
+    end
+
+    it 'renders !== operator' do
+      assert_render(<<-'HAML', <<-HTML)
+        == #{'<a>'}
+        !== #{'<a>'}
+        !===
+        !== =
+      HAML
+        &lt;a&gt;
+        <a>
+        =
+        =
+      HTML
+    end
+
     it 'leaves empty spaces after backslash' do
       expect(render_string('\       a')).to eq("       a\n")
     end

metadata

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