vispan 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b8d11f3fe55bb8fc0454b3d96a043ab6921645
-  data.tar.gz: b4bb676fa98c42e5926c291ce519d403e735974c
+  metadata.gz: d650155aa24bb681618252607555d22859de0d3f
+  data.tar.gz: 9e918172c689334f92152a2408ac026dd13a060e
 SHA512:
-  metadata.gz: 60520a76b74223c56369757f8ec50efc38bce53eb865b41f09206ce8ef2790672d7671df4441ab65947c35522af2a07c852ba88ead0428b61a9495bc39e61355
-  data.tar.gz: e23722ed9d1fa0b4e0dabaf9bd198ba33d6c58fa289665c5f7ba15ac398de4a6e448a018a98dbaa2f603f0215839c1b3dd9556f789b75d0c09cf08d8a6926903
+  metadata.gz: 93c57ab536887aabe9f761789aa3666224ecad84cb9baf066c726204b5580f66d64a4e50640e26bc8674a68df301505366e02e953140425ab856e059222cb386
+  data.tar.gz: 2d2d89ba5bb82f39104f385bc03b2eb32552061f40804736f6b6bbabcfc991378be3be30110d00dc2401614a9dd58fe09dbb68c3e1167c721465cccc09a38e0c

data/bin/generate

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # require "./input.rb"
-require "./lib/vispan.rb"
+require './lib/vispan.rb'
 
 if ARGV.length == 2
   input_file = ARGV[0]

data/lib/vispan.rb

@@ -1,7 +1,7 @@
-require "vispan/szenario.rb"
-require "vispan/relation.rb"
-require "vispan/node.rb"
-require "vispan/output_graphic.rb"
+require 'vispan/szenario.rb'
+require 'vispan/relation.rb'
+require 'vispan/node.rb'
+require 'vispan/output_graphic.rb'
 require 'fileutils'
 
 module Vispan
@@ -12,13 +12,11 @@ module Vispan
       @szenarios = []
       separate_szenarios(@input)
 
-      @szenarios.each do |szenario|
-        szenario.assign_ranks
-      end
+      @szenarios.each(&:assign_ranks)
 
-      self.visualize(@output)
-      file_ending = File.extname(@output).delete(".")
-      [200, {"Content-Type" => "image/#{file_ending}"}, [IO.read(@output)]]
+      visualize(@output)
+      file_ending = File.extname(@output).delete('.')
+      [200, { 'Content-Type' => "image/#{file_ending}" }, [IO.read(@output)]]
     end
 
     def initialize(files)
@@ -27,14 +25,13 @@ module Vispan
     end
 
     def separate_szenarios(input_file)
-      @single_szenario = Szenario.new()
+      @single_szenario = Szenario.new
       @relation_lines = []
       @lines = File.readlines(input_file)
       @lines.each_with_index do |line, index|
-
-        if line[0] == "-"
+        if line[0] == '-'
           create_new_szenario(line)
-        elsif (line == "\n" && !@relation_lines.empty?) || (index == @lines.length-1)
+        elsif (line == "\n" && !@relation_lines.empty?) || (index == @lines.length - 1)
           create_new_relation(line)
         elsif line != "\n"
           @relation_lines << line
@@ -44,7 +41,7 @@ module Vispan
     end
 
     def create_new_szenario(line)
-      if @single_szenario.title == ""
+      if @single_szenario.title == ''
         @single_szenario.set_title(line)
       else
         @szenarios << @single_szenario

data/lib/vispan/config.rb

@@ -1,18 +1,17 @@
 NODE_WIDTH = 3.3
 NODE_MARGIN = 0.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:{}}
+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.to_s, width: NODE_WIDTH.to_s },
+                     edge: {}, }
 
-SZENARIO = {szenario:{bgcolor:"mintcream:lightcyan", margin:60, fontsize:18}}
+SZENARIO = { szenario: { bgcolor: 'mintcream:lightcyan', margin: 60, fontsize: 18 } }
 
-NODE = {screen:{fillcolor:"yellowgreen:lemonchiffon"},
-        email:{fillcolor:"grey:ghostwhite"},
-        pdf:{fillcolor:"gold:orange"},
-        command:{fillcolor:"lightblue:steelblue"},
-        helper:{shape:"plaintext", fillcolor:"none", width:"0", height:"0", margin:"0.15"}
-        }
-RELATION = {event:{color:"red", penwidth:"2"},
-            link:{arrowhead:"vee", style:"dashed"}
-            }
+NODE = { screen: { fillcolor: 'yellowgreen:lemonchiffon' },
+         email: { fillcolor: 'grey:ghostwhite' },
+         pdf: { fillcolor: 'gold:orange' },
+         command: { fillcolor: 'lightblue:steelblue' },
+         helper: { shape: 'plaintext', fillcolor: 'none', width: '0', height: '0', margin: '0.15' }, }
+
+RELATION = { event: { color: 'red', penwidth: '2' },
+             link: { arrowhead: 'vee', style: 'dashed' }, }

data/lib/vispan/graphwriter.rb

@@ -1,15 +1,14 @@
-require "vispan/config.rb"
+require 'vispan/config.rb'
 
 class GraphWriter
-
   def build_string(szenarios)
-    "Digraph G{ #{get_general_settings}#{szenarios.map.with_index {|szenario, index| build_szenario(szenario, index)}.join("")}}"
+    "Digraph G{ #{get_general_settings}#{szenarios.map.with_index {|szenario, index| build_szenario(szenario, index)}.join('')}}"
   end
 
   def build_szenario(szenario, index)
-    node_definitions = szenario.nodes.map{|node| write_node(node)}.join("")
-    relation_definitions = szenario.relations.map{|relation| write_relations(relation, szenario)}.join("")
-    effect_definitions = szenario.relations.map {|relation| write_effects(relation)}.join("")
+    node_definitions = szenario.nodes.map {|node| write_node(node)}.join('')
+    relation_definitions = szenario.relations.map {|relation| write_relations(relation, szenario)}.join('')
+    effect_definitions = szenario.relations.map {|relation| write_effects(relation)}.join('')
 
     "\n\nsubgraph cluster#{index.to_s} {label=\"#{szenario.title}\"#{find_attributes(szenario)};\n#{node_definitions}\n#{relation_definitions}#{effect_definitions}}"
   end
@@ -19,14 +18,14 @@ class GraphWriter
   end
 
   def write_relations(relation, szenario)
-    output_port = "e"
-    input_port = "w"
-    sorting_order = ""
+    output_port = 'e'
+    input_port = 'w'
+    sorting_order = ''
 
     if relation.get_direction < 0
       previous_node_name = szenario.get_previous_helper_node(relation)
-      output_port = "w"
-      input_port = "e"
+      output_port = 'w'
+      input_port = 'e'
       sorting_order = "{rank = same; #{previous_node_name}; #{relation.helper.name};}"
     end
 
@@ -41,10 +40,10 @@ class GraphWriter
 
   def find_attributes(element)
     type = element.class.to_s.upcase
-    GraphWriter.const_get(type)[element.type.to_sym].map{|attribute| "; #{attribute[0]}=\"#{attribute[1]}\""}.join("")
+    GraphWriter.const_get(type)[element.type.to_sym].map {|attribute| "; #{attribute[0]}=\"#{attribute[1]}\""}.join('')
   end
 
   def get_general_settings
-    GraphWriter.const_get("GENERAL_SETTINGS").map{|attribute| "#{attribute[0]} [#{attribute[1].map{|attri| "#{attri[0]}=\"#{attri[1]}\""}.join(";")}]"}.join(";")
+    GraphWriter.const_get('GENERAL_SETTINGS').map {|attribute| "#{attribute[0]} [#{attribute[1].map {|attri| "#{attri[0]}=\"#{attri[1]}\""}.join(';')}]"}.join(';')
   end
 end

data/lib/vispan/node.rb

@@ -1,20 +1,19 @@
 require 'securerandom'
 
 class Node
-
   attr_accessor :name, :type, :label, :rank
-  NODE_TYPES = ["screen", "email", "pdf", "command", "helper"]
+  NODE_TYPES = ['screen', 'email', 'pdf', 'command', 'helper']
 
   def initialize(type, label, index, effect_flag)
     @name = transform_to_name(type, label, index, effect_flag)
-    @type = NODE_TYPES.include?(type)? type : ""
+    @type = NODE_TYPES.include?(type) ? type : ''
     @label = label
     @rank = 0
   end
 
   def transform_to_name(type, label, index, effect_flag)
-    label = "node_" + SecureRandom.uuid if effect_flag
-    label = label.gsub(/[-\s.]/, "") + index.to_s
-    label.gsub(/[\/\'|\"|\*|\\]/, "_")
+    label = 'node_' + SecureRandom.uuid if effect_flag
+    label = label.gsub(/[-\s.]/, '') + index.to_s
+    label.gsub(/[\/\'|\"|\*|\\]/, '_')
   end
 end

data/lib/vispan/output_graphic.rb

@@ -1,11 +1,10 @@
 require 'tempfile'
 
 class OutputGraphic
-
   def initialize(szenarios, output_file)
     @file = Tempfile.new(['processed', '.dot'])
     @szenarios = szenarios
-    @processed_string = ""
+    @processed_string = ''
     @output_file = output_file
   end
 
@@ -16,7 +15,7 @@ class OutputGraphic
   end
 
   def build_graph
-    graph = GraphWriter.new()
+    graph = GraphWriter.new
     @processed_string = graph.build_string(@szenarios.reverse)
   end
 
@@ -27,7 +26,7 @@ class OutputGraphic
 
   def generate_graph(output_file)
     FileUtils.mkdir_p File.dirname(output_file)
-    file_ending = File.extname(output_file).delete(".")
+    file_ending = File.extname(output_file).delete('.')
     cmd = "dot -T#{file_ending} #{@file.path} -o #{output_file}"
     system(cmd)
     @file.unlink

data/lib/vispan/relation.rb

@@ -3,7 +3,7 @@ class Relation
 
   def initialize(relation_array, index)
     @effects = []
-    @label = ""
+    @label = ''
 
     extract(relation_array, index)
     set_helper(index)
@@ -13,32 +13,30 @@ class Relation
     @start = set_node(relation_array.shift, index, false)
     set_connection(relation_array.shift)
     @stop = set_node(relation_array.shift, index, false)
-    @effects = relation_array.map{|effect| set_node(effect, index, true)}
+    @effects = relation_array.map {|effect| set_node(effect, index, true)}
   end
 
   def set_connection(label_string)
-    label = label_string.split(":")
+    label = label_string.split(':')
     @type = label.shift.strip.downcase
-    @label = label.join(":").strip if @type.include? "event"
+    @label = label.join(':').strip if @type.include? 'event'
     adjust_length(@label)
   end
 
   def set_node(node_string, index, effect_flag)
-    node_array = node_string.split(":")
+    node_array = node_string.split(':')
     type = node_array.shift.strip.downcase
-    label = node_array.join(":").strip
+    label = node_array.join(':').strip
     adjust_length(label)
     Node.new(type, label, index, effect_flag)
   end
 
   def adjust_length(string)
-
     if string.length > 30
-      (20..string.length).step(20){ |limit|
-
-        if string[limit, string.length-limit].include?(" ")
-          empty = string[limit, string.length-limit].index(" ")
-          string[limit+empty] = "\n"
+      (20..string.length).step(20) { |limit|
+        if string[limit, string.length - limit].include?(' ')
+          empty = string[limit, string.length - limit].index(' ')
+          string[limit + empty] = "\n"
         end
       }
     end
@@ -49,7 +47,7 @@ class Relation
   end
 
   def set_helper(index)
-    @helper = Node.new("helper", @label, index, false)
-    @helper.name = "helper_"+ @helper.name + @stop.name
+    @helper = Node.new('helper', @label, index, false)
+    @helper.name = 'helper_' + @helper.name + @stop.name
   end
 end

data/lib/vispan/szenario.rb

@@ -1,26 +1,26 @@
-require "vispan/graphwriter.rb"
+require 'vispan/graphwriter.rb'
 
 class Szenario
   attr_accessor :title, :relations, :nodes, :type
 
-  def initialize(line = "")
-    @title = line.gsub(/--/, "").strip
+  def initialize(line = '')
+    @title = line.gsub(/--/, '').strip
     @relations = []
     @nodes = []
-    @type = "szenario"
+    @type = 'szenario'
   end
 
   def build_szenario(index)
-    graph = GraphWriter.new()
-    node_definitions = @nodes.map{|node| graph.write_node(node)}.join("")
-    relation_definitions = @relations.map{|relation| graph.write_relations(relation)}.join("")
-    effect_definitions = @relations.map {|relation| graph.write_effects(relation)}.join("")
+    graph = GraphWriter.new
+    node_definitions = @nodes.map {|node| graph.write_node(node)}.join('')
+    relation_definitions = @relations.map {|relation| graph.write_relations(relation)}.join('')
+    effect_definitions = @relations.map {|relation| graph.write_effects(relation)}.join('')
 
     "\n\nsubgraph cluster#{index.to_s} {bgcolor=aliceblue; label=\"#{title}\";\n#{node_definitions}\n#{relation_definitions}#{effect_definitions}}"
   end
 
   def set_title(line)
-    @title = line.gsub(/--/, "").strip
+    @title = line.gsub(/--/, '').strip
   end
 
   def add_relation(relation)
@@ -31,7 +31,7 @@ class Szenario
 
   def add_nodes(nodes_array)
     nodes_array = nodes_array.flatten
-    nodes_array.map{|node| @nodes << node if is_not_saved(node, @nodes)}
+    nodes_array.map {|node| @nodes << node if is_not_saved(node, @nodes)}
   end
 
   def is_not_saved(node, szenario_nodes)
@@ -48,8 +48,7 @@ class Szenario
   end
 
   def assign_ranks
-    rank = @relations.map{|relation|
-
+    rank = @relations.map {|relation|
       if relation.start.rank == 0
         relation.start.rank = 1
         relation.stop.rank = 2 unless relation.stop.rank > 0
@@ -61,11 +60,9 @@ class Szenario
 
   def get_previous_helper_node(relation2)
     @relations.each do |relation|
-
       if relation2.start.name == relation.stop.name
         return relation.helper.name
       end
     end
   end
-
 end

metadata

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