better_html 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf85413b0af66cc73a928d1b37c0ba104c848ae
-  data.tar.gz: e934a9efa924f0647128517985f66d4dbd97f0de
+  metadata.gz: dc67cce938ef29fb5f95f18d17e4c5be3f94013a
+  data.tar.gz: 01b068c022c1ecb3057cdced0f4a4841e50e341e
 SHA512:
-  metadata.gz: eb4ecf3184328d0388000db860f9126edad2e4a438c6c97623dbd29776d8f6a623fcbc5a24989c5fe47f0a92617eb0222738e28e5cae732d403a3bb805d3eb99
-  data.tar.gz: 5843b4928f2983d53e36e44053423b21286daf6b20cc1d7d5ddab3e3ceffe5f3c16f71a6849205732cd4c9e8776e4d86c299ca1603751da5a4056044eb653369
+  metadata.gz: 222276cb0ffab3e5cd1dbaf9d05bf342f2e43ce2f39fd603bbbe7af93a7786780466eeb4c1f0568432a99399cc739b4a66e9d1b8a2603025f1cfac2cc2ac4789
+  data.tar.gz: ab87770d24442d8b175efdf07d1d2856053fcd1107a3ee2104037212c5b2833d6855d7ea86d2f9d14797894d4fafed0b12cd8da85f3d3dc7c683f3d7fced52d3

data/lib/better_html/tokenizer/base_erb.rb

@@ -6,7 +6,7 @@ require 'parser/source/buffer'
 module BetterHtml
   module Tokenizer
     class BaseErb < ::Erubi::Engine
-      REGEXP_WITHOUT_TRIM = /<%(={1,2}|%)?(.*?)()?%>([ \t]*\r?\n)?/m
+      REGEXP_WITHOUT_TRIM = /<%(={1,2})?(.*?)()?%>([ \t]*\r?\n)?/m
       STMT_TRIM_MATCHER = /\A(-|#)?(.*?)([-=])?\z/m
       EXPR_TRIM_MATCHER = /\A(.*?)(-)?\z/m
 
@@ -28,11 +28,15 @@ module BetterHtml
       end
 
       def add_code(code)
-        _, ltrim_or_comment, code, rtrim = *STMT_TRIM_MATCHER.match(code)
-        ltrim = ltrim_or_comment if ltrim_or_comment == '-'
-        indicator = ltrim_or_comment if ltrim_or_comment == '#'
-        add_erb_tokens(ltrim, indicator, code, rtrim)
-        append("<%#{ltrim}#{indicator}#{code}#{rtrim}%>")
+        if code[0] == '%'
+          add_text("<%#{code}%>")
+        else
+          _, ltrim_or_comment, code, rtrim = *STMT_TRIM_MATCHER.match(code)
+          ltrim = ltrim_or_comment if ltrim_or_comment == '-'
+          indicator = ltrim_or_comment if ltrim_or_comment == '#'
+          add_erb_tokens(ltrim, indicator, code, rtrim)
+          append("<%#{ltrim}#{indicator}#{code}#{rtrim}%>")
+        end
       end
 
       def add_expression(indicator, code)

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/test/better_html/tokenizer/html_erb_test.rb

@@ -150,6 +150,23 @@ module BetterHtml
         assert_attributes ({ type: :text, loc: { line: 3, source: "after" } }), scanner.tokens[6]
       end
 
+      test "escaped opening ERB tag <%%" do
+        scanner = HtmlErb.new(buffer("just some <%%= text %> no erb"))
+        assert_equal 11, 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]
+      end
+
       private
 
       def assert_attributes(attributes, token)

metadata

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