hamlit 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be0ee09a4585d8c871901afad043298e8eae2bc
-  data.tar.gz: f1a8f5bbbdaa2994e209a959b4ba2a1162c76317
+  metadata.gz: 48c63183e137f6ac95b74b18913665a72dd93a10
+  data.tar.gz: aa406f516907e362b2f1746636ed9c06b5c81d92
 SHA512:
-  metadata.gz: e2e3d51b40f28322634436597711f45d3dade9c5ad252302fb593bda6996bf27c8ab2b1b644054971606e5c79627a4df4768d4745987272597dec0e814b6b77b
-  data.tar.gz: a3f96912395ad6b3ec047ae332e202b72c385fc28af8dcd7fac35488ba66175ca453ae2286a98b22afaf98dfa4d3132c3aedd22a0a8e73e34ee97e8aee26d835
+  metadata.gz: dd0f4d8ca9147def6ea19af310e42ef000626da8b08346644d47ffd38d30b894d6150837ed2a065e141a1b81db6525f6fc184a5dc542cf3653858a96914e5d9d
+  data.tar.gz: fdc76ab6d2b810b8c8b0b7c284bb36fefadbcba42cedd9fc1371bc26b96133342f157945827a7ae821213afdf31c28671954be054f0db8b4bbba81a987377104

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.4.2
+
+- Support `!` operator
+  - It disables html escaping for interpolated text
+
 ## v1.4.1
 
 - Fix code mistake in 1.4.0
@@ -17,7 +22,7 @@
 
 ## v1.3.0
 
-- Resurrect escape_html option
+- Resurrect escape\_html option
   - Still enabled by default
   - This has been dropped since v0.6.0
   - https://github.com/k0kubun/hamlit/issues/25

data/lib/hamlit/compilers/old_attribute.rb

@@ -152,11 +152,7 @@ module Hamlit
         splitted  = []
         start_pos = 1
         columns.each do |end_pos|
-          if str.ascii_only?
-            splitted << str[start_pos..(end_pos - 1)]
-          else
-            splitted << str.unpack("C*")[start_pos..(end_pos - 1)].pack("C*").force_encoding('utf-8')
-          end
+          splitted << str.byteslice(start_pos...end_pos)
           start_pos = end_pos + 1
         end
 

data/lib/hamlit/compilers/text.rb

@@ -19,7 +19,7 @@ module Hamlit
 
       # Return static and dynamic temple ast.
       # It splits expression to optimize because string interpolation is slow.
-      def on_haml_text(exp)
+      def on_haml_text(exp, escape_html = true)
         return static_text(exp) unless contains_interpolation?(exp)
 
         marker = find_string_marker(exp)
@@ -31,7 +31,9 @@ module Hamlit
         pre  = exp.byteslice(0...open_pos)
         body = exp.byteslice((open_pos + 2)...close_pos)
         post = exp.byteslice((close_pos + 1)...exp.bytesize)
-        [:multi, [:static, pre], escape_html([:dynamic, body]), on_haml_text(post)]
+
+        body_ast = escape_html ? escape_html([:dynamic, body]) : [:dynamic, body]
+        [:multi, [:static, pre], body_ast, on_haml_text(post)]
       end
 
       def find_interpolation(exp, marker)

data/lib/hamlit/parser.rb

@@ -87,15 +87,17 @@ module Hamlit
         return parse_text(scanner)
       elsif scanner.match?(/&=/)
         return parse_script(scanner, force_escape: true)
+      elsif scanner.match?(/!!!/)
+        return parse_doctype(scanner)
       elsif scanner.match?(/!=/)
         return parse_script(scanner, disable_escape: true)
+      elsif scanner.match?(/! /)
+        return parse_unescaped_text(scanner)
       elsif scanner.match?(/[.#](\Z|[^a-zA-Z0-9_-])/)
         return parse_text(scanner)
       end
 
       case scanner.peek(1)
-      when '!'
-        parse_doctype(scanner)
       when '%', '.', '#'
         parse_tag(scanner)
       when '=', '~'

data/lib/hamlit/parsers/text.rb

@@ -1,11 +1,23 @@
+require 'hamlit/concerns/error'
+
 module Hamlit
   module Parsers
     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(/ +/)
+
+        text = (scanner.scan(/.+/) || '')
+        [:haml, :text, text, false]
+      end
     end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/hamlit/engine/text_spec.rb

@@ -43,6 +43,22 @@ describe Hamlit::Engine do
       expect(render_string('\       a')).to eq("       a\n")
     end
 
+    it 'renders ! operator' do
+      assert_render(<<-'HAML', <<-HTML)
+        aaa#{'<a>'}
+        !aaa#{'<a>'}
+        ! aaa#{'<a>'}
+        !  aaa#{'<a>'}
+        !!aa
+      HAML
+        aaa&lt;a&gt;
+        !aaa&lt;a&gt;
+        aaa<a>
+        aaa<a>
+        !!aa
+      HTML
+    end
+
     describe 'string interpolation' do
       specify { assert_render('#{}', "\n") }
       specify { assert_render('1#{}', "1\n") }

metadata

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