model_graph 0.1.1 → 0.1.2

data/bin/model_graph

@@ -40,8 +40,8 @@
 # options is only a partial fix.
 #
 # === TODO:
-# * deal with :as in a better way (now made dashed)
-# * deal with :polymorphic better (now make bold and blue)
+# * reverse some edges so nodes stay mostly balanced (close to same number of
+#   in and out edges)
 # * handle indirect descendants of ActiveRecord::Base? (at least make it
 #   clearer how they're filtered out of the graph)
 # * models that have no (outbound) associations are depicted in red, but
@@ -126,15 +126,9 @@ module ModelGraph
       @nodes = Hash.new          # holds simple strings
       @edges = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = Hash.new } }
 
-      @polymorphs = Hash.new { |h,k| h[k] = Array.new }
-
-      # OH, just write some tests for this!
-
-      # A hm B :as => Y    gives edge A->B and remembers polymorph Y->A
-      # C hm B :as => Y    gives edge C->B and remembers polymorph Y->C
-      # B bt Y :polymorphic => true       promises B->x for x in Y
-
-      @unresolved_edges = false
+      # A hm B :as => Y    gives edge A->B and implies B bt A
+      # C hm B :as => Y    gives edge C->B and implies B bt A
+      # B bt Y :polymorphic => true       no new information
     end
 
     # Create an unattached node in this graph.
@@ -173,44 +167,20 @@ module ModelGraph
                                    end] = v
         end
       end
-      if options.has_key?('midlabel')
-        add_polymorph(options['midlabel'], fromnode, options) # i.e., fill out edge later
-      end
     end
 
     # Iterates over all the DOT formatted edges with nodes having the most
     # edges first and the edges without a constraint attribute before those
     # that do.
     def edges(options={}) # :yields: edgestring
-      self.resolve_edges if @unresolved_edges
       @edges.sort { |a,b| b[1].length <=> a[1].length }.each do |(fromnode,nh)|
         nh.sort_by { |(t,a)| (a.has_key?('constraint') ^ options[:constraints_first]) ? 1 : 0 }.each do |tonode,eh|
-          #           if @polymorphs.has_key?(tonode) ... then loop over them
           e = "#{fromnode} -> #{tonode} "
           e << eh.inspect(options) unless eh.nil?
           yield e
         end
       end
     end
-
-    def add_polymorph(astype, fromnode, options={})
-      @polymorphs[astype] << fromnode
-      @unresolved_edges = true
-    end
-
-    def resolve_edges
-      puts "=> resolve_edges"
-      @polymorphs.each_pair do |fromnode, nodes|
-        puts "   fromnode: #{fromnode.inspect} nodes: #{nodes.inspect}"
-        nodes.each do |tonode|
-          puts "      tonode: #{tonode.inspect}"
-          add_edge(fromnode || "FUCK", tonode,
-                   { 'label' => :belongs_to.to_s,
-                     'arrow' => ARROW_FOR[:belongs_to] })
-        end
-      end
-      @unresolved_edges = false
-    end
   end
 
   # classes that should not be graphed, but are subclasses of
@@ -321,11 +291,13 @@ module ModelGraph
         end
 
         next unless a.class_name == a.name.to_s.camelize.singularize
+        next if a.options[:polymorphic]
 
         opts = { 'label' => a.macro.to_s, 'arrow' => ARROW_FOR[a.macro] }
         opts.merge!('style' => 'dotted', 'constraint' => 'false') if a.through_reflection
-        opts.merge!('style' => 'dashed', 'midlabel' => a.options[:as].to_s.camelize.singularize) if a.options[:as]
-        opts.merge!('color' => 'blue') if a.options[:polymorphic]
+        opts.merge!('color' => 'blue', 'midlabel' => a.options[:as].to_s.camelize.singularize) if a.options[:as]
+
+        opts.merge!('color' => 'red') if a.options[:finder_sql]
 
         fromnodename = klass.name
         tonodename = a.name.to_s.camelize.singularize
@@ -338,15 +310,15 @@ module ModelGraph
           graph.add_edge(tonodename, fromnodename, myopts)
           standalone = false
         end
-        if a.options[:polymorphic]
-          graph.add_edge(fromnodename, tonodename, opts)
-        elsif klass.name == klass.class_name
+        if klass.name == klass.class_name
           graph.add_edge(fromnodename, tonodename, opts)
+          if a.options[:as]
+            graph.add_edge(tonodename, fromnodename,
+                           'arrow' => ARROW_FOR[:belongs_to], 'fontcolor' => 'blue')
+          end
           standalone = false
         elsif options.debug
           output << " // !! skipping edge #{fromnodename} -> #{tonodename} #{opts.inspect}\n"
-          opts.merge!('midlabel' => klass.class_name)
-          graph.add_edge(fromnodename, tonodename, opts)
         end
       end
       graph.add_node(klass.name, %{[color=red, fontcolor=red]}) if standalone
@@ -393,7 +365,7 @@ module ModelGraph
       puts "sample: #{val}"
       puts "__FILE__ = #{__FILE__}"
 
-      sample = File.join(File.dirname(__FILE__), '..', 'sample',
+      sample = File.join(File.dirname(__FILE__), '..', 'examples',
                          File.basename(val, ".rb") + '.rb')
       if File.exists?(sample)
         puts "getting #{sample} ..."
@@ -423,6 +395,10 @@ module ModelGraph
       puts "name: #{val}"
       options.name = val
     end
+    opts.on("--shape=KIND", "override the shape of a node with a valid DOT shape") do |val|
+      puts "shape: #{val}"
+      options.shape = val
+    end
     opts.on("--label", "-l", "show edge labels") { |val| options.label = true }
     opts.on("--constraints-first", "--cf", "output constrained edges first (normally last)") do |val|
       options.constraints_first = true
@@ -432,7 +408,6 @@ module ModelGraph
 
   puts options.to_s
 
-  # unless (__FILE__ == $0 ? ARGV.include?('--test') : ENV.include?('TEST'))
   unless options.test
     for f in Dir.glob(File.join(RAILS_ROOT || '.', "app/models", "*.rb"))
       puts "getting #{f}..."

data/lib/model_graph/version.rb

@@ -2,7 +2,7 @@ module ModelGraph
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: model_graph
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-10-21 00:00:00 -06:00
+  version: 0.1.2
+date: 2006-11-22 00:00:00 -05:00
 summary: "When run from the trunk of a Rails project, produces # {DOT}[http://www.graphviz.org/doc/info/lang.html] output which can be # rendered into a graph by programs such as dot and neato and viewed with # Graphviz (an {Open Source}[http://www.graphviz.org/License.php] viewer)."
 require_paths: 
 - lib