hierarchy-tree 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab69803c942b2cda581356ae1c3701febf660db154041a799d0c2dd22eefbfa
-  data.tar.gz: de33c12ba0a884a268d0730a3fce604591b9d62ff5b07e994e583b9e8524316a
+  metadata.gz: 6644c370fbd994c645135ec56cd7aa19c6586cf7da38136e929b1bac2edd0ddf
+  data.tar.gz: 938f28a4313baa9ba0dabfdbfed06dd32022fbf79177b2bbdf537233593d15ee
 SHA512:
-  metadata.gz: eecf514e48906d8fcc98e5c80896e56b0d2cf1d2f60d207ce644dc72b131c35fe0d6329d3f786cb2ed35df8f113bf9c11d6b3083835a39e7600c22adc7d3c631
-  data.tar.gz: 9dacd1c66e4bb7355eeee8bf51341bcfa3d3a6cea7d76b6bce0a6057614e48a6bf8751ba064da6ec54b5f84cb1a41063e3c7904c4f8fbf12cec4db86905e98cf
+  metadata.gz: 4e3f81dad78bfb864c73153cdebfb2ad3978f1caa70ad2996c2125ce7d88fd2ecf4a362e6c2920877f7e23cfe129f51055f0f945e647392c8f66d69ac3b5c67e
+  data.tar.gz: 790d3534a9798da8fea30a5d44252e57f6d5f00f3fbdac7700502a3c2860a2427e9b97594a926c32cab800eaa3b2d86df8107ab5d675fcb48bd3274ed330bf4c

data/lib/hierarchy_tree.rb

@@ -2,10 +2,10 @@ require 'active_record'
 require 'active_support/core_ext/object/inclusion.rb'
 
 ################ Debug ################
-# gem uninstall hierarchy-tree -v 0.3.0
-# rm hierarchy-tree-0.3.0.gem
+# gem cleanup hierarchy-tree
+# rm hierarchy-tree-0.3.1.gem
 # gem build hierarchy_tree
-# gem install hierarchy-tree-0.3.0.gem
+# gem install hierarchy-tree-0.3.1.gem
 # ruby -Itest test/test_hierarchy_tree.rb
 
 class Hierarchy
@@ -26,20 +26,34 @@ class Hierarchy
     @classes_list
   end
 
-  # Return the ancestors associations by navigating through :belongs_to
+  # Return all the possible ancestors associations by navigating through :belongs_to
   # Starting from the "from" class towards the "to" class
-  # Using DFS - Depth First Search, thus finding the Deepest Path (more likely)
-  def self.ancestors_dfs(from:, to:, descendants: [])
-    return if from.to_s == to.to_s and descendants == [] # Base case
-    return 'loop' if from.in? descendants # Avoids cycle
+  def self.ancestors(from:, to:)
+    return [] if from.to_s == to.to_s
 
-    descendants.push(from)
+    queue = [{ class: from.to_s, path: [] }]
+    visited = { from.to_s => [] }
+    paths = []
 
-    from.reflect_on_all_associations(:belongs_to).map do |relation|
-      return relation.name if relation.klass.to_s == to.to_s # Path is found
-      path = ancestors_dfs(from: relation.klass, to: to, descendants: descendants)
-      return { relation.name => path } if valid_path?(path, to.model_name.param_key.to_sym)
-    end.compact.first
+    while queue.any?
+      current = queue.shift
+      current_class = current[:class]
+      current_path = current[:path]
+
+      current_class.constantize.reflect_on_all_associations(:belongs_to).each do |relation|
+        next_class = relation.klass.to_s
+        next_path = current_path + [relation.name]
+
+        paths << hashify(next_path) if next_class == to.to_s
+
+        if next_path == next_path.uniq # Non-looped path
+          visited[next_class] = next_path
+          queue.push({ class: next_class, path: next_path })
+        end
+      end
+    end
+
+    paths
   end
 
   # Return the ancestors associations by navigating through :belongs_to
@@ -70,6 +84,22 @@ class Hierarchy
     end
   end
 
+  # Return the ancestors associations by navigating through :belongs_to
+  # Starting from the "from" class towards the "to" class
+  # Using DFS - Depth First Search, thus finding the Deepest Path (more likely)
+  def self.ancestors_dfs(from:, to:, descendants: [])
+    return if from.to_s == to.to_s and descendants == [] # Base case
+    return 'loop' if from.in? descendants # Avoids cycle
+
+    descendants.push(from)
+
+    from.reflect_on_all_associations(:belongs_to).map do |relation|
+      return relation.name if relation.klass.to_s == to.to_s # Path is found
+      path = ancestors_dfs(from: relation.klass, to: to, descendants: descendants)
+      return { relation.name => path } if valid_path?(path, to.model_name.param_key.to_sym)
+    end.compact.first
+  end
+
   def self.loop?(klass)
     @cache = {}
     false if dfs_hierarchy(class: klass, classes?: false)
@@ -151,6 +181,14 @@ class Hierarchy
     true
   end
 
+  def self.hashify(array)
+    if array.length == 1
+      array.first
+    else
+      { array.first => hashify(array.drop(1)) }
+    end
+  end
+
   def self.valid_path?(path, target)
     return true if path == target
 
@@ -163,12 +201,4 @@ class Hierarchy
       false
     end
   end
-
-  def self.hashify(array)
-    if array.length == 1
-      array.first
-    else
-      { array.first => hashify(array.drop(1)) }
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hierarchy-tree
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Victor Cordeiro Costa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest