ast-merge 1.0.0 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter H. Boling
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.9
+- !ruby/object:Gem::Dependency
+  name: tree_haver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +153,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: kettle-soup-cover
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +266,8 @@ description: "☯️ Ast::Merge provides base classes, modules, and RSpec shared
   psych-merge, json-merge, and other format-specific merge gems."
 email:
 - floss@galtzo.com
-executables: []
+executables:
+- ast-merge-recipe
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -236,6 +291,7 @@ files:
 - REEK
 - RUBOCOP.md
 - SECURITY.md
+- exe/ast-merge-recipe
 - lib/ast-merge.rb
 - lib/ast/merge.rb
 - lib/ast/merge/ast_node.rb
@@ -246,8 +302,13 @@ files:
 - lib/ast/merge/comment/parser.rb
 - lib/ast/merge/comment/style.rb
 - lib/ast/merge/conflict_resolver_base.rb
+- lib/ast/merge/content_match_refiner.rb
 - lib/ast/merge/debug_logger.rb
-- lib/ast/merge/fenced_code_block_detector.rb
+- lib/ast/merge/detector/base.rb
+- lib/ast/merge/detector/fenced_code_block.rb
+- lib/ast/merge/detector/mergeable.rb
+- lib/ast/merge/detector/toml_frontmatter.rb
+- lib/ast/merge/detector/yaml_frontmatter.rb
 - lib/ast/merge/file_analyzable.rb
 - lib/ast/merge/freezable.rb
 - lib/ast/merge/freeze_node_base.rb
@@ -255,11 +316,16 @@ files:
 - lib/ast/merge/match_score_base.rb
 - lib/ast/merge/merge_result_base.rb
 - lib/ast/merge/merger_config.rb
+- lib/ast/merge/navigable_statement.rb
 - lib/ast/merge/node_typing.rb
-- lib/ast/merge/region.rb
-- lib/ast/merge/region_detector_base.rb
-- lib/ast/merge/region_mergeable.rb
+- lib/ast/merge/partial_template_merger.rb
+- lib/ast/merge/recipe.rb
+- lib/ast/merge/recipe/config.rb
+- lib/ast/merge/recipe/preset.rb
+- lib/ast/merge/recipe/runner.rb
+- lib/ast/merge/recipe/script_loader.rb
 - lib/ast/merge/rspec.rb
+- lib/ast/merge/rspec/dependency_tags.rb
 - lib/ast/merge/rspec/shared_examples.rb
 - lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb
 - lib/ast/merge/rspec/shared_examples/debug_logger.rb
@@ -279,19 +345,17 @@ files:
 - lib/ast/merge/text/section_splitter.rb
 - lib/ast/merge/text/smart_merger.rb
 - lib/ast/merge/text/word_node.rb
-- lib/ast/merge/toml_frontmatter_detector.rb
 - lib/ast/merge/version.rb
-- lib/ast/merge/yaml_frontmatter_detector.rb
 - sig/ast/merge.rbs
 homepage: https://github.com/kettle-rb/ast-merge
 licenses:
 - MIT
 metadata:
   homepage_uri: https://ast-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v1.0.0
-  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v1.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v2.0.0
+  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v2.0.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/ast-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/1.0.0
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/2.0.0
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/ast-merge/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge
@@ -320,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 4.0.3
 specification_version: 4
 summary: "☯️ Shared infrastructure for the *-merge gem family"
 test_files: []

data/lib/ast/merge/fenced_code_block_detector.rb

@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-
-module Ast
-  module Merge
-    # Detects fenced code blocks with a specific language identifier.
-    #
-    # This detector finds Markdown-style fenced code blocks (using ``` or ~~~)
-    # that have a specific language identifier. It can be configured for any
-    # language: ruby, json, yaml, mermaid, etc.
-    #
-    # @example Detecting Ruby code blocks
-    #   detector = FencedCodeBlockDetector.new("ruby", aliases: ["rb"])
-    #   regions = detector.detect_all(markdown_source)
-    #
-    # @example Using factory methods
-    #   detector = FencedCodeBlockDetector.ruby
-    #   detector = FencedCodeBlockDetector.yaml
-    #   detector = FencedCodeBlockDetector.json
-    #
-    # @api public
-    class FencedCodeBlockDetector < RegionDetectorBase
-      # @return [String] The primary language identifier
-      attr_reader :language
-
-      # @return [Array<String>] Alternative language identifiers
-      attr_reader :aliases
-
-      # Creates a new detector for the specified language.
-      #
-      # @param language [String, Symbol] The language identifier (e.g., "ruby", "json")
-      # @param aliases [Array<String, Symbol>] Alternative identifiers (e.g., ["rb"] for ruby)
-      def initialize(language, aliases: [])
-        super()
-        @language = language.to_s.downcase
-        @aliases = aliases.map { |a| a.to_s.downcase }
-        @all_identifiers = [@language] + @aliases
-      end
-
-      # @return [Symbol] The region type (e.g., :ruby_code_block)
-      def region_type
-        :"#{@language}_code_block"
-      end
-
-      # Check if a language identifier matches this detector.
-      #
-      # @param lang [String] The language identifier to check
-      # @return [Boolean] true if the language matches
-      def matches_language?(lang)
-        @all_identifiers.include?(lang.to_s.downcase)
-      end
-
-      # Detects all fenced code blocks with the configured language.
-      #
-      # @param source [String] The full document content
-      # @return [Array<Region>] All detected code blocks, sorted by start_line
-      def detect_all(source)
-        return [] if source.nil? || source.empty?
-
-        regions = []
-        lines = source.lines
-        in_block = false
-        start_line = nil
-        content_lines = []
-        current_language = nil
-        fence_char = nil
-        fence_length = nil
-        indent = ""
-
-        lines.each_with_index do |line, idx|
-          line_num = idx + 1
-
-          if !in_block
-            # Match opening fence: ```lang or ~~~lang (optionally indented)
-            match = line.match(/^(\s*)(`{3,}|~{3,})(\w*)\s*$/)
-            if match
-              indent = match[1] || ""
-              fence = match[2]
-              lang = match[3].downcase
-
-              if @all_identifiers.include?(lang)
-                in_block = true
-                start_line = line_num
-                content_lines = []
-                current_language = lang
-                fence_char = fence[0]
-                fence_length = fence.length
-              end
-            end
-          elsif line.match?(/^#{Regexp.escape(indent)}#{Regexp.escape(fence_char)}{#{fence_length},}\s*$/)
-            # Match closing fence (must use same char, same indent, and at least same length)
-            opening_fence = "#{fence_char * fence_length}#{current_language}"
-            closing_fence = fence_char * fence_length
-
-            regions << build_region(
-              type: region_type,
-              content: content_lines.join,
-              start_line: start_line,
-              end_line: line_num,
-              delimiters: [opening_fence, closing_fence],
-              metadata: {language: current_language, indent: indent.empty? ? nil : indent},
-            )
-            in_block = false
-            start_line = nil
-            content_lines = []
-            current_language = nil
-            fence_char = nil
-            fence_length = nil
-            indent = ""
-          else
-            # Accumulate content lines (strip the indent if present)
-            content_lines << if indent.empty?
-              line
-            else
-              # Strip the common indent from content lines
-              line.sub(/^#{Regexp.escape(indent)}/, "")
-            end
-          end
-        end
-
-        # Note: Unclosed blocks are ignored (no region created)
-        regions
-      end
-
-      # @return [String] A description of this detector
-      def inspect
-        aliases_str = @aliases.empty? ? "" : " aliases=#{@aliases.inspect}"
-        "#<#{self.class.name} language=#{@language}#{aliases_str}>"
-      end
-
-      class << self
-        # Creates a detector for Ruby code blocks.
-        # @return [FencedCodeBlockDetector]
-        def ruby
-          new("ruby", aliases: ["rb"])
-        end
-
-        # Creates a detector for JSON code blocks.
-        # @return [FencedCodeBlockDetector]
-        def json
-          new("json")
-        end
-
-        # Creates a detector for YAML code blocks.
-        # @return [FencedCodeBlockDetector]
-        def yaml
-          new("yaml", aliases: ["yml"])
-        end
-
-        # Creates a detector for TOML code blocks.
-        # @return [FencedCodeBlockDetector]
-        def toml
-          new("toml")
-        end
-
-        # Creates a detector for Mermaid diagram blocks.
-        # @return [FencedCodeBlockDetector]
-        def mermaid
-          new("mermaid")
-        end
-
-        # Creates a detector for JavaScript code blocks.
-        # @return [FencedCodeBlockDetector]
-        def javascript
-          new("javascript", aliases: ["js"])
-        end
-
-        # Creates a detector for TypeScript code blocks.
-        # @return [FencedCodeBlockDetector]
-        def typescript
-          new("typescript", aliases: ["ts"])
-        end
-
-        # Creates a detector for Python code blocks.
-        # @return [FencedCodeBlockDetector]
-        def python
-          new("python", aliases: ["py"])
-        end
-
-        # Creates a detector for Bash/Shell code blocks.
-        # @return [FencedCodeBlockDetector]
-        def bash
-          new("bash", aliases: ["sh", "shell", "zsh"])
-        end
-
-        # Creates a detector for SQL code blocks.
-        # @return [FencedCodeBlockDetector]
-        def sql
-          new("sql")
-        end
-
-        # Creates a detector for HTML code blocks.
-        # @return [FencedCodeBlockDetector]
-        def html
-          new("html")
-        end
-
-        # Creates a detector for CSS code blocks.
-        # @return [FencedCodeBlockDetector]
-        def css
-          new("css")
-        end
-
-        # Creates a detector for Markdown code blocks (nested markdown).
-        # @return [FencedCodeBlockDetector]
-        def markdown
-          new("markdown", aliases: ["md"])
-        end
-      end
-    end
-  end
-end

data/lib/ast/merge/region.rb

@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-module Ast
-  module Merge
-    # Represents a detected region within a document.
-    #
-    # Regions are portions of a document that can be handled by a specialized
-    # merger. For example, YAML frontmatter in a Markdown file, or a Ruby code
-    # block that should be merged using a Ruby-aware merger.
-    #
-    # @example Creating a region for YAML frontmatter
-    #   Region.new(
-    #     type: :yaml_frontmatter,
-    #     content: "title: My Doc\nversion: 1.0\n",
-    #     start_line: 1,
-    #     end_line: 4,
-    #     delimiters: ["---", "---"],
-    #     metadata: { format: :yaml }
-    #   )
-    #
-    # @example Creating a region for a Ruby code block
-    #   Region.new(
-    #     type: :ruby_code_block,
-    #     content: "def hello\n  puts 'world'\nend\n",
-    #     start_line: 5,
-    #     end_line: 9,
-    #     delimiters: ["```ruby", "```"],
-    #     metadata: { language: "ruby" }
-    #   )
-    #
-    # @api public
-    Region = Struct.new(
-      # @return [Symbol] The type of region (e.g., :yaml_frontmatter, :ruby_code_block)
-      :type,
-
-      # @return [String] The raw string content of this region (inner content, without delimiters)
-      :content,
-
-      # @return [Integer] 1-indexed start line in the original document
-      :start_line,
-
-      # @return [Integer] 1-indexed end line in the original document
-      :end_line,
-
-      # @return [Array<String>, nil] Delimiter strings to reconstruct the region
-      #   ["```ruby", "```"] - [opening_delimiter, closing_delimiter]
-      :delimiters,
-
-      # @return [Hash, nil] Optional metadata for detector-specific information
-      #   (e.g., { language: "ruby" }, { format: :yaml })
-      :metadata,
-      keyword_init: true,
-    ) do
-      # Returns the line range covered by this region.
-      #
-      # @return [Range] The range from start_line to end_line (inclusive)
-      # @example
-      #   region.line_range # => 1..4
-      def line_range
-        start_line..end_line
-      end
-
-      # Returns the number of lines this region spans.
-      #
-      # @return [Integer] The number of lines
-      # @example
-      #   region.line_count # => 4
-      def line_count
-        end_line - start_line + 1
-      end
-
-      # Reconstructs the full region text including delimiters.
-      #
-      # @return [String] The complete region with start and end delimiters
-      # @example
-      #   region.full_text
-      #   # => "```ruby\ndef hello\n  puts 'world'\nend\n```"
-      def full_text
-        return content if delimiters.nil? || delimiters.empty?
-
-        opening = delimiters[0] || ""
-        closing = delimiters[1] || ""
-        "#{opening}\n#{content}#{closing}"
-      end
-
-      # Checks if this region overlaps with the given line number.
-      #
-      # @param line [Integer] The line number to check (1-indexed)
-      # @return [Boolean] true if the line is within this region
-      def contains_line?(line)
-        line_range.cover?(line)
-      end
-
-      # Checks if this region overlaps with another region.
-      #
-      # @param other [Region] Another region to check for overlap
-      # @return [Boolean] true if the regions overlap
-      def overlaps?(other)
-        line_range.cover?(other.start_line) ||
-          line_range.cover?(other.end_line) ||
-          other.line_range.cover?(start_line)
-      end
-
-      # Returns a short string representation of the region.
-      #
-      # @return [String] A concise string describing the region
-      def to_s
-        "Region<#{type}:#{start_line}-#{end_line}>"
-      end
-
-      # Returns a detailed human-readable representation of the region.
-      #
-      # @return [String] A string describing the region with truncated content
-      def inspect
-        truncated = if content && content.length > 30
-          "#{content[0, 30]}..."
-        else
-          content.inspect
-        end
-        "#{self} #{truncated}"
-      end
-    end
-  end
-end

data/lib/ast/merge/region_detector_base.rb

@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-module Ast
-  module Merge
-    # Base class for region detection.
-    #
-    # Region detectors identify portions of a document that should be handled
-    # by a specialized merger. For example, detecting YAML frontmatter in a
-    # Markdown file, or Ruby code blocks that should be merged with Prism.
-    #
-    # Subclasses must implement:
-    # - {#region_type} - Returns the type symbol for detected regions
-    # - {#detect_all} - Finds all regions of this type in a document
-    #
-    # @example Implementing a custom detector
-    #   class MyBlockDetector < Ast::Merge::RegionDetectorBase
-    #     def region_type
-    #       :my_block
-    #     end
-    #
-    #     def detect_all(source)
-    #       # Return array of Region structs
-    #       []
-    #     end
-    #   end
-    #
-    # @abstract Subclass and implement {#region_type} and {#detect_all}
-    # @api public
-    class RegionDetectorBase
-      # Returns the type symbol for regions detected by this detector.
-      #
-      # This symbol is used to identify the region type in the Region struct
-      # and for matching regions between template and destination documents.
-      #
-      # @return [Symbol] The region type (e.g., :yaml_frontmatter, :ruby_code_block)
-      # @abstract Subclasses must implement this method
-      def region_type
-        raise NotImplementedError, "#{self.class}#region_type must be implemented"
-      end
-
-      # Detects all regions of this type in the given source.
-      #
-      # @param source [String] The full document content to scan
-      # @return [Array<Region>] All detected regions, sorted by start_line
-      # @abstract Subclasses must implement this method
-      #
-      # @example Return value structure
-      #   [
-      #     Region.new(
-      #       type: :yaml_frontmatter,
-      #       content: "title: My Doc\n",
-      #       start_line: 1,
-      #       end_line: 3,
-      #       delimiters: { start: "---\n", end: "---\n" },
-      #       metadata: { format: :yaml }
-      #     )
-      #   ]
-      def detect_all(source)
-        raise NotImplementedError, "#{self.class}#detect_all must be implemented"
-      end
-
-      # Whether to strip delimiters from content before passing to merger.
-      #
-      # When true (default), only the inner content is passed to the region's
-      # merger. The delimiters are stored separately and reattached after merging.
-      #
-      # When false, the full content including delimiters is passed to the merger,
-      # which must then handle the delimiters itself.
-      #
-      # @return [Boolean] true if delimiters should be stripped (default: true)
-      def strip_delimiters?
-        true
-      end
-
-      # A human-readable name for this detector.
-      #
-      # Used in error messages and debugging output.
-      #
-      # @return [String] The detector name
-      def name
-        self.class.name || "AnonymousDetector"
-      end
-
-      # Returns a string representation of this detector.
-      #
-      # @return [String] A description of the detector
-      def inspect
-        "#<#{name} region_type=#{region_type}>"
-      end
-
-      protected
-
-      # Helper to build a Region struct with common defaults.
-      #
-      # @param type [Symbol] The region type
-      # @param content [String] The inner content (without delimiters)
-      # @param start_line [Integer] 1-indexed start line
-      # @param end_line [Integer] 1-indexed end line
-      # @param delimiters [Hash, nil] { start: String, end: String }
-      # @param metadata [Hash, nil] Additional metadata
-      # @return [Region] A new Region struct
-      def build_region(type:, content:, start_line:, end_line:, delimiters: nil, metadata: nil)
-        Region.new(
-          type: type,
-          content: content,
-          start_line: start_line,
-          end_line: end_line,
-          delimiters: delimiters,
-          metadata: metadata || {},
-        )
-      end
-    end
-  end
-end