ast-merge 3.1.0 → 4.0.1

data/lib/ast/merge.rb

@@ -3,6 +3,9 @@
 # External gems
 require "version_gem"
 
+# Normalized AST for all languages, parsers, and platforms
+require "tree_haver"
+
 # This gem - only version can be required (never autoloaded)
 require_relative "merge/version"
 
@@ -142,17 +145,16 @@ module Ast
     autoload :ConflictResolverBase, "ast/merge/conflict_resolver_base"
     autoload :ContentMatchRefiner, "ast/merge/content_match_refiner"
     autoload :DebugLogger, "ast/merge/debug_logger"
+    autoload :DiffMapperBase, "ast/merge/diff_mapper_base"
     autoload :EmitterBase, "ast/merge/emitter_base"
     autoload :FileAnalyzable, "ast/merge/file_analyzable"
     autoload :Freezable, "ast/merge/freezable"
     autoload :FreezeNodeBase, "ast/merge/freeze_node_base"
-    autoload :InjectionPoint, "ast/merge/navigable_statement"
-    autoload :InjectionPointFinder, "ast/merge/navigable_statement"
     autoload :MatchRefinerBase, "ast/merge/match_refiner_base"
     autoload :MatchScoreBase, "ast/merge/match_score_base"
     autoload :MergeResultBase, "ast/merge/merge_result_base"
     autoload :MergerConfig, "ast/merge/merger_config"
-    autoload :NavigableStatement, "ast/merge/navigable_statement"
+    autoload :Navigable, "ast/merge/navigable"
     autoload :NodeTyping, "ast/merge/node_typing"
     autoload :NodeWrapperBase, "ast/merge/node_wrapper_base"
     autoload :PartialTemplateMergerBase, "ast/merge/partial_template_merger_base"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -63,20 +63,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: "☯️ Ast::Merge provides base classes, modules, and RSpec shared examples
   for building intelligent file mergers using AST analysis. It powers prism-merge,
   psych-merge, json-merge, and other format-specific merge gems."
@@ -309,6 +329,7 @@ files:
 - lib/ast/merge/detector/mergeable.rb
 - lib/ast/merge/detector/toml_frontmatter.rb
 - lib/ast/merge/detector/yaml_frontmatter.rb
+- lib/ast/merge/diff_mapper_base.rb
 - lib/ast/merge/emitter_base.rb
 - lib/ast/merge/file_analyzable.rb
 - lib/ast/merge/freezable.rb
@@ -317,7 +338,10 @@ 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/navigable.rb
+- lib/ast/merge/navigable/injection_point.rb
+- lib/ast/merge/navigable/injection_point_finder.rb
+- lib/ast/merge/navigable/statement.rb
 - lib/ast/merge/node_typing.rb
 - lib/ast/merge/node_typing/frozen_wrapper.rb
 - lib/ast/merge/node_typing/normalizer.rb
@@ -331,6 +355,7 @@ files:
 - lib/ast/merge/recipe/script_loader.rb
 - lib/ast/merge/rspec.rb
 - lib/ast/merge/rspec/dependency_tags.rb
+- lib/ast/merge/rspec/merge_gem_registry.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
@@ -357,10 +382,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://ast-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v3.1.0
-  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v3.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v4.0.1
+  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v4.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/ast-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/3.1.0
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/4.0.1
   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