hamlit 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f85fe19ae942cdfef4ed10ea87a021b5603d915
-  data.tar.gz: cec640d9203032acf294e118fa737724d89c0952
+  metadata.gz: 2fcdd736eed726e665a108fc41bad6d5525bedca
+  data.tar.gz: a6bd7ab15f0a06995eef5704105ea272288314e7
 SHA512:
-  metadata.gz: c668671bcbea79462a605a52b934fa1ec86c81f2ba665abcdc5a1f1667a8b18548896f0069646a8318713d708a2cd241aa10dc28db0b03e4aa167110d679672a
-  data.tar.gz: 5879b98703b9a549bee394304a1d34c3686c72a84bc7bb0b4d8da135e0674d3077e753009770da9a72d033ee3417970ef150200d1b362807b4c999c79025c628
+  metadata.gz: f2727bfa9938f2aa332f160bcf716b91f70a14b6a4f1562bc21a0a94f5ff23285aa9f033928149f6ffdfe91a1570073569d5d92422ab28830a2f0eafdf688a3c
+  data.tar.gz: f50b2affcf6a6a0b6150f7f6ac729aaeed8c8821126a5e654cf1f8220b7c7ec5e1989ee51e3da202feeb3415048645cd42d79257ac592014f086d7bbe5282836

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.6.3
+
+- Fix ! and & parsing inside a tag
+  - https://github.com/k0kubun/hamlit/issues/27#issuecomment-111593458
+  - Thanks to @leesmith
+
 ## v1.6.2
 
 - Reject a content for self-closing tags

data/lib/hamlit/parser.rb

@@ -71,9 +71,8 @@ module Hamlit
       return [:multi] if empty_line?(line)
 
       scanner = wrap_scanner(line)
-      scanner.scan(/[ \t]+/)
-
       unless inline
+        scanner.scan(/[ \t]+/)
         ast = parse_outer_line(scanner)
         return ast if ast
       end
@@ -118,7 +117,7 @@ module Hamlit
       when '=', '~'
         parse_script(scanner)
       else
-        parse_text(scanner)
+        parse_text(scanner, lstrip: true)
       end
     end
 

data/lib/hamlit/version.rb

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

data/spec/hamlit/engine/text_spec.rb

@@ -129,6 +129,24 @@ describe Hamlit::Engine do
         HTML
       end
 
+      it 'renders &, ! operator inside a tag' do
+        assert_render(<<-HAML, <<-HTML)
+          %span &nbsp;
+          %span&nbsp;
+          %span& nbsp;
+          %span !hello
+          %span!hello
+          %span! hello
+        HAML
+          <span>&nbsp;</span>
+          <span>nbsp;</span>
+          <span>nbsp;</span>
+          <span>!hello</span>
+          <span>hello</span>
+          <span>hello</span>
+        HTML
+      end
+
       it 'does not accept backslash operator' do
         assert_render(<<-'HAML', <<-'HTML')
           %span\    foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils