ast-merge 7.1.16 → 7.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84b24864e7624bfe814e90f5ccc88c6abad814211071e67fbb4371d919f254c7
-  data.tar.gz: f3768787dce27ca5ce20c1a9d1f5e86be5bc22ba7824f532707354bd01aa9bc7
+  metadata.gz: 1d4ef6705dca0f03b14db3830bc65693fed252978f9991eb7880139aebf62894
+  data.tar.gz: 3c76547dbd9f29aabfb5b029ab684d3b19b6ef61de460de5134d80958935e6b1
 SHA512:
-  metadata.gz: 9a5195597db9da7216839ac505ddeb79b22ed54040d7f00645c702ecb093173cbba890faf80e85771e914db1a4baebdd02903bf468c006a1f4a5137de1028c3e
-  data.tar.gz: d9252a87faacbdd537cc28471723f4ea3723f8ae4340337a63c7406ccc01fe903e1cab0cfe499c8415c71612185a7440ecc3ac6cdeeac98d78eaf4dfd5d8324b
+  metadata.gz: 47e8d6fab460db69261df892001eb1eec049a7f221743db81db6ac8d8f5c9f78f1b59be761368dfbd0f4fb5e33c79ca91f23586b172af6cd43bee4187a5842eb
+  data.tar.gz: 1cbaa4f3fd02c72884c863ab4bfa3bd101d891b8afc4113b8fa197a592fb671193fdf8d87cb7449fd509f95023e92566c57e7ff291b8850e9090b2f191ab09ef

data/lib/ast/merge/typed_core_provider.rb

@@ -106,20 +106,29 @@ module Ast
       def policy(operation, _request)
         case operation
         when :analyze
-          core::OperationPolicy.from_analyze(core::AnalyzePolicy.new(extra: {}))
+          core::OperationPolicyAnalyze.new(value: core::AnalyzePolicy.new(extra: {}))
         when :diff2
-          core::OperationPolicy.from_diff2(core::DiffPolicy.new(comparison_profile: 'exact-source-owners',
-                                                                equivalence: ['exact-source'], extra: {}))
+          core::OperationPolicyDiff2.new(value: diff2_policy)
         when :merge2
-          core::OperationPolicy.from_merge2(core::DirectionalMergePolicy.new(
-                                              directional_merge: 'template-into-current', render_policy: 'source-preserving', extra: {}
-                                            ))
+          core::OperationPolicyMerge2.new(value: merge2_policy)
         when :merge3
-          core::OperationPolicy.from_merge3(core::ThreeWayMergePolicy.new(render_policy: 'source-preserving',
-                                                                          fallback_policy: 'none', extra: {}))
+          core::OperationPolicyMerge3.new(value: merge3_policy)
         end
       end
 
+      def diff2_policy
+        core::DiffPolicy.new(comparison_profile: 'exact-source-owners', equivalence: ['exact-source'], extra: {})
+      end
+
+      def merge2_policy
+        core::DirectionalMergePolicy.new(directional_merge: 'template-into-current', render_policy: 'source-preserving',
+                                         extra: {})
+      end
+
+      def merge3_policy
+        core::ThreeWayMergePolicy.new(render_policy: 'source-preserving', fallback_policy: 'none', extra: {})
+      end
+
       # Only open metadata values are encoded by the generated binding; never
       # send or decode a whole-operation JSON string.
       def metadata(values)

data/lib/ast/merge/version.rb

@@ -5,7 +5,7 @@ module Ast
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.16'
+      VERSION = '7.1.17'
     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: ast-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.16
+  version: 7.1.17
 platform: ruby
 authors:
 - Peter H. Boling
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.16
+        version: 7.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.16
+        version: 7.1.17
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.15
+        version: 1.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.15
+        version: 1.1.16
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.21
+        version: 3.1.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.21
+        version: 3.1.24
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: appraisal2
   requirement: !ruby/object:Gem::Requirement
@@ -500,10 +500,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.16
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.16/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.17
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.17/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/7.1.16
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/7.1.17
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge