vispan 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0223f7cfd208708a1fab670b3ec424f1520bf969
-  data.tar.gz: c298807c684cea9249d3341adcf5ad57cdca3155
+  metadata.gz: 9ab4cac77a347cba8000a50b246d075ec8df347d
+  data.tar.gz: 85ba9617355b813c1ab62b5e9d2bc35251d87ac1
 SHA512:
-  metadata.gz: c39a467ef8ec4130b12d7cce31cafd95576227f4a4ca7f5ca90aba3c676bb92fa206d9e38a705c1832273f9540b7733929d21cae187a09895618fd6ec465ac0f
-  data.tar.gz: a301dd388f4cddca1bbc8023ad168a645f2a8c0cc746918a862f1716b6ee1074fec50f1af381d535ec5dc22e1f15fb76bad12829be35b7d76cc76df475f32463
+  metadata.gz: a2566a5fa96f66fd86988373d9e68233c067a4af5ab0ccf36e1f9a95552dadc06ee7f2ebf2a22203e6c4178d5808bdc9e0fab0dcfe7c9a5a6c35026022240297
+  data.tar.gz: a959b1bd4b3b418dd4ef811583417b3b91ddf23c92f8ed608cdec50869c0a5ba09ce41f6f6a768551e504adb382d408d0401caf2dae83a772a27f638f098b41a

data/bin/generate

@@ -5,7 +5,7 @@ require "./lib/vispan.rb"
 if ARGV.length == 2
   input_file = ARGV[0]
   output_file = ARGV[1]
-  process = Vispan::WebPreview.new(input_file)
+  process = Vispan::WebPreview.new(input: input_file)
   process.display_text
   process.visualize(output_file)
 else

data/lib/vispan.rb

@@ -3,19 +3,22 @@ require "vispan/relation.rb"
 require "vispan/node.rb"
 require "vispan/output_console.rb"
 require "vispan/output_graphic.rb"
+require 'fileutils'
 
 module Vispan
-  attr_reader :processed_string, :nodes, :text, :szenarios
+  attr_reader :szenarios
 
   class WebPreview
     def call(env)
-      self.visualize('process.png')
-      [200, {"Content-Type" => "image/png"}, [IO.read('process.png')]]
+      self.visualize(@output)
+      file_ending = File.extname(output_file).delete(".")
+      [200, {"Content-Type" => "image/#{file_ending}"}, [IO.read(@output)]]
     end
 
-    def initialize(input_file)
+    def initialize(files)
+      @output = files[:output]
       @szenarios = []
-      separate_szenarios(input_file)
+      separate_szenarios(files[:input])
     end
 
     def separate_szenarios(input_file)
@@ -31,7 +34,6 @@ module Vispan
         elsif line != "\n"
           @relation_lines << line
         end
-
       end
 
       @szenarios << @single_szenario
@@ -59,10 +61,8 @@ module Vispan
     end
 
     def visualize(output_file)
-      png = OutputGraphic.new(@szenarios, output_file)
-      png.generate
+      graphic = OutputGraphic.new(@szenarios, output_file)
+      graphic.generate
     end
-
   end
-
 end

data/lib/vispan/config.rb

@@ -1,13 +1,17 @@
 NODE_WIDTH = 3.3
 NODE_MARGIN = 0.2
 
+GENERAL_SETTINGS = {graph:{rankdir:"LR", labeljust:"l", splines:"ortho" },
+                    node:{color:"none", shape:"rect", style:"rounded, filled", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"},
+                    edge:{}}
+
 SZENARIO = {szenario:{bgcolor:"mintcream:lightcyan", margin:60, fontsize:18}}
 
-NODE = {screen:{color:"none", shape:"rect", style:"rounded, filled", fillcolor:"yellowgreen:lemonchiffon", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"},
-              email:{color:"none", shape:"rect",style:"rounded, filled", fillcolor:"grey:ghostwhite", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"},
-              pdf:{color:"none", shape:"rect", style:"rounded, filled", fillcolor:"gold:orange", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"},
-              command:{color:"none", shape:"rect",style:"rounded, filled", fillcolor:"lightblue:steelblue", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"}
-              }
+NODE = {screen:{fillcolor:"yellowgreen:lemonchiffon"},
+        email:{fillcolor:"grey:ghostwhite"},
+        pdf:{fillcolor:"gold:orange"},
+        command:{fillcolor:"lightblue:steelblue"}
+        }
 RELATION = {event:{color:"red"},
-                  link:{arrowhead:"none", arrowsize:"30"}
-                  }
+            link:{arrowhead:"none", arrowsize:"30"}
+            }

data/lib/vispan/graphwriter.rb

@@ -3,7 +3,7 @@ require "vispan/config.rb"
 class GraphWriter
 
   def build_string(szenarios)
-    "Digraph G{ rankdir=LR; splines=ortho;labeljust=l#{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)
@@ -31,4 +31,7 @@ class GraphWriter
     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(";")
+  end
 end

data/lib/vispan/node.rb

@@ -12,5 +12,4 @@ class Node
   def transform_to_name(label, index)
     label.gsub(/[-\s.]/, "") + index.to_s
   end
-
 end

data/lib/vispan/output_console.rb

@@ -20,7 +20,6 @@ class OutputConsole
           @text += "\n"
           @text += "'#{rel.start.label}' führt zu '#{rel.stop.label}'"
           done << rel.start
-
         else
           @text += " und zu '#{rel.stop.label}'"
         end
@@ -29,5 +28,4 @@ class OutputConsole
       @text += "\n"
     end
   end
-
 end

data/lib/vispan/output_graphic.rb

@@ -17,7 +17,7 @@ class OutputGraphic
 
   def build_graph
     graph = GraphWriter.new()
-    @processed_string = graph.build_string(@szenarios)
+    @processed_string = graph.build_string(@szenarios.reverse)
   end
 
   def generate_processed_file(processed_string)
@@ -26,15 +26,10 @@ class OutputGraphic
   end
 
   def generate_graph(output_file)
-    file_ending = check_output(output_file)
+    FileUtils.mkdir_p File.dirname(output_file)
+    file_ending = File.extname(output_file).delete(".")
     cmd = "dot -T#{file_ending} #{@file.path} -o #{output_file}"
     system(cmd)
     @file.unlink
   end
-
-  def check_output(output_file)
-    output_file = output_file.to_s
-    output_file.split(".")[1]
-  end
-
 end

data/lib/vispan/relation.rb

@@ -26,7 +26,6 @@ class Relation
     node_array = node_string.split(":")
     type = node_array[0].strip.downcase
     label = node_array[1].strip
-    # puts label
     adjust_length(label)
     Node.new(type, label, index)
   end
@@ -40,10 +39,7 @@ class Relation
           empty = string[limit, string.length-limit].index(" ")
           string[limit+empty] = "\n"
         end
-
       }
     end
-
   end
-
 end

data/lib/vispan/szenario.rb

@@ -38,5 +38,4 @@ class Szenario
       return false if szenario_node.name == node.name
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vispan
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Daniel Witek
@@ -10,26 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,4 +93,3 @@ signing_key:
 specification_version: 4
 summary: Visualize processes with simple syntax and multiple output formats
 test_files: []
-has_rdoc: