haml_lint 0.57.0 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092e548aae63e23d9c6a5c3c11087590219e52792459ee548a5802503e80f6ec'
-  data.tar.gz: 120a88fbfb5b78e5d08724dffc9c7cf22292e391633c780da94161295ea745e0
+  metadata.gz: 15d3baf951722e2a699bc903a0848affa4a05b38939c67554e0410dfb9b817bb
+  data.tar.gz: d143ca9d7330ff3f4d7e32fa306be4a520258627f34b0ddd7536964ebdd45c05
 SHA512:
-  metadata.gz: 5123d876bb4b79d4fbf14fae8acef295993c909baaee63975f899571fe450cf67f503c761b2628ddb96874f39a4be51a8c489ddb94a87eb95034e3a05ba44431
-  data.tar.gz: 152d02d1daa2f51e9c0ddca5602d74642b324e860daa33aeec715ff4e2be297054abaf0d35dd9d15cfafcf15955bfce48823575643b18c4375707f172621eb66
+  metadata.gz: 85296a42fbb76f5033401ecd2825efafe5efad954ec2e312af2133a468afe1b92f1c95269a571cbfe9cc9366ecc244a257d7e3e4b756911c921820f7d181beb1
+  data.tar.gz: 90309db3dbfa97deb00561fd6479d82e14519fe3ba59bcc80da456731ab3c830afe389bd958df382748b3d0906fdde4a3c7abe110b99151d1be797e4e1cde63f

data/lib/haml_lint/adapter.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'haml_lint/adapter/haml_5'
-require 'haml_lint/adapter/haml_6'
-require 'haml_lint/exceptions'
+require_relative 'adapter/haml_5'
+require_relative 'adapter/haml_6'
+require_relative 'exceptions'
 
 module HamlLint
   # Determines the adapter to use for the current Haml version

data/lib/haml_lint/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'haml_lint'
-require 'haml_lint/options'
+require_relative '../haml_lint'
+require_relative 'options'
 
 require 'sysexits'
 

data/lib/haml_lint/document.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/adapter'
+require_relative 'adapter'
 
 module HamlLint
   # Represents a parsed Haml document and its associated metadata.

data/lib/haml_lint/extensions/haml_util_unescape_interpolation_tracking.rb

@@ -14,7 +14,7 @@ module Haml::Util
     Thread.current[:haml_lint_unescape_interpolation_to_original_cache] ||= {}
   end
 
-  # As soon as a HamlLint::Document has finished processing a HAML souce, this gets called to
+  # As soon as a HamlLint::Document has finished processing a HAML source, this gets called to
   # get a copy of this cache and clear up for the next HAML processing
   def self.unescape_interpolation_to_original_cache_take_and_wipe
     value = unescape_interpolation_to_original_cache.dup

data/lib/haml_lint/linter/empty_script.rb

@@ -6,7 +6,7 @@ module HamlLint
     include LinterRegistry
 
     def visit_silent_script(node)
-      return unless node.script =~ /\A\s*\Z/
+      return unless /\A\s*\Z/.match?(node.script)
 
       record_lint(node, 'Empty script should be removed')
     end

data/lib/haml_lint/linter/id_names.rb

@@ -24,7 +24,7 @@ module HamlLint
 
       style = config['style'] || 'lisp_case'
       matcher = STYLES[style]
-      record_lint(node, "`id` attribute must be in #{STYLIZED_NAMES[style]}") unless id =~ matcher
+      record_lint(node, "`id` attribute must be in #{STYLIZED_NAMES[style]}") unless id&.match?(matcher)
     end
   end
 end

data/lib/haml_lint/linter/indentation.rb

@@ -30,7 +30,7 @@ module HamlLint
       dummy_node = Struct.new(:line)
 
       document.source_lines.each_with_index do |line, index|
-        next if line =~ regex
+        next if line&.match?(regex)
 
         unless root.node_for_line(index).disabled?(self)
           record_lint dummy_node.new(index + 1), "Line contains #{wrong_characters} in indentation"

data/lib/haml_lint/linter/leading_comment_space.rb

@@ -8,7 +8,7 @@ module HamlLint
     def visit_haml_comment(node)
       # Skip if the node spans multiple lines starting on the second line,
       # or starts with a space
-      return if node.text =~ /\A#*(\s*|\s+\S.*)$/
+      return if /\A#*(\s*|\s+\S.*)$/.match?(node.text)
 
       record_lint(node, 'Comment should have a space after the `#`')
     end

data/lib/haml_lint/linter/rubocop.rb

@@ -117,7 +117,7 @@ module HamlLint
         # so the lints will be recorded then.
         @lints = []
 
-        msg = "Corrections couldn't be transfered: #{e.message} - Consider linting the file " \
+        msg = "Corrections couldn't be transferred: #{e.message} - Consider linting the file " \
               'without auto-correct and doing the changes manually.'
         if ENV['HAML_LINT_DEBUG'] == 'true'
           msg = "#{msg} DEBUG: Rubocop corrected Ruby code follows:\n#{new_ruby_code}\n------"

data/lib/haml_lint/linter/space_inside_hash_attributes.rb

@@ -27,8 +27,8 @@ module HamlLint
       style = STYLE[config['style'] == 'no_space' ? 'no_space' : 'space']
       source = node.hash_attributes_source
 
-      record_lint(node, style[:start_message]) unless source =~ style[:start_regex]
-      record_lint(node, style[:end_message]) unless source =~ style[:end_regex]
+      record_lint(node, style[:start_message]) unless source&.match?(style[:start_regex])
+      record_lint(node, style[:end_message]) unless source&.match?(style[:end_regex])
     end
   end
 end

data/lib/haml_lint/linter/tag_name.rb

@@ -7,7 +7,7 @@ module HamlLint
 
     def visit_tag(node)
       tag = node.tag_name
-      return unless tag =~ /[A-Z]/
+      return unless /[A-Z]/.match?(tag)
 
       record_lint(node, "`#{tag}` should be written in lowercase as `#{tag.downcase}`")
     end

data/lib/haml_lint/linter/trailing_whitespace.rb

@@ -9,7 +9,7 @@ module HamlLint
 
     def visit_root(root)
       document.source_lines.each_with_index do |line, index|
-        next unless line =~ /\s+$/
+        next unless /\s+$/.match?(line)
 
         node = root.node_for_line(index + 1)
         unless node.disabled?(self)

data/lib/haml_lint/linter/unnecessary_string_output.rb

@@ -22,7 +22,7 @@ module HamlLint
     def visit_script(node)
       # Some script nodes created by the HAML parser aren't actually script
       # nodes declared via the `=` marker. Check for it.
-      return if node.source_code !~ /\A\s*=/
+      return unless /\A\s*=/.match?(node.source_code)
 
       if outputs_string_literal?(node)
         record_lint(node, MESSAGE)

data/lib/haml_lint/linter.rb

@@ -37,7 +37,7 @@ module HamlLint
           :error
         )
     rescue StandardError => e
-      msg = "Couldn't process the file".dup
+      msg = +"Couldn't process the file"
       if @autocorrect
         # Those lints related to auto-correction were not saved, so don't display them
         @lints = []
@@ -231,7 +231,7 @@ module HamlLint
       # excess whitespace
       @document.source_lines[(tag_node.line - 1)...(following_node_line(tag_node) - 1)]
                .map do |line|
-        line.strip.gsub(/\|\z/, '').rstrip
+        line.strip.delete_suffix('|').rstrip
       end.join(' ')
     end
   end

data/lib/haml_lint/rake_task.rb

@@ -2,7 +2,8 @@
 
 require 'rake'
 require 'rake/tasklib'
-require 'haml_lint/constants'
+
+require_relative 'constants'
 
 module HamlLint
   # Rake task interface for haml-lint command line interface.
@@ -93,7 +94,7 @@ module HamlLint
 
       task(name, [:files]) do |_task, task_args|
         # Lazy-load so task doesn't affect Rakefile load time
-        require 'haml_lint/cli'
+        require_relative 'cli'
 
         run_cli(task_args)
       end

data/lib/haml_lint/reporter/default_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/utils'
+require_relative 'utils'
 
 module HamlLint
   # Outputs lints in a simple format with the filename, line number, and lint

data/lib/haml_lint/reporter/disabled_config_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/progress_reporter'
+require_relative 'progress_reporter'
 
 module HamlLint
   # Outputs a YAML configuration file based on existing violations.

data/lib/haml_lint/reporter/json_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/hash_reporter'
+require_relative 'hash_reporter'
 
 module HamlLint
   # Outputs report as a JSON document.

data/lib/haml_lint/reporter/progress_reporter.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-require 'haml_lint/reporter/utils'
+
+require_relative 'utils'
 
 module HamlLint
   # Outputs files as they are output as a simple symbol, then outputs

data/lib/haml_lint/reporter/utils.rb

@@ -96,7 +96,7 @@ module HamlLint
       # Prints a summary of the number of lints found in a report.
       #
       # @param report [HamlLint::Report] the report to print
-      # @param is_append [Boolean] if this is appending to a line. Will preffix with ", ".
+      # @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
       # @return [void]
       def print_summary_lints(report, is_append:)
         log.log ', ', false if is_append
@@ -114,7 +114,7 @@ module HamlLint
       # Prints a summary of the number of lints corrected in a report.
       #
       # @param report [HamlLint::Report] the report to print
-      # @param is_append [Boolean] if this is appending to a line. Will preffix with ", ".
+      # @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
       # @return [void]
       def print_summary_corrected_lints(report, is_append:)
         lint_count = report.lints.count(&:corrected)

data/lib/haml_lint/reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/hooks'
+require_relative 'reporter/hooks'
 
 module HamlLint
   # Abstract lint reporter. Subclass and override {#display_report} to

data/lib/haml_lint/ruby_extraction/base_chunk.rb

@@ -63,7 +63,7 @@ module HamlLint::RubyExtraction
       transfer_correction_logic(coordinator, to_ruby_lines, haml_lines)
     end
 
-    # To be overriden by subclasses.
+    # To be overridden by subclasses.
     #
     # Logic to transfer the corrections that turned from_ruby_lines into to_ruby_lines.
     #

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -17,6 +17,10 @@ module HamlLint::RubyExtraction
                              ::Haml::Parser.new('', {})
                            end
 
+    # HAML strips newlines when handling multi-line statements (using pipes or trailing comma)
+    # We don't. So the regex must be fixed to correctly detect the start of the string.
+    BLOCK_KEYWORD_REGEX = Regexp.new(Haml::Parser::BLOCK_KEYWORD_REGEX.source.sub('^', '\A'))
+
     def initialize(document, script_output_prefix:)
       @document = document
       @script_output_prefix = script_output_prefix
@@ -390,7 +394,7 @@ module HamlLint::RubyExtraction
         # is indented by 0.
         lines = node.text.split("\n")
         lines.map! do |line|
-          if line !~ /\S/
+          if !/\S/.match?(line)
             # whitespace or empty
             ''
           else
@@ -546,7 +550,7 @@ module HamlLint::RubyExtraction
       joined_lines = lines.join("\n")
 
       if haml_processed_ruby_code.include?("\n")
-        haml_processed_ruby_code = haml_processed_ruby_code.gsub("\n", ' ')
+        haml_processed_ruby_code = haml_processed_ruby_code.tr("\n", ' ')
       end
 
       haml_processed_ruby_code.split(/[, ]/)
@@ -674,7 +678,7 @@ module HamlLint::RubyExtraction
 
     def self.anonymous_block?(code)
       # Don't start with a comment and end with a `do`
-      # Definetly not perfect for the comment handling, but otherwise a more advanced parsing system is needed.
+      # Definitely not perfect for the comment handling, but otherwise a more advanced parsing system is needed.
       # Move the comment to its own line if it's annoying.
       code !~ /\A\s*#/ &&
         code =~ /\bdo\s*(\|[^|]*\|\s*)?(#.*)?\z/
@@ -692,7 +696,7 @@ module HamlLint::RubyExtraction
         return keyword
       end
 
-      return unless keyword = code.scan(Haml::Parser::BLOCK_KEYWORD_REGEX)[0]
+      return unless keyword = code.scan(BLOCK_KEYWORD_REGEX)[0]
       keyword[0] || keyword[1]
     end
   end

data/lib/haml_lint/ruby_extraction/non_ruby_filter_chunk.rb

@@ -14,7 +14,7 @@ module HamlLint::RubyExtraction
       to_content_lines = to_ruby_lines[1...-1]
 
       to_haml_lines = to_content_lines.map do |line|
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty
           ''
         else

data/lib/haml_lint/ruby_extraction/ruby_filter_chunk.rb

@@ -19,7 +19,7 @@ module HamlLint::RubyExtraction
       haml_lines[@haml_line_index - 1] = HamlLint::Utils.indent(haml_lines[@haml_line_index - 1], delta_indent)
 
       to_haml_lines = to_ruby_lines.map do |line|
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty
           ''
         else

data/lib/haml_lint/ruby_extraction/script_chunk.rb

@@ -113,7 +113,7 @@ module HamlLint::RubyExtraction
       line_start_indexes_that_need_pipes = []
       haml_output_prefix = first_output_haml_prefix
       to_haml_lines = to_ruby_lines.map.with_index do |line, i| # rubocop:disable Metrics/BlockLength
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty lines, we don't want any indentation
           ''
         elsif statement_start_line_indexes.include?(i)

data/lib/haml_lint/runner.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'parallel'
+
 require_relative 'source'
 
 module HamlLint

data/lib/haml_lint/spec/shared_rubocop_autocorrect_context.rb

@@ -74,7 +74,7 @@ module HamlLint
           current_matching_line = 1
           @source_map = {}
           lines.each.with_index do |line, i|
-            next unless line =~ /\S/
+            next unless /\S/.match?(line)
             mo = line.match(/^(.*?)\$?\s*\$\$(\d+)$/)
             if mo
               lines[i] = mo[1]

data/lib/haml_lint/spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/spec/normalize_indent'
-require 'haml_lint/spec/shared_linter_context'
-require 'haml_lint/spec/shared_rubocop_autocorrect_context'
-require 'haml_lint/spec/matchers/report_lint'
+require_relative 'spec/normalize_indent'
+require_relative 'spec/shared_linter_context'
+require_relative 'spec/shared_rubocop_autocorrect_context'
+require_relative 'spec/matchers/report_lint'

data/lib/haml_lint/tree/haml_comment_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/directive'
+require_relative '../directive'
 
 module HamlLint::Tree
   # Represents a HAML comment node.

data/lib/haml_lint/tree/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/comment_configuration'
+require_relative '../comment_configuration'
 
 module HamlLint::Tree
   # Decorator class that provides a convenient set of helpers for HAML's

data/lib/haml_lint/tree/root_node.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'haml_lint/tree/null_node'
+require_relative 'null_node'
 
 module HamlLint::Tree
   # Represents the root node of a HAML document that contains all other nodes.
   class RootNode < Node
-    # The name fo the file parsed to build this tree.
+    # The name of the file parsed to build this tree.
     #
     # @return [String] a file name
     def file

data/lib/haml_lint/tree/script_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/parsed_ruby'
+require_relative '../parsed_ruby'
 
 module HamlLint::Tree
   # Represents a node which produces output based on Ruby code.

data/lib/haml_lint/utils.rb

@@ -116,7 +116,7 @@ module HamlLint
 
     # Returns indexes of all occurrences of a substring within a string.
     #
-    # Note, this will not return overlaping substrings, so searching for "aa"
+    # Note, this will not return overlapping substrings, so searching for "aa"
     # in "aaa" will only find one substring, not two.
     #
     # @param text [String] the text to search

data/lib/haml_lint/version.rb

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

data/lib/haml_lint.rb

@@ -3,26 +3,26 @@
 # Need to load haml before we can reference some Haml modules in our code
 require 'haml'
 
-require 'haml_lint/constants'
-require 'haml_lint/exceptions'
-require 'haml_lint/configuration'
-require 'haml_lint/configuration_loader'
-require 'haml_lint/document'
-require 'haml_lint/haml_visitor'
-require 'haml_lint/lint'
-require 'haml_lint/linter_registry'
-require 'haml_lint/ruby_parser'
-require 'haml_lint/linter'
-require 'haml_lint/logger'
-require 'haml_lint/reporter'
-require 'haml_lint/report'
-require 'haml_lint/linter_selector'
-require 'haml_lint/file_finder'
-require 'haml_lint/runner'
-require 'haml_lint/utils'
-require 'haml_lint/version'
-require 'haml_lint/version_comparer'
-require 'haml_lint/severity'
+require_relative 'haml_lint/constants'
+require_relative 'haml_lint/exceptions'
+require_relative 'haml_lint/configuration'
+require_relative 'haml_lint/configuration_loader'
+require_relative 'haml_lint/document'
+require_relative 'haml_lint/haml_visitor'
+require_relative 'haml_lint/lint'
+require_relative 'haml_lint/linter_registry'
+require_relative 'haml_lint/ruby_parser'
+require_relative 'haml_lint/linter'
+require_relative 'haml_lint/logger'
+require_relative 'haml_lint/reporter'
+require_relative 'haml_lint/report'
+require_relative 'haml_lint/linter_selector'
+require_relative 'haml_lint/file_finder'
+require_relative 'haml_lint/runner'
+require_relative 'haml_lint/utils'
+require_relative 'haml_lint/version'
+require_relative 'haml_lint/version_comparer'
+require_relative 'haml_lint/severity'
 
 # Lead all extensions to external source code
 Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.each do |file|
@@ -30,8 +30,8 @@ Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.
 end
 
 # Load all parse tree node classes
-require 'haml_lint/tree/node'
-require 'haml_lint/node_transformer'
+require_relative 'haml_lint/tree/node'
+require_relative 'haml_lint/node_transformer'
 Dir[File.expand_path('haml_lint/tree/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
@@ -47,7 +47,7 @@ Dir[File.expand_path('haml_lint/reporter/*.rb', File.dirname(__FILE__))].sort.ea
 end
 
 # Load all the chunks for RubyExtraction
-require 'haml_lint/ruby_extraction/base_chunk'
+require_relative 'haml_lint/ruby_extraction/base_chunk'
 Dir[File.expand_path('haml_lint/ruby_extraction/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.59.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: HAML lint tool