haml_lint 0.72.0 → 0.74.0

data/lib/haml_lint/tree/tag_node.rb

@@ -33,6 +33,16 @@ module HamlLint::Tree
       @value[:parse] && !@value[:value].strip.empty?
     end
 
+    # Whether this tag outputs unescaped HTML via a `!` marker, e.g. `%tag!=` or
+    # `%tag!~`.
+    #
+    # @return [true,false]
+    def unescape_html?
+      return false unless contains_script?
+
+      /\A\s*[<>]*\s*!/.match?(inline_marker_source)
+    end
+
     # Returns whether this tag has a specified attribute.
     #
     # @return [true,false]
@@ -94,30 +104,18 @@ module HamlLint::Tree
     #
     # @return [Hash]
     def attributes_source
-      @attributes_source ||=
-        begin
-          _explicit_tag, static_attrs, rest =
-            source_code.scan(/\A\s*(%[-:\w]+)?([-:\w.\#]*)(.*)/m)[0]
-
-          attr_types = {
-            '{' => [:hash, %w[{ }]],
-            '(' => [:html, %w[( )]],
-            '[' => [:object_ref, %w[[ ]]],
-          }
-
-          attr_source = { static: static_attrs }
-          while rest
-            type, chars = attr_types[rest[0]]
-            break unless type # Not an attribute opening character, so we're done
-
-            # Can't define multiple of the same attribute type (e.g. two {...})
-            break if attr_source[type]
-
-            attr_source[type], rest = Haml::Util.balance(rest, *chars)
-          end
+      parsed_attributes_source[:attributes]
+    end
 
-          attr_source
-        end
+    # Source that follows the tag name and attributes. It begins with the
+    # content marker (e.g. `=`, `!=`, `~`, `!~`, or plain text).
+    #
+    # @example For `%tag.class!= foo`, this returns:
+    #   '!= foo'
+    #
+    # @return [String]
+    def inline_marker_source
+      parsed_attributes_source[:marker]
     end
 
     # Whether this tag node has a set of hash attributes defined via the
@@ -229,6 +227,40 @@ module HamlLint::Tree
 
     private
 
+    # Parses the source code following the tag name once into its attribute
+    # sources and the remaining inline content marker.
+    #
+    # @return [Hash{Symbol => Object}] `:attributes` source hash (keyed by
+    #   `:static`/`:hash`/`:html`/`:object_ref`) and the `:marker` string
+    def parsed_attributes_source
+      @parsed_attributes_source ||=
+        begin
+          _explicit_tag, static_attrs, rest =
+            source_code.scan(/\A\s*(%[-:\w]+)?([-:\w.\#]*)(.*)/m)[0]
+
+          attr_types = {
+            '{' => [:hash, %w[{ }]],
+            '(' => [:html, %w[( )]],
+            '[' => [:object_ref, %w[[ ]]],
+          }
+
+          attr_source = { static: static_attrs }
+          while rest
+            type, chars = attr_types[rest[0]]
+            break unless type # Not an attribute opening character, so we're done
+
+            # Can't define multiple of the same attribute type (e.g. two {...})
+            break if attr_source[type]
+
+            attr_source[type], rest = Haml::Util.balance(rest, *chars)
+          end
+
+          # Whatever remains after the tag name and attributes begins with the
+          # content marker (e.g. `=`, `!=`, `~`, `!~`, or plain text).
+          { attributes: attr_source, marker: rest.to_s }
+        end
+    end
+
     def existing_attributes
       parsed_attrs = parsed_attributes
       return {} unless parsed_attrs.respond_to?(:children)

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.72.0'
+  VERSION = '0.74.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.74.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -27,14 +27,14 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
@@ -138,6 +138,7 @@ files:
 - lib/haml_lint/linter/tag_name.rb
 - lib/haml_lint/linter/trailing_empty_lines.rb
 - lib/haml_lint/linter/trailing_whitespace.rb
+- lib/haml_lint/linter/unescaped_html.rb
 - lib/haml_lint/linter/unnecessary_interpolation.rb
 - lib/haml_lint/linter/unnecessary_string_output.rb
 - lib/haml_lint/linter/view_length.rb
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: HAML lint tool
 test_files: []