vrt 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd5c389eb5bd383a61325e88b698ee26e37e2d8
-  data.tar.gz: 7beea5136f462db2243da8063c7c30db955f703f
+  metadata.gz: 4a5df68aeb02a33a02331c169ecbc8461d09bbaf
+  data.tar.gz: daf91c2b754a14d2879d57c4dc7a54c04d98f721
 SHA512:
-  metadata.gz: 208b805887df9f33a4741ec86c296e8c339012afd24c79c612fc9be16243256ba0296ce9d9bfcc70d15c64737adb7dc95e5349426521e7e66812eb2448c651ca
-  data.tar.gz: 91cb49c9d188adee9ea1385cb1ecb0e7b7e5e9ad781f85139d227a9536f7e08b63358cdfbddabcf0476d1b7bea79fd00229da8d5e8584f3946401cb8d93fbfaf
+  metadata.gz: 62c43be4caa4cd6e8a43116926a10cc4a10bfcfdb6b5966215b9a89422513ce01521eb2b46bd3a434c7866b26a27763a96389dae7d99b696f1af467a1b343e35
+  data.tar.gz: 71bbd9014ec9b5151715726cfe0944f8ea0b4a9f76875e787b956f36325f2ef4f3d36c0a53cf90f8391b31fcccae2354862c245e065d4a612f0dbc5bbd0ac726

data/lib/vrt.rb

@@ -64,20 +64,20 @@ module VRT
   # the appropriate deprecated mapping. If neither is found it will walk up the tree to find a
   # valid parent node before giving up and returning nil.
   #
-  # @param [String] A valid vrt_id
-  # @param [String] (Optional - recommended) A valid vrt_version that the vrt_id exists in
-  # @param [string] (Optional) The preferred new vrt_version to find a match in
-  # @param [String] (Optional) The maximum depth to match in
+  # @param [String] vrt_id A valid vrt_id
+  # @param [string] preferred_version (Optional) The preferred vrt_version of the returned node
+  #   (defaults to current_version)
+  # @param [String] max_depth (Optional) The maximum depth to match in
+  # @param [String] version (deprecated) This parameter is no longer used
   # @return [VRT::Node|Nil] A valid VRT::Node object or nil if no best match could be found
-  def find_node(vrt_id:, version: nil, preferred_version: nil, max_depth: 'variant')
+  def find_node(vrt_id:, preferred_version: nil, max_depth: 'variant', version: nil) # rubocop:disable Lint/UnusedMethodArgument
     new_version = preferred_version || current_version
     if Map.new(new_version).valid?(vrt_id)
       Map.new(new_version).find_node(vrt_id, max_depth: max_depth)
     elsif deprecated_node?(vrt_id)
       find_deprecated_node(vrt_id, preferred_version, max_depth)
     else
-      return nil unless version
-      find_valid_parent_node(vrt_id, version, new_version, max_depth)
+      find_valid_parent_node(vrt_id, new_version, max_depth)
     end
   end
 

data/lib/vrt/cross_version_mapping.rb

@@ -31,14 +31,14 @@ module VRT
       VRT::Map.new(new_version).find_node(node_id, max_depth: max_depth)
     end
 
-    def find_valid_parent_node(vrt_id, old_version, new_version, max_depth)
-      old_node = VRT::Map.new(old_version).find_node(vrt_id)
+    def find_valid_parent_node(vrt_id, new_version, max_depth)
       new_map = VRT::Map.new(new_version)
       if new_map.valid?(vrt_id)
         new_map.find_node(vrt_id, max_depth: max_depth)
       else
-        return nil if old_node.parent.nil?
-        find_valid_parent_node(old_node.parent.qualified_vrt_id, old_version, new_version, max_depth)
+        parent = vrt_id.split('.')[0..-2].join('.')
+        return nil if parent.empty?
+        find_valid_parent_node(parent, new_version, max_depth)
       end
     end
   end

data/lib/vrt/version.rb

@@ -1,3 +1,3 @@
 module Vrt
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vrt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Barnett Klane