ruby-merge 7.1.1 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b5dba95c151b6d6a08ae403679f78af429360fcd4b2a1e0c5ba023cfc5639e
-  data.tar.gz: cb85a47f7e47fbb0af358f69f8ce0503b790967f76aa04a0ad99282711cede45
+  metadata.gz: e110369618446503145375467571c154f6f20f6a9a9e2ea1aec9fc87c2557618
+  data.tar.gz: ec6e31d2f85b299976139c80f2dee4574d6ef70fb721bcb514b36eddd995a5a8
 SHA512:
-  metadata.gz: 830b7a910c65e024d2d160150c8efe01e0f2b1a9e789fde40b072d4bb45e0ffb60f1a6643f7d07c392661c8736af207da7a994651a35328660c478787316edcd
-  data.tar.gz: 48538e4ce4cb76543058e5a14fe94c8bc4bc3ed03f75d195c5e4d713d6e478d1e0ac4ffbf4307218a22f87918cc06ba647f4fc8037422d5fcb6a3aa89457f29a
+  metadata.gz: b15e47b8e03c0da7a237edb9826ea7c05d4cc7c510cbd9c6d31b32d0a4787a2510d869b86cf6bd7c9b9c836bdcd6d4a9b57a921bb679f74d9a665daac2730a4e
+  data.tar.gz: c69a81757def5610a400599c3fa9b3459557b5c88c09be084c37e240cdfa00a8d50f7909bf63cf1b30ccc34ab20890d6fa3c6d4d49bca747246340216c7e1b03

data/README.md

@@ -46,7 +46,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -122,20 +122,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -275,7 +267,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.989-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.006-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/ruby/merge/block_directive_detector.rb

@@ -7,6 +7,10 @@ module Ruby
     # This is Ruby-specific substrate behavior shared by Ruby parser providers.
     # Parser-specific gems may consume the spans and project them into their own
     # node types, but directive token semantics should live here.
+    # Directive scanning intentionally keeps the paired-stack validation in one
+    # class so every caller receives identical malformed-input diagnostics.
+    # rubocop:disable Metrics/AbcSize, Metrics/BlockLength, Metrics/ClassLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     class BlockDirectiveDetector
       Span = Struct.new(:kind, :start_line, :end_line, :open_marker, :close_marker, keyword_init: true)
 
@@ -174,9 +178,10 @@ module Ruby
             next if first_index == second_index || invalid_indices.include?(second_index)
             next unless crossing_spans?(first, second)
 
-            report_unbalanced("offset-overlapping #{first.kind} block " \
-              "(lines #{first.start_line}..#{first.end_line}) and #{second.kind} block " \
-              "(lines #{second.start_line}..#{second.end_line}) - both treated as plain comments")
+            report_unbalanced(
+              "offset-overlapping #{first.kind} block (lines #{first.start_line}..#{first.end_line}) and " \
+              "#{second.kind} block (lines #{second.start_line}..#{second.end_line}) - both treated as plain comments"
+            )
             invalid_indices.add(first_index)
             invalid_indices.add(second_index)
             crossing = true
@@ -190,8 +195,13 @@ module Ruby
       end
 
       def crossing_spans?(first, second)
-        (first.start_line < second.start_line && first.end_line > second.start_line && first.end_line < second.end_line) ||
-          (second.start_line < first.start_line && second.end_line > first.start_line && second.end_line < first.end_line)
+        first_crosses_second = first.start_line < second.start_line &&
+                               first.end_line > second.start_line &&
+                               first.end_line < second.end_line
+        second_crosses_first = second.start_line < first.start_line &&
+                               second.end_line > first.start_line &&
+                               second.end_line < first.end_line
+        first_crosses_second || second_crosses_first
       end
 
       def top_level_spans_only(spans)
@@ -204,5 +214,7 @@ module Ruby
         end
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/BlockLength, Metrics/ClassLength
   end
 end

data/lib/ruby/merge/doc_comment_support.rb

@@ -68,6 +68,9 @@ module Ruby
         nil
       end
 
