better_html 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ad9728944ffefd290a95bafdae8287daaabf06
-  data.tar.gz: fe451877b03af1bf86ce58906869682fb6c3d515
+  metadata.gz: 120de12348f0595aba1d9966e7643111a25e8ef8
+  data.tar.gz: 1d1dd0f4e7e572392e51aa38186bf9bc5973d96c
 SHA512:
-  metadata.gz: bc11cea71f259eb4a29240046210578901e02c6d60fb94aad47d8a1cc1bf2059f151e9e925d9bdceda62c3bf7813a2a5e8e6e1cd30bcc3c14d68cf5f2a4acb06
-  data.tar.gz: 4275b7bee8df693a25e2dd2a094e9bba1d1560f35cd046b357926a3203f489b40b7e230df6509ebcff9523fa3befa10839da5fa73ca6342e62cd675aa4d23039
+  metadata.gz: 3dcc692abe303950c191c74e3ed9b03481d13721416012ee7760e3b7b03830ef2199fc5d685200272d11fff02384f6394c926419b27243588d9b128981fb4ae4
+  data.tar.gz: 83e8cfdbce133bad899a7d4b079e25424f0673c36f6bff6d78577a4822473e0da10027bd9023277775babeee1f50dc2dcd84a4edffd115820a064f44aa4f2429

data/lib/better_html/parser.rb

@@ -143,6 +143,8 @@ module BetterHtml
           attributes_tokens << build_attribute_node(tokens)
         elsif tokens.current.type == :attribute_quoted_value_start
           attributes_tokens << build_nameless_attribute_node(tokens)
+        elsif tokens.current.type == :erb_begin
+          attributes_tokens << build_erb_node(tokens)
         else
           # todo: warn about ignored things
           tokens.shift

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

@@ -5,6 +5,12 @@ module BetterHtml
   module TestHelper
     module SafeErb
       class TagInterpolation < Base
+
+        NO_HTML_TAGS = %w(
+          title textarea script
+          style xmp iframe noembed noframes listing plaintext
+        )
+
         def validate
           @parser.nodes_with_type(:tag).each do |tag_node|
             tag = Tree::Tag.from_node(tag_node)
@@ -14,20 +20,20 @@ module BetterHtml
           end
 
           @parser.nodes_with_type(:text).each do |node|
-            validate_text_node(node) unless in_script_tag?(node)
+            validate_text_node(node) unless no_html_tag?(node)
           end
         end
 
         private
 
-        def in_script_tag?(node)
+        def no_html_tag?(node)
           ast = @parser.ast.to_a
           index = ast.find_index(node)
           return unless (previous_node = ast[index - 1])
           return unless previous_node.type == :tag
 
           tag = BetterHtml::Tree::Tag.from_node(previous_node)
-          tag.name == "script" && !tag.closing?
+          NO_HTML_TAGS.include?(tag.name) && !tag.closing?
         end
 
         def validate_attribute(attribute)

data/lib/better_html/test_helper/safe_erb_tester.rb

@@ -43,9 +43,11 @@ EOF
           SafeErb::NoStatements,
           SafeErb::AllowedScriptType,
           SafeErb::NoJavascriptTagHelper,
-          SafeErb::TagInterpolation,
           SafeErb::ScriptInterpolation,
         ]
+        if options[:template_language] == :html
+          tester_classes << SafeErb::TagInterpolation
+        end
 
         testers = tester_classes.map do |tester_klass|
           tester = tester_klass.new(parser)

data/lib/better_html/tree/attribute.rb

@@ -7,13 +7,17 @@ module BetterHtml
 
       def initialize(node)
         @node = node
-        @name_node, @equal_node, @value_node = *node
+        @name_node, @equal_node, @value_node = *node if @node.type == :attribute
       end
 
       def self.from_node(node)
         new(node)
       end
 
+      def erb?
+        @node.type == :erb
+      end
+
       def loc
         @node.loc
       end

data/lib/better_html/tree/tag.rb

@@ -4,7 +4,7 @@ require 'better_html/ast/iterator'
 module BetterHtml
   module Tree
     class Tag
-      attr_reader :node
+      attr_reader :node, :start_solidus, :name_node, :attributes_node, :end_solidus
 
       def initialize(node)
         @node = node

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/test/better_html/parser_test.rb

@@ -125,6 +125,29 @@ module BetterHtml
         )), tree.ast
     end
 
+    test "consume tag attributes with erb" do
+      tree = Parser.new("<div class=foo <%= erb %> name=bar>")
+      assert_equal s(:document,
+        s(:tag, nil,
+          s(:tag_name, "div"),
+          s(:tag_attributes,
+            s(:attribute,
+              s(:attribute_name, "class"),
+              s(:equal),
+              s(:attribute_value, "foo")
+            ),
+            s(:erb, s(:indicator, "="), nil,
+              s(:code, " erb "), nil),
+            s(:attribute,
+              s(:attribute_name, "name"),
+              s(:equal),
+              s(:attribute_value, "bar")
+            ),
+          ),
+          nil
+        )), tree.ast
+    end
+
     test "consume tag attributes nodes unquoted value" do
       tree = Parser.new("<div foo=bar>")
       assert_equal s(:document,

data/test/better_html/test_helper/safe_erb/tag_interpolation_test.rb

@@ -20,6 +20,14 @@ module BetterHtml
           assert_equal 0, errors.size
         end
 
+        test "raw in <style> tag" do
+          errors = validate(<<-EOF).errors
+            <style>@import url(<%= raw url_for("all.css") %>);</style>
+          EOF
+
+          assert_equal 0, errors.size
+        end
+
         test "html_safe in <script> tag" do
           errors = validate(<<-EOF).errors
             <script>var myData = <%= foo.to_json.html_safe %>;</script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast