vispan 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8409b3a4dac60a1aa4a23df4be7f9fa05712240b
-  data.tar.gz: d595e6663e927fa0dfbbdbe19bd815c9f8ea390f
+  metadata.gz: 6e04222200367b3b370b876384e67772cd4525e1
+  data.tar.gz: 15517ce6b826bfaaf4659584bbb68eeaaaf61eee
 SHA512:
-  metadata.gz: b53fbcf60ddf22efe18433ad3aa3af5c00be35750055c324efc523e29eaa1edae25956d1856c31a08e9ee8f86fa47fa7ba05a66fd5c4b8a2db24e4886314de02
-  data.tar.gz: 3d898df89feff8028722e2ec02c1d0d7e98c1e003a29bff1179ccb756df49a849c14d84637c17ffb64afbf05cd0b2a18982a438a958b4aa4db279ab26cf9fbc4
+  metadata.gz: 32f759ffbc7856f191d1a99fa0ae463718adde647e786f626ceaa4cfceb1292306768b4bf876d55289a0268ba6d0b7d7335f8ac3eb3f814dc9279498031c4eb1
+  data.tar.gz: 8df684fc2de6937c4df3053d6ba14d25ec62c7840cb8d27fd44ff4e4bfd070b5e720c110f8d7988d22185cd678b8961c420c1481c5e177b01c3bf3e4104c1a6c

data/lib/vispan.rb

@@ -9,18 +9,21 @@ module Vispan
 
   class WebPreview
     def call(env)
+      @szenarios = []
+      separate_szenarios(@input)
+
+      @szenarios.each do |szenario|
+        szenario.assign_ranks
+      end
+
       self.visualize(@output)
       file_ending = File.extname(@output).delete(".")
       [200, {"Content-Type" => "image/#{file_ending}"}, [IO.read(@output)]]
     end
 
     def initialize(files)
+      @input = files[:input]
       @output = files[:output]
-      @szenarios = []
-      separate_szenarios(files[:input])
-      @szenarios.each do |szenario|
-        szenario.assign_ranks
-      end
     end
 
     def separate_szenarios(input_file)

data/lib/vispan/config.rb

@@ -1,7 +1,7 @@
 NODE_WIDTH = 3.3
 NODE_MARGIN = 0.2
 
-GENERAL_SETTINGS = {graph:{rankdir:"LR", labeljust:"l", splines:"true", concentrate: "true", ranksep:"2"},
+GENERAL_SETTINGS = {graph:{rankdir:"LR", labeljust:"l", splines:"true", concentrate: "true", ranksep:"2", nodesep:"0.1"},
                     node:{shape:"rect", color:"none", style:"rounded, filled",  margin:"#{NODE_MARGIN}", width:"#{NODE_WIDTH}"},
                     edge:{}}
 
@@ -11,8 +11,8 @@ NODE = {screen:{fillcolor:"yellowgreen:lemonchiffon"},
         email:{fillcolor:"grey:ghostwhite"},
         pdf:{fillcolor:"gold:orange"},
         command:{fillcolor:"lightblue:steelblue"},
-        helper:{shape:"plaintext", fillcolor:"none", width:"0.01", height:"0.01", margin:"0.15"}
+        helper:{shape:"plaintext", fillcolor:"none", width:"0", height:"0", margin:"0.15"}
         }
-RELATION = {event:{color:"red"},
-            link:{arrowsize:"0.7", style:"dashed"}
+RELATION = {event:{color:"red", penwidth:"2"},
+            link:{arrowhead:"vee", style:"dashed"}
             }

data/lib/vispan/graphwriter.rb

@@ -36,7 +36,7 @@ class GraphWriter
   end
 
   def write_effects(relation)
-    "{rank = same; #{relation.stop.name}; #{relation.effects.map(&:name).join('; ')};}" unless relation.effects.empty?
+    "subgraph cluster#{relation.start.name} {label = \"Side effects\"; labeljust = \"c\"; style=\"rounded\"; {rank = same; #{relation.helper.name}; #{relation.effects.map(&:name).join(';')};};}" unless relation.effects.empty?
   end
 
   def find_attributes(element)

data/lib/vispan/relation.rb

@@ -6,8 +6,7 @@ class Relation
     @label = ""
 
     extract(relation_array, index)
-    @helper = Node.new("helper", @label, index)
-    @helper.name = "helper_"+ @helper.name + @stop.name
+    set_helper(index)
   end
 
   def extract(relation_array, index)
@@ -19,15 +18,15 @@ class Relation
 
   def set_connection(label_string)
     label = label_string.split(":")
-    @label = label[1].strip if label[0].include? "Event"
+    @type = label.shift.strip.downcase
+    @label = label.join(":").strip if @type.include? "event"
     adjust_length(@label)
-    @type = label[0].strip.downcase
   end
 
   def set_node(node_string, index)
     node_array = node_string.split(":")
-    type = node_array[0].strip.downcase
-    label = node_array[1].strip
+    type = node_array.shift.strip.downcase
+    label = node_array.join(":").strip
     adjust_length(label)
     Node.new(type, label, index)
   end
@@ -48,4 +47,9 @@ class Relation
   def get_direction
     @stop.rank - @start.rank
   end
+
+  def set_helper(index)
+    @helper = Node.new("helper", @label, index)
+    @helper.name = "helper_"+ @helper.name + @stop.name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vispan
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Daniel Witek