+      # Example extraction deliberately combines tag scanning and body slicing
+      # so the returned indexes remain tied to the original comment entries.
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       def example_blocks(entries)
         normalized = entries.map { |entry| normalize_comment_content(entry[:raw]) }
         normalized.each_with_index.filter_map do |content, tag_index|
@@ -92,6 +95,7 @@ module Ruby
           }
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
     end
   end
 end

data/lib/ruby/merge/gemspec_support.rb

@@ -4,6 +4,7 @@ require_relative 'block_binding_support'
 
 module Ruby
   module Merge
+    # Shared gemspec block-variable normalization for Ruby templating.
     module GemspecSupport
       GEMSPEC_VAR_PLACEHOLDER = :__gemspec_var__
 

data/lib/ruby/merge/magic_comment_support.rb

@@ -3,6 +3,9 @@
 module Ruby
   module Merge
     # Ruby magic comment detection and file-header prefix handling.
+    # Header scanning intentionally preserves source order and duplicate entries
+    # because those details affect comment ownership during reconstruction.
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
     module MagicCommentSupport
       MAGIC_COMMENT_PATTERNS = {
         frozen_string_literal: /^frozen_string_literal:\s*(true|false)$/i,
@@ -124,5 +127,6 @@ module Ruby
         comment&.slice&.start_with?('#!')
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
   end
 end

data/lib/ruby/merge/method_similarity.rb

@@ -2,6 +2,11 @@
 
 module Ruby
   module Merge
+    # Computes stable name/parameter similarity scores for Ruby methods.
+    #
+    # The dynamic-programming distance calculation is intentionally kept local
+    # to this value object so the matching contract stays easy to audit.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     class MethodSimilarity
       DEFAULT_NAME_WEIGHT = 0.7
       DEFAULT_PARAMS_WEIGHT = 0.3
@@ -71,5 +76,6 @@ module Ruby
         previous_row[m]
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end

data/lib/ruby/merge/nocov_node_base.rb

@@ -7,6 +7,9 @@ module Ruby
     # Parser-specific merge gems subclass this when they need native AST location
     # or comment attachment behavior. The structural Ruby semantics live here:
     # nocov blocks follow file preference and match by their inner content.
+    # Nocov nodes preserve source locations and marker text as one structural
+    # unit; the initializer mirrors the node's complete serialized shape.
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/ParameterLists, Metrics/PerceivedComplexity
     class NocovNodeBase
       include Ast::Merge::BlockDirective
 
@@ -71,5 +74,6 @@ module Ruby
 
       alias to_s inspect
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/ParameterLists, Metrics/PerceivedComplexity
   end
 end

data/lib/ruby/merge/rescue_semantics.rb

@@ -2,6 +2,10 @@
 
 module Ruby
   module Merge
+    # Normalizes rescue clause ordering while preserving source-defined
+    # exception hierarchies and Ruby's broader-handler semantics.
+    # rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
     class RescueSemantics
       def initialize(source_defined_exception_definitions: [])
         @source_defined_exception_definitions = source_defined_exception_definitions
@@ -123,7 +127,11 @@ module Ruby
                               else
                                 candidate_name = qualify_source_constant_name(definition[:superclass],
                                                                               definition[:namespace])
-                                defined_names.include?(candidate_name) ? candidate_name : normalize_exception_name(definition[:superclass])
+                                if defined_names.include?(candidate_name)
+                                  candidate_name
+                                else
+                                  normalize_exception_name(definition[:superclass])
+                                end
                               end
 
             hierarchy[definition[:name]] ||= superclass_name if superclass_name
@@ -205,5 +213,7 @@ module Ruby
           !rescue_clause_covers?(right_clause_type, left_clause_type)
       end
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity
   end
 end

data/lib/ruby/merge/scaffold_chunk_support.rb

@@ -2,6 +2,7 @@
 
 module Ruby
   module Merge
+    # Shared chunk anchors used when preserving project-specific Rake sections.
     module ScaffoldChunkSupport
       ChunkSpec = Struct.new(
         :anchor_type,

data/lib/ruby/merge/signature_support.rb

@@ -2,6 +2,7 @@
 
 module Ruby
   module Merge
+    # Stable structural signatures used by Ruby owner and method matching.
     module SignatureSupport
       module_function
 

data/lib/ruby/merge/version.rb

@@ -5,7 +5,7 @@ module Ruby
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.1'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/ruby/merge.rb

@@ -17,6 +17,16 @@ require_relative 'merge/scaffold_chunk_support'
 require_relative 'merge/signature_support'
 
 module Ruby
+  # Public Ruby parser-family substrate for Structured Merge.
+  #
+  # The adapter deliberately keeps parser capability reporting, ownership
+  # discovery, merge planning, and source reconstruction together. Splitting
+  # those phases to satisfy generic size metrics would obscure the contract
+  # they implement and make provider behavior harder to audit.
+  # rubocop:disable Metrics/AbcSize, Metrics/BlockLength, Metrics/BlockNesting
+  # rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
+  # rubocop:disable Metrics/ModuleLength, Metrics/PerceivedComplexity
+  # rubocop:disable Style/MultilineBlockChain
   module Merge
     extend self
     include Ast::Merge::SourceRegionReportSupport
@@ -39,7 +49,11 @@ module Ruby
     REQUIRE_PATTERN = /^\s*require(?:_relative)?\s+["']([^"']+)["']/
     CLASS_PATTERN = /^\s*class\s+([A-Z]\w*(?:::\w+)*)/
     MODULE_PATTERN = /^\s*module\s+([A-Z]\w*(?:::\w+)*)/
-    DEF_PATTERN = %r{^\s*def\s+((?:self\.)?)([a-zA-Z_]\w*[!?=]?|\[\]=?|\+@|-@|\*\*|<<|>>|<=>|===|==|=~|!~|!=|[+\-*/%&|^<>]=?|[!~`])}
+    DEF_PATTERN = %r{
+      ^\s*def\s+
+      ((?:self\.)?)
+      ([a-zA-Z_]\w*[!?=]?|\[\]=?|\+@|-@|\*\*|<<|>>|<=>|===|==|=~|!~|!=|[+\-*/%&|^<>]=?|[!~`])
+    }x
     CONSTANT_ASSIGNMENT_PATTERN = /^(\s*)([A-Z]\w*)\s*=/
     CONSTANT_HASH_ASSIGNMENT_PATTERN = /^(\s*)([A-Z]\w*)\s*=\s*\{/
 
@@ -165,13 +179,16 @@ module Ruby
       template_methods = ruby_method_projection(template_source, revision: 'template')
       destination_methods = ruby_method_projection(destination_source, revision: 'destination')
       destination_by_signature = destination_methods.to_h { |entry| [entry[:signature], entry] }
-      template_signatures = template_methods.map { |entry| entry[:signature] }.to_h { |signature| [signature, true] }
+      template_signatures = template_methods
+                            .map { |entry| entry[:signature] }
+                            .to_h { |signature| [signature, true] }
 
       matches = template_methods.filter_map do |template_entry|
         destination_entry = destination_by_signature[template_entry[:signature]]
         next unless destination_entry
 
-        moved = template_entry[:index] != destination_entry[:index] || template_entry[:parent_path] != destination_entry[:parent_path]
+        moved = template_entry[:index] != destination_entry[:index] ||
+                template_entry[:parent_path] != destination_entry[:parent_path]
         Ast::Merge::MoveDetectionMatch.new(
           from_path: template_entry[:path],
           to_path: destination_entry[:path],
@@ -184,7 +201,13 @@ module Ruby
           from_index: template_entry[:index],
           to_index: destination_entry[:index],
           confidence: moved ? 0.98 : 0.9,
-          diagnostics: [moved ? 'same Ruby method signature observed at a different sibling position' : 'same Ruby method signature observed at the same sibling position']
+          diagnostics: [
+            if moved
+              'same Ruby method signature observed at a different sibling position'
+            else
+              'same Ruby method signature observed at the same sibling position'
+            end
+          ]
         )
       end
 
@@ -207,7 +230,9 @@ module Ruby
         unmatched_to: destination_methods.reject do |entry|
           template_signatures[entry[:signature]]
         end.map { |entry| entry[:path] },
-        diagnostics: ['Ruby method move detection uses generic move-detection matching over receiver-aware method projections']
+        diagnostics: [
+          'Ruby method move detection uses generic move-detection matching over receiver-aware method projections'
+        ]
       ).to_h
     end
 
@@ -242,12 +267,15 @@ module Ruby
       template_declarations_by_key = template_declarations.to_h { |entry| [entry[:merge_key], entry] }
       intra_owner_merges = ruby_intra_owner_merge_plan(template_declarations, destination_declarations)
       namespace_conflicts = ruby_namespace_form_conflicts(template_declarations, destination_declarations)
-      unless namespace_conflicts.empty? || TreeHaver::BackendRegistry.tag_available?(:tslp_ruby_namespace_form_equivalence)
+      namespace_equivalence_available = TreeHaver::BackendRegistry.tag_available?(
+        :tslp_ruby_namespace_form_equivalence
+      )
+      unless namespace_conflicts.empty? || namespace_equivalence_available
         conflicts = namespace_conflicts.join(', ')
         return unsupported_feature_result(
           'ruby-merge cannot reconcile equivalent Ruby namespace declaration forms with the active TSLP records: ' \
-          "#{conflicts}. Use prism-merge for native Ruby merging, or report missing Ruby namespace ownership " \
-          'records to tree-sitter-language-pack.'
+          "#{conflicts}. Use a native Ruby provider for native Ruby merging, or report missing Ruby namespace " \
+          'ownership records to tree-sitter-language-pack.'
         )
       end
       if !namespace_conflicts.empty? && TreeHaver::BackendRegistry.tag_available?(:tslp_ruby_namespace_form_equivalence)
@@ -423,7 +451,8 @@ module Ruby
           {
             severity: 'info',
             category: 'source_owner_identity_matching',
-            message: 'Ruby source-owner matching reports confidence per match and uses ordered structural pairing for duplicate identities.'
+            message: 'Ruby source-owner matching reports confidence per match and uses ordered structural pairing ' \
+                     'for duplicate identities.'
           }
         ]
       }
