ruby-codegraph 0.0.2 → 0.0.3

data/lib/codegraph/inheritance.rb

@@ -1,3 +1,6 @@
+require 'ruby_parser'
+require File.expand_path('../inheritance_processor', __FILE__)
+
 module CodeGraph
 
   class Inheritance
@@ -11,6 +14,7 @@ module CodeGraph
       @nodes = {}
       @edges = {}
 
+      @processor = InheritanceProcessor.new
       @g = GraphViz.new(@options[:graph_name], graphviz_options)
     end
 
@@ -40,18 +44,16 @@ module CodeGraph
     end
 
     def directory_scan
-      Dir["#{@dir}/**/*.rb"].each {|rb| class_scan(rb)}
-    end
+      Dir["#{@dir}/**/*.rb"].each do |rb|
+        sexp = RubyParser.new.parse File.read(rb)
+        @processor.process(sexp)
+      end
 
-    def class_scan(file)
-      File.readlines(file).each do |line|
-        _, klass, parent = line.match(CLASS_REGEXP).to_a
-        if klass
-          add_node(klass)
-          if parent
-            add_node(parent)
-            add_edge(klass, parent)
-          end
+      @processor.classes.each do |klass, parent|
+        add_node(klass)
+        if parent
+          add_node(parent)
+          add_edge(klass, parent)
         end
       end
     end

data/lib/codegraph/inheritance_processor.rb

@@ -0,0 +1,97 @@
+require 'sexp_processor'
+
+module CodeGraph
+  class InheritanceProcessor < SexpProcessor
+    attr :classes
+
+    def initialize
+      super
+      self.strict = false
+
+      @scopes = []
+      @classes = {}
+    end
+
+    alias :_process :process
+    def process(exp)
+      _process(exp)
+      fix_parents
+      classes
+    end
+
+    def fix_parents
+      @classes.each do |klass, parent|
+        @classes[klass] = best_fit_name(parent)
+      end
+    end
+
+    def best_fit_name(parent)
+      loop do
+        return parent if @classes.keys.include?(parent)
+        return parent if parent !~ /::/
+        parent = parent.split('::', 2)[1]
+      end
+    end
+
+    def process_const(exp)
+      name = atom(exp[1])
+      exp.clear
+      s(name)
+    end
+
+    def process_colon2(exp)
+      name = [atom(exp[1]), atom(exp[2])].join('::')
+      exp.clear
+      s(name)
+    end
+
+    def process_class(exp)
+      directive, klass, parent = exp[0..2]
+      extra = exp[3..-1]
+      exp.clear
+
+      add_class atom(klass), atom(parent)
+
+      @scopes.push klass
+      processed = [directive, klass, parent].concat(extra.map{|e| _process(e)})
+      @scopes.pop
+
+      s(*processed)
+    end
+
+    def process_module(exp)
+      directive, klass = exp[0..1]
+      extra = exp[2..-1]
+      exp.clear
+
+      @scopes.push klass
+      processed = [directive, klass].concat(extra.map{|e| _process(e)})
+      @scopes.pop
+
+      s(*processed)
+    end
+
+    private
+
+    def add_class(klass, parent)
+      @classes[full_name(klass)] = full_name(parent)
+    end
+
+    def full_name(exp)
+      return unless exp
+      return exp[1].to_s if exp[0] == :colon3
+
+      scoped_name = @scopes + [exp]
+      scoped_name.join('::')
+    end
+
+    def atom(exp)
+      if exp.is_a?(Sexp)
+        _process(exp)
+      else
+        exp
+      end
+    end
+
+  end
+end

data/lib/codegraph/version.rb

@@ -1,3 +1,3 @@
 module CodeGraph
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-codegraph
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: ruby_parser
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Use codegraph to generate all kinds of graphviz graphs for you code,
   to visualize things like class hierarchy.
 email:
@@ -39,6 +55,7 @@ files:
 - lib/codegraph.rb
 - lib/codegraph/version.rb
 - lib/codegraph/inheritance.rb
+- lib/codegraph/inheritance_processor.rb
 - bin/codegraph
 - LICENSE
 - README.markdown