toml-merge 7.1.7 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed315a97e4d4f5ea69beffaeec7c2a9d1dc5b1caa1c932d3c88f761e907c2a0
-  data.tar.gz: 1514f67967281578ded978606d006dee3aceabc200a1a437a5f1a129ad1c6fd2
+  metadata.gz: 1810796834272f3e3423cbb775fd038edb68d0517db5c363934accd3a4dcf3f9
+  data.tar.gz: b043c07b8a37a470451fd1f5a5eae6aa295f431ebdd197a20528ae1913f5ace3
 SHA512:
-  metadata.gz: 575ba0e61f35c318eb3f69ac90bce03cc5254d3a66a523447d794336078d733f6db471ead6dfdc8f6fe721f9862fce826b545b66f5121f2fee7e6d8a0e8bcdc6
-  data.tar.gz: 220cab9520c8f1466888dbe7d3db898d5a7459f1860aea8d9155636aa3c5eb185d33b73ee67e078cad5dcd1d7615cf1a96ae71921b658c681f92800e057584cd
+  metadata.gz: 5f7f680e3207afeba5292b78a972c7de8d58526e6b22876ad3e1374d6473940afd032dced2308f53838d072054253bb3ad7d6745c81ba0be2d71eae750402e39
+  data.tar.gz: 35ac98a55b96cbb9f05263027a03c27514d819cf1912ef125f8fb46ab3f4dacfa525445feaf1074b20e6265aeeb5cb04881d4989aa833fe9f0e757f31ea2d802

data/lib/toml/merge/node_wrapper.rb

@@ -97,7 +97,12 @@ module Toml
         return unless pair?
         return unless @start_line && @end_line && @end_line > @start_line
 
-        line_count = [node_text(@node).sub(/\n\z/, '').lines.count, 1].max
+        range_text = if @backend == :citrus
+                       node_text(citrus_pair_value_node || @node).rstrip
+                     else
+                       node_text(@node).sub(/\n\z/, '')
+                     end
+        line_count = [range_text.lines.count, 1].max
         @end_line = @start_line + line_count - 1
       end
 
@@ -471,6 +476,14 @@ module Toml
 
       private
 
+      def citrus_pair_value_node
+        each_child(@node).find do |child|
+          canonical = NodeTypeNormalizer.canonical_type(child.type, @backend)
+          !NodeTypeNormalizer.key_type?(canonical) &&
+            !%i[comment equals whitespace unknown space indent line_break].include?(canonical)
+        end
+      end
+
       def table_name_container
         return @node unless parslet_element_node?
 

data/lib/toml/merge/source_preserving_provider.rb

@@ -92,6 +92,7 @@ module Toml
           current: analyze_role(:current, request.fetch(:current_source))
         }
         unsafe = documents.values.reject { |document| document.issues.empty? }
+        return merge2_with_toml_substrate(request, documents) if structural_merge2_candidate?(documents.values)
         return invalid_document_failure(:merge2, request, unsafe) unless unsafe.empty?
 
         additions = documents[:incoming].entries.reject { |entry| documents[:current].by_key.key?(entry.key) }
@@ -136,6 +137,58 @@ module Toml
 
       private
 
+      def structural_merge2_candidate?(documents)
+        allowed = %i[table array_of_tables dotted_key]
+        documents.any? { |document| document.issues.any? } && documents.all? do |document|
+          document.analysis && document.issues.all? { |item| allowed.include?(item[:category]) }
+        end
+      end
+
+      def merge2_with_toml_substrate(request, documents)
+        merged = TreeHaver.with_backend(backend_id) do
+          SmartMerger.new(
+            documents.fetch(:incoming).source,
+            documents.fetch(:current).source,
+            preference: :destination,
+            add_template_only_nodes: true
+          ).merge_result
+        end
+        output = merged.to_toml
+        verification = TreeHaver.with_backend(backend_id) { FileAnalysis.new(output) }
+        unless verification.valid?
+          return failure(
+            :merge2,
+            request,
+            category: :verification_failure,
+            message: 'TOML substrate output did not reparse with the selected backend.',
+            verification: { output_reparsed: false }
+          )
+        end
+
+        result(
+          :merge2,
+          request,
+          output: output,
+          changes: merged.decision_summary,
+          render_report: {
+            strategy: :toml_substrate,
+            line_records: merged.lines_array.each_with_index.map do |line, index|
+              {
+                output_line: index + 1,
+                source_role: line[:source],
+                original_line: line[:original_line],
+                decision: line[:decision]
+              }
+            end
+          },
+          verification: {
+            output_reparsed: true,
+            backend: backend_id,
+            unresolved_case_count: merged.unresolved_cases.length
+          }
+        )
+      end
+
       def analyze_role(role, source)
         analysis = TreeHaver.with_backend(backend_id) { ::Toml::Merge::FileAnalysis.new(source) }
         unless analysis.valid?

data/lib/toml/merge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
 - !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.2
+        version: 3.2.3
   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.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
   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.6
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -320,10 +320,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.7
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.8
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/toml-merge/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/toml-merge/7.1.8
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/toml-merge