@@ -647,7 +676,11 @@ module Ruby
           {
             severity: owners_preserved ? 'info' : 'error',
             category: owners_preserved ? 'formatter_adapter_accepted' : 'formatter_adapter_rejected',
-            message: owners_preserved ? 'Ruby formatter adapter preserved owner identity, conflict scope, and validation semantics.' : 'Ruby formatter adapter changed owner identity and cannot be accepted as a semantic merge.'
+            message: if owners_preserved
+                       'Ruby formatter adapter preserved owner identity, conflict scope, and validation semantics.'
+                     else
+                       'Ruby formatter adapter changed owner identity and cannot be accepted as a semantic merge.'
+                     end
           }
         ]
       }
@@ -693,7 +726,12 @@ module Ruby
           {
             severity: reconstruction_risk ? 'warning' : 'info',
             category: reconstruction_risk ? 'ast_node_reconstruction_risk' : 'ast_node_merge_candidate',
-            message: reconstruction_risk ? 'Ruby AST-node merge candidate has ambiguous whitespace, comment, or marker reconstruction boundaries.' : 'Ruby AST-node merge candidate can be considered when owner-level fallback would be too blunt.'
+            message: if reconstruction_risk
+                       'Ruby AST-node merge candidate has ambiguous whitespace, comment, or marker ' \
+                       'reconstruction boundaries.'
+                     else
+                       'Ruby AST-node merge candidate can be considered when owner-level fallback would be too blunt.'
+                     end
           }
         ]
       }
@@ -815,7 +853,12 @@ module Ruby
           {
             severity: widened ? 'error' : 'info',
             category: widened ? 'fallback_scope_widening_rejected' : 'fallback_scope_accepted',
-            message: widened ? "Ruby fallback cannot widen from #{declared_scope} to #{requested_scope} without an explicit policy." : 'Ruby fallback scope is within the declared policy.'
+            message: if widened
+                       "Ruby fallback cannot widen from #{declared_scope} to #{requested_scope} without an " \
+                       'explicit policy.'
+                     else
+                       'Ruby fallback scope is within the declared policy.'
+                     end
           }
         ]
       }
@@ -956,7 +999,8 @@ module Ruby
                          {
                            severity: 'info',
                            category: 'ruby_rename_detection',
-                           message: 'Ruby rename detection is explicit and reports clean same-parent method renames by normalized body hash.'
+                           message: 'Ruby rename detection is explicit and reports clean same-parent method renames ' \
+                                    'by normalized body hash.'
                          }
                        ]
                      end,
@@ -1061,7 +1105,8 @@ module Ruby
                          {
                            severity: 'info',
                            category: 'ruby_cross_container_method_move',
-                           message: 'Ruby detected same-signature method movement across containers while preserving destination order.'
+                           message: 'Ruby detected same-signature method movement across containers while preserving ' \
+                                    'destination order.'
                          }
                        ]
                      end
@@ -1162,7 +1207,13 @@ module Ruby
       execution = Array(replay_bundle[:reviewed_nested_executions]).find { |entry| entry[:family] == 'ruby' }
       unless execution
         return { ok: false,
-                 diagnostics: [{ severity: 'error', category: 'configuration_error', message: 'review replay bundle does not include a reviewed nested execution for ruby.' }], policies: [] }
+                 diagnostics: [
+                   {
+                     severity: 'error',
+                     category: 'configuration_error',
+                     message: 'review replay bundle does not include a reviewed nested execution for ruby.'
+                   }
+                 ], policies: [] }
       end
 
       merge_ruby_with_reviewed_nested_outputs(
@@ -1179,7 +1230,13 @@ module Ruby
       execution = Array(review_state[:reviewed_nested_executions]).find { |entry| entry[:family] == 'ruby' }
       unless execution
         return { ok: false,
-                 diagnostics: [{ severity: 'error', category: 'configuration_error', message: 'review state does not include a reviewed nested execution for ruby.' }], policies: [] }
+                 diagnostics: [
+                   {
+                     severity: 'error',
+                     category: 'configuration_error',
+                     message: 'review state does not include a reviewed nested execution for ruby.'
+                   }
+                 ], policies: [] }
       end
 
       merge_ruby_with_reviewed_nested_outputs(
@@ -1196,7 +1253,9 @@ module Ruby
       replay_bundle, import_error = Ast::Merge.import_review_replay_bundle_envelope(envelope)
       if import_error
         return { ok: false,
-                 diagnostics: [{ severity: 'error', category: import_error[:category], message: import_error[:message] }], policies: [] }
+                 diagnostics: [
+                   { severity: 'error', category: import_error[:category], message: import_error[:message] }
+                 ], policies: [] }
       end
 
       merge_ruby_with_reviewed_nested_outputs_from_replay_bundle(
@@ -1212,7 +1271,9 @@ module Ruby
       review_state, import_error = Ast::Merge.import_conformance_manifest_review_state_envelope(envelope)
       if import_error
         return { ok: false,
-                 diagnostics: [{ severity: 'error', category: import_error[:category], message: import_error[:message] }], policies: [] }
+                 diagnostics: [
+                   { severity: 'error', category: import_error[:category], message: import_error[:message] }
+                 ], policies: [] }
       end
 
       merge_ruby_with_reviewed_nested_outputs_from_review_state(
@@ -1515,7 +1576,9 @@ module Ruby
       unsupported_lines = ruby_tslp_unsupported_top_level_lines(source, process_analysis)
       unless unsupported_lines.empty?
         return unsupported_feature_result(
-          "ruby-merge can only merge TSLP-record-backed top-level Ruby declarations and imports; #{role} has unsupported top-level content on line(s) #{unsupported_lines.join(', ')}. Use prism-merge for native Ruby merging, or report missing Ruby process records to tree-sitter-language-pack."
+          "ruby-merge can only merge TSLP-record-backed top-level Ruby declarations and imports; #{role} has " \
+          "unsupported top-level content on line(s) #{unsupported_lines.join(', ')}. Use a native Ruby provider " \
+          'for native Ruby merging, or report missing Ruby process records to tree-sitter-language-pack.'
         )
       end
 
@@ -1966,13 +2029,16 @@ module Ruby
           severity: 'warning',
           category: 'ruby_method_shadowing',
           path: "#{entry[:owner_path]}/methods/#{entry[:method_signature]}",
-          message: "Ruby method #{entry[:method_signature]} is defined #{entry[:shadowed_count] + 1} times in #{entry[:owner_path]}; the last definition shadows earlier definitions."
+          message: "Ruby method #{entry[:method_signature]} is defined #{entry[:shadowed_count] + 1} times in " \
+                   "#{entry[:owner_path]}; the last definition shadows earlier definitions."
         }
       end
     end
 
     def direct_method_shadowing(declaration_entry)
-      grouped = direct_body_method_entries(declaration_entry[:text]).each_with_index.group_by do |(method_entry, _index)|
+      grouped = direct_body_method_entries(declaration_entry[:text])
+                .each_with_index
+                .group_by do |(method_entry, _index)|
         method_entry[:signature]
       end
 
@@ -2097,9 +2163,8 @@ module Ruby
       template_match = template_text.match(/\A(\s*[A-Z]\w*\s*=\s*)\[(.*)\]\z/)
       destination_match = destination_text.match(/\A(\s*[A-Z]\w*\s*=\s*)\[(.*)\]\z/)
       unless template_match && destination_match
-        return merge_percent_array_constant_text(template_text,
-                                                 destination_text) || merge_multiline_array_constant_text(template_text,
-                                                                                                          destination_text)
+        return merge_percent_array_constant_text(template_text, destination_text) ||
+               merge_multiline_array_constant_text(template_text, destination_text)
       end
 
       destination_elements = split_ruby_array_elements(destination_match[2])
@@ -2276,7 +2341,11 @@ module Ruby
         if declaration
           start_index = pending_comments.first || index
           finish_index = ruby_block_finish_index(lines, index)
-          address = declaration[:kind] == 'def' ? "/methods/#{declaration[:name]}" : "/declarations/#{declaration[:name]}"
+          address = if declaration[:kind] == 'def'
+                      "/methods/#{declaration[:name]}"
+                    else
+                      "/declarations/#{declaration[:name]}"
+                    end
           owner = {
             region_id: "#{declaration[:kind] == 'def' ? 'method' : 'declaration'}:#{declaration[:name]}",
             region_kind: 'owner',
@@ -2290,8 +2359,9 @@ module Ruby
             declaration_span: source_report_line_span(index, finish_index),
             content: source_report_region_content(lines, start_index, finish_index)
           }
-          owner[:child_regions] = container_child_source_regions(lines, declaration, index, finish_index) if %w[class
-                                                                                                                module].include?(declaration[:kind])
+          if %w[class module].include?(declaration[:kind])
+            owner[:child_regions] = container_child_source_regions(lines, declaration, index, finish_index)
+          end
           attached_comments = source_attached_comment_regions_for_report(
             lines: lines,
             start_index: start_index,
@@ -2389,6 +2459,7 @@ module Ruby
     RubyHashPair = Struct.new(:key, :key_source, :delimiter, :value, keyword_init: true)
     RubyScalarNode = Struct.new(:source, keyword_init: true)
 
+    # Projects Ruby hash literals into source-preserving merge nodes.
     class RubyHashLiteralProjector
       def initialize(source)
         @source = source.to_s
@@ -3139,6 +3210,10 @@ module Ruby
       :collect_ruby_declaration_entries,
       :unsupported_feature_result
     )
+    # rubocop:enable Style/MultilineBlockChain
+    # rubocop:enable Metrics/ModuleLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/BlockLength, Metrics/BlockNesting
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Tree-sitter-backed Ruby family substrate for Structured Merge."
 email:
 - floss@galtzo.com
@@ -317,10 +317,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ruby-merge/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/ruby-merge/7.1.4
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ruby-merge