ulg 0.2.5 → 0.2.6

data/bin/ulg

@@ -3,7 +3,7 @@
 require "getopt/std"
 require 'ulg'
 
-VERSION = "0.2.5"
+VERSION = "0.2.6"
 
 ulg = ULG.new
 opt = Getopt::Std.getopts("f:o:s:dhv")

data/lib/ulg.rb

@@ -19,22 +19,22 @@ class ULG
     @rex = []
 
     @rex << '(?<from_open>[\[\<\(\{]*)'
-    @rex << '(?<from_label>[^\]\>\)\|\}\=\-\.]+)'
-    @rex << '(?<from_color>\|[^\]\>\)\} ]+)?'
-    @rex << '(?<from_close>[\]\>\)\}]*)\s+'
+    @rex << '(?<from_label>[^\]\>\)\|\}]+?)'
+    @rex << '(?<from_color>\|[^\]\>\)\} ]+?)?'
+    @rex << '(?<from_close>[\]\>\)\}]*)'
     
-    @rex << '(?<from_arrow>[\<\>ox]*)'
+    @rex << '\s(?<from_arrow>[\<\>ox]*)'
 
     @rex << '(?<edge_open>[\=\-\.]+)'
-    @rex << '(?<edge_label>[^\=\-\|\.]*)'
-    @rex << '(?<edge_color>\|[^\=\-\|\. ]+)?'
+    @rex << '(?<edge_label>(?:[^\=\-\|\.][^\|]*?[^\=\-\|\.])?)'
+    @rex << '(?<edge_color>\|[^\=\-\|\.\ ]+)?'
     @rex << '(?<edge_close>[\=\-\.]+)'
 
-    @rex << '(?<to_arrow>[\<\>ox]*)\s+'
+    @rex << '(?<to_arrow>[\<\>ox]*)\s'
 
     @rex << '(?<to_open>[\[\<\(\{]*)'
-    @rex << '(?<to_label>[^\]\>\)\|\}\=\-\.]+)'
-    @rex << '(?<to_color>\|[^\]\>\)\} ]+)?'
+    @rex << '(?<to_label>[^\]\>\)\|\}]+?)'
+    @rex << '(?<to_color>\|[^\]\>\)\} ]+?)?'
     @rex << '(?<to_close>[\]\>\)\}]*)'
 
     @arrow_regex = @rex.join '\s*'
@@ -84,9 +84,10 @@ class ULG
 	dputs "Building to node for #{to_label} as #{to}"
         to_node = g.add_nodes to_label, to_opts
 
-	dputs "Building edge for #{from} #{to}"
-        g.add_edges from_node, to_node, @edges[from][to]["attr"]
-
+        @edges[from][to].keys.each do |edge|
+    	  dputs "Building edge #{edge} for #{from} #{to}"
+          g.add_edges from_node, to_node, @edges[from][to][edge]["attr"]
+        end
       end
     end
 
@@ -210,13 +211,18 @@ class ULG
     from_name = label_to_name from
     to_name = label_to_name to
 
-    return if @edges.has_key? from and @edges[from].has_key? to
+    if not label.empty?
+      edge_name = label_to_name label
+    else
+      edge_name = "none"
+    end
 
-    dputs "Adding edge for #{from_name} #{to_name}"
+    return if @edges.has_key? from_name and @edges[from_name].has_key? to_name and @edges[from_name][to_name].has_key? edge_name
 
-    if not @edges.has_key? from_name
-      @edges[from_name] = {}
-    end
+    dputs "Adding edge #{edge_name} for #{from_name} #{to_name}"
+
+    @edges[from_name] = {} unless @edges.has_key? from_name
+    @edges[from_name][to_name] = {} unless @edges[from_name].has_key? to_name
 
     arrowtail = parse_arrow from_arrow
     arrowhead = parse_arrow to_arrow
@@ -236,7 +242,7 @@ class ULG
       color = "black"
     end
 
-    @edges[from_name][to_name] = { "attr" =>  { "style" => style, "label" => label, "arrowtail" => arrowtail, "arrowhead" => arrowhead, "fontcolor" => color } }
+    @edges[from_name][to_name][edge_name] = { "attr" =>  { "style" => style, "label" => label, "arrowtail" => arrowtail, "arrowhead" => arrowhead, "fontcolor" => color } }
   end
 
   def parse_arrow(arrow)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ulg
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors: