better_html 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '059cd51e9cb5795f9069af7f645bfd38a595ab37'
-  data.tar.gz: a123b84e38a23923558c8d2c116e4f85dd779328
+  metadata.gz: 5a62a4416eaa383372a21c1b8f90494d681ad7ca
+  data.tar.gz: bf03706d26596c0b03bec716d2b55f35324221b3
 SHA512:
-  metadata.gz: ae4b109983ee2b1a1e13b4ad061dae11aa52be470918cd9746f7b49a38f081a28322f73bc198da9f9d3fd8cd3daa266589fd0aad5613a0c0150f5f48b705c60f
-  data.tar.gz: acb00111001a7deb8a41ecbdcf103daa8d450e4f8cdfbce0c343bd3a9f5081952210b333a4ef355beeb4d3f9a5225db0aeb49ae0df5680b557f8ee98d5df5518
+  metadata.gz: 8ede71b45ba3cc636f1d77e76eab6e22eb539014a4fe049e9f91796bb3efc7c8c8d6629f6b2cb8f6a80738a26a892d39341b0c578b28d222a353b945f18266ac
+  data.tar.gz: 788384054b7e79a080dda17b7cbb3658e14ba1034849ca855fe9e144ac47126246631984ab509c986515e82a063133a647bf94b5f3986b0b3bf8aebb40ffbeaf

data/lib/better_html/test_helper/safe_erb/no_javascript_tag_helper.rb

@@ -14,7 +14,7 @@ module BetterHtml
         def no_javascript_tag_helper(node)
           erb_nodes(node).each do |erb_node, indicator_node, code_node|
             indicator = indicator_node&.loc&.source
-            next if indicator == '#'
+            next if indicator == '#' || indicator == '%'
             source = code_node.loc.source
 
             ruby_node = begin

data/lib/better_html/test_helper/safe_erb/script_interpolation.rb

@@ -25,7 +25,7 @@ module BetterHtml
           erb_nodes(node).each do |erb_node, indicator_node, code_node|
             next unless indicator_node.present?
             indicator = indicator_node.loc.source
-            next if indicator == '#'
+            next if indicator == '#' || indicator == '%'
             source = code_node.loc.source
 
             ruby_node = begin

data/lib/better_html/test_helper/safe_erb/tag_interpolation.rb

@@ -67,7 +67,7 @@ module BetterHtml
         def validate_text_node(text_node)
           erb_nodes(text_node).each do |erb_node, indicator_node, code_node|
             indicator = indicator_node&.loc&.source
-            next if indicator == '#'
+            next if indicator == '#' || indicator == '%'
             source = code_node.loc.source
 
             ruby_node = begin

data/lib/better_html/tokenizer/base_erb.rb

@@ -29,7 +29,8 @@ module BetterHtml
 
       def add_code(code)
         if code[0] == '%'
-          add_text("<%#{code}%>")
+          add_erb_tokens(nil, '%', code[1..-1], nil)
+          append("<%#{code}%>")
         else
           _, ltrim_or_comment, code, rtrim = *STMT_TRIM_MATCHER.match(code)
           ltrim = ltrim_or_comment if ltrim_or_comment == '-'

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/test/better_html/tokenizer/html_erb_test.rb

@@ -152,19 +152,14 @@ module BetterHtml
 
       test "escaped opening ERB tag <%%" do
         scanner = HtmlErb.new(buffer("just some <%%= text %> no erb"))
-        assert_equal 11, scanner.tokens.size
+        assert_equal 6, scanner.tokens.size
 
         assert_attributes ({ type: :text, loc: { line: 1, source: "just some " } }), scanner.tokens[0]
-        assert_attributes ({ type: :tag_start, loc: { line: 1, source: '<' } }), scanner.tokens[1]
-        assert_attributes ({ type: :tag_name, loc: { line: 1, source: '%%=' } }), scanner.tokens[2]
-        assert_attributes ({ type: :whitespace, loc: { line: 1, source: " " } }), scanner.tokens[3]
-        assert_attributes ({ type: :attribute_name, loc: { line: 1, source: "text" } }), scanner.tokens[4]
-        assert_attributes ({ type: :whitespace, loc: { line: 1, source: " " } }), scanner.tokens[5]
-        assert_attributes ({ type: :malformed, loc: { line: 1, source: "%>" } }), scanner.tokens[6]
-        assert_attributes ({ type: :whitespace, loc: { line: 1, source: " " } }), scanner.tokens[7]
-        assert_attributes ({ type: :attribute_name, loc: { line: 1, source: "no" } }), scanner.tokens[8]
-        assert_attributes ({ type: :whitespace, loc: { line: 1, source: " " } }), scanner.tokens[9]
-        assert_attributes ({ type: :attribute_name, loc: { line: 1, source: "erb" } }), scanner.tokens[10]
+        assert_attributes ({ type: :erb_begin, loc: { line: 1, source: '<%' } }), scanner.tokens[1]
+        assert_attributes ({ type: :indicator, loc: { line: 1, source: "%" } }), scanner.tokens[2]
+        assert_attributes ({ type: :code, loc: { line: 1, source: "= text " } }), scanner.tokens[3]
+        assert_attributes ({ type: :erb_end, loc: { line: 1, source: "%>" } }), scanner.tokens[4]
+        assert_attributes ({ type: :text, loc: { line: 1, source: " no erb" } }), scanner.tokens[5]
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast