dependencytree 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efad431a904a49f9448b793b4fdc592a50f22ad
-  data.tar.gz: 46224be0e106949a71bd0b0910d05b7762e8ca66
+  metadata.gz: 032404568b7d87d3d295c46e0921f9c032191e15
+  data.tar.gz: 087adb18c59ddf0ea55d9848c06dc60ac2737423
 SHA512:
-  metadata.gz: 90ae8e89bcea3dcce411df85277ad8f0ebbb69f286f7865b3db4ee8f140874c6c87952d043b5c0d974ceac6bce539f1c472c25c6e25d1f2941a01c0bf366bd4d
-  data.tar.gz: dac83e7b2865d5d2a14af560012d595d7f02261fb5f82612bff5dff3aac070f5b73667c8cb70bc267b9fdf475d35763ae630e5d08fffcbb44fe9f6e7cd5ccacf
+  metadata.gz: a013abcb8dcb256c6481cd80561d3eafa1294f7538038502394aeaf07cfb3ce316605162ed741901ce79c56d7e5a5eacdd4c57b15558052f19b05100030a5041
+  data.tar.gz: 7ae649613f10e3fbc78646eb0f742cf7f28fc1dcf31f4c60e6ba95fe47f233ee083d97d982becab39ecd20cd3794c59cae0331980c87b51dec753a1ee5733338

data/lib/dependencytree/classmodel.rb

@@ -12,6 +12,8 @@ module Dependencytree
     attr_reader :path
     attr_reader :constant_names
     attr_reader :method_names
+    attr_reader :parent
+    attr_reader :full_name_array
 
     attr_reader :resolved_references
     attr_reader :unresolved_references

data/lib/dependencytree/dependencyresolver.rb

@@ -63,7 +63,45 @@ module Dependencytree
 
       @@log.debug("Resolving reference array #{reference_array.to_s} as reference #{reference_part.to_s} and constant #{constant_name}")
 
-      refered_class_model = resolve_reference_direct(referer_class_model, reference_part)
+      refered_class_model = nil
+
+      # qualified (Foo::CONST) or unqualified (CONST) reference?
+
+      # try to resolve absolute (Outer::Inner1::Inner2::CONST)
+      if reference_part.length > 0
+        @@log.debug("Trying to resolve absolute")
+        refered_class_model = resolve_reference_direct(referer_class_model, reference_part)
+      end
+
+      # try to resolve relative (Inner1::Inner2::CONST)
+      if !refered_class_model && reference_part.length > 0
+        @@log.debug("Trying to resolve relative")
+        current = referer_class_model
+        while !refered_class_model && current
+          full_name_array = current.full_name_array
+          if full_name_array.last(reference_part.length) == reference_part
+            refered_class_model = current
+            break
+          end
+          current = current.parent
+        end
+      end
+
+      # try to resolve unqualified (CONST)
+      if !refered_class_model && reference_part.length == 0
+        @@log.debug("Trying to resolve unqualified")
+        current_class = referer_class_model
+        i = 0
+        while (current_class) && (!refered_class_model) do
+          @@log.debug("Current class #{i} is #{current_class.full_name}")
+
+          refered_class_model = current_class if current_class.constant_names.include?(constant_name)
+
+          current_class = current_class.parent
+          i += 1
+        end
+      end
+
       if refered_class_model
         @@log.debug("Found reference to possible parent #{reference_part.to_s}")
         if refered_class_model.constant_names.include? constant_name.to_sym
@@ -74,6 +112,7 @@ module Dependencytree
           nil
         end
       else
+        @@log.warn("No refered class model for #{reference_part.to_s}")
         nil
       end
     end

data/lib/dependencytree/treemain.rb

@@ -60,7 +60,7 @@ module Dependencytree
 
       if options[:debug]
         log = Logger.new('dependencytree.log')
-        log.level = Logger::WARN
+        log.level = Logger::DEBUG
       else
         log = Logger.new(STDOUT)
         log.level = Logger::WARN

data/lib/dependencytree/version.rb

@@ -1,3 +1,3 @@
 module Dependencytree
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependencytree
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Stephan Fuhrmann