cgraph 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
 *.png
+pkg/

data/cgraph.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "cgraph"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.add_development_dependency "guard-minitest"
   gem.add_development_dependency "minitest"
 

data/lib/cgraph.rb

@@ -33,10 +33,12 @@ module Cgraph
 
   class Graph
     attr_reader :entities, :connections
-    def initialize data, info
+    def initialize data, info, options={}
       Entity.clear_namelist
       @connections = []
       @entities = []
+      @root = options[:root] || ""
+      @no_penwidth = options[:penwidth] || false
       generate_entities data, info
       generate_connections data
     end
@@ -64,18 +66,41 @@ module Cgraph
         return e if e.name == name
       end
     end
+    def add_entities graph
+      @entities.each do |e|
+        if e.picture
+          graph.add_nodes e.name,label: "",image: e.picture
+        else
+          graph.add_nodes e.name, label: e.label
+        end
+      end
+      graph
+    end
     def generate_graph
-      graph = GraphViz.new(:G, :type => :digraph)
+      if @root
+        graph = GraphViz.new(:G, :type => :digraph, :root => @root)
+      else
+        graph = GraphViz.new(:G, :type => :digraph)
+      end
       graph = add_connections_to_graph graph
-      graph.output(:png => "test.png")
+      graph = add_entities graph
       graph
     end
+    def to_png
+      graph.output(:png => "test.png")
+    end
     def add_connections_to_graph graph
       @connections.each do |conn|
-        p conn
         tupel = conn.first
+        options = {}
+
+        if @no_penwidth
+          options = {}
+        else
+          #options = {penwidth: conn[1][:count]}
+          true
+        end
 
-        options = {penwidth: conn[1][:count]}
         graph.add_edges tupel[0],tupel[1],options
       end
       graph

data/spec/cgraph_spec.rb

@@ -60,8 +60,7 @@ describe Graph do
     g.generate_graph.to_s.must_match /digraph/
   end
   it "should use the info data to enhance the entities" do
-    g.find_entity("peter").label.must_equal "Peter Pan"
+    g.generate_graph.find_node("peter").output
     g.find_entity("paul").picture.must_equal "logo_url"
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &20170240 !ruby/object:Gem::Requirement
+  requirement: &21683800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20170240
+  version_requirements: *21683800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &20186200 !ruby/object:Gem::Requirement
+  requirement: &21699760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20186200
+  version_requirements: *21699760
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
-  requirement: &20185780 !ruby/object:Gem::Requirement
+  requirement: &21699340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20185780
+  version_requirements: *21699340
 description: ''
 email:
 - martin.schneider@pludoni.de