ellington 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1047c36cb4128e723415dcd5e7b74f00a38da00b
-  data.tar.gz: 8077a60871b70d5530847a5f78a653ca9236a11e
+  metadata.gz: d158926e81d20f91c3db3ae55e8a38731132f403
+  data.tar.gz: fb9bbdf73413c8e5cf970b4a741b51d1bdce8196
 SHA512:
-  metadata.gz: 5f78a52f1504888e376e61e788eb9bb5ac3aafe5e2b2285ba346bb0d9bfed999ebd1c0c8a860befb9d223520c5adef146852cbd012dc8258aae4079cb4e2d3b9
-  data.tar.gz: 44c136a470a26cb649a78285d45728eefd5e4d8dd95197beb4f73182f0c106f5364f67442ca9b962b8bf9a07d48c83395b63eef6506a2c0ae22ff079daebfa90
+  metadata.gz: e78d31ba43e27ad2e1c964704801e933453be29fb24de15b3bc97a7604d3c7c521e1d604cec4d6758000f7435bb6b4d8d30fc745bfdbea27aeab676d53452646
+  data.tar.gz: a5f70a00195b58cceaaba01bb20cce09dd7aac282b0b2d96e3614bdaf9be82a6e1ec3cc4b7556ad72559c9076caa1b3e8a5cfa0ef0f47e8792b63e4c49b33d9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ellington (0.2.0)
+    ellington (0.2.1)
       hero (~> 0.2.0)
       ruby-graphviz (~> 1.2.1)
       state_jacket (~> 0.1.1)

data/lib/ellington/version.rb

@@ -1,3 +1,3 @@
 module Ellington
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/ellington/visualizer.rb

@@ -33,11 +33,12 @@ module Ellington
       end
     end
 
-    attr_reader :route, :format
+    attr_reader :route, :format, :short_names
 
-    def initialize(route, format=:svg)
+    def initialize(route, format: :svg, short_names: true)
       @route = route
       @format = format
+      @short_names = short_names
     end
 
     FONTNAME = "Helvetica"
@@ -63,19 +64,31 @@ module Ellington
     CLUSTER_FILLCOLOR = "gray70"
     CLUSTER_PENCOLOR = "gray50"
 
+    def class_label(obj)
+      klass = obj
+      klass = klass.class unless klass.is_a?(Class)
+      return klass.name unless short_names
+      klass.name.split("::").last
+    end
+
+    def state_label(state)
+      return state unless short_names
+      state.split(" ").map { |part| part.split("::").last }.join(" | ")
+    end
+
     def graph_lines_basic(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphLinesBasic"))
       set_graph_defaults g.viz
-      g.viz["label"] = "#{route.name} Lines - basic"
+      g.viz[:label] = "#{class_label(route)} Lines - basic"
 
       route.lines.each_with_index do |line, index|
         line_cluster = g.add(Node.new(line, g.viz.add_graph("cluster#{index}")))
         set_cluster_defaults line_cluster.viz
-        line_cluster.viz["label"] = line.class.name
+        line_cluster.viz[:label] = class_label(line)
 
         line.stations.each do |station|
           states = station.states.keys
-          station_node = line_cluster.add(Node.new(station, line_cluster.viz.add_nodes(station.class.name)))
+          station_node = line_cluster.add(Node.new(station, line_cluster.viz.add_nodes(class_label(station))))
           style_node_for_line(station_node, line, *states)
           style_node_for_route(station_node, route, *states)
           style_node_for_passenger(station_node, passenger, *states)
@@ -88,8 +101,8 @@ module Ellington
             #next_station = next_node.base
             edge = line_cluster.viz.add_edges(node.viz, next_node.viz)
             if passenger
-              if color_name(node.viz["color"]) == NODE_COLOR_PASSENGER_HIT &&
-                color_name(next_node.viz["color"]) == NODE_COLOR_PASSENGER_HIT
+              if color_name(node.viz[:color]) == NODE_COLOR_PASSENGER_HIT &&
+                color_name(next_node.viz[:color]) == NODE_COLOR_PASSENGER_HIT
                 edge["color"] = EDGE_COLOR_PASSENGER_HIT
                 edge["penwidth"] = EDGE_PENWIDTH_PASSENGER_HIT
               else
@@ -106,12 +119,12 @@ module Ellington
     def graph_lines(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphLines"))
       set_graph_defaults g.viz
-      g.viz["label"] = "#{route.name} Lines"
+      g.viz[:label] = "#{class_label(route)} Lines"
 
       route.lines.each_with_index do |line, index|
         line_cluster = g.add(Node.new(line, g.viz.add_graph("cluster#{index}")))
         set_cluster_defaults line_cluster.viz
-        line_cluster.viz["label"] = line.class.name
+        line_cluster.viz[:label] = class_label(line)
         add_state_nodes_for_line line_cluster, line, passenger
 
         line.states.each do |state, transitions|
@@ -137,18 +150,18 @@ module Ellington
     def graph_route_basic(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphRouteBasic"))
       set_graph_defaults g.viz
-      g.viz["ranksep"] = 1
-      g.viz["label"] = "#{route.name} Route - basic"
+      g.viz[:ranksep] = 1
+      g.viz[:label] = "#{class_label(route)} Route - basic"
 
       route.lines.each_with_index do |line, index|
         line_cluster = g.add(Node.new(line, g.viz.add_graph("cluster#{index}")))
         set_cluster_defaults line_cluster.viz
-        line_cluster.viz["label"] = line.class.name
+        line_cluster.viz[:label] = class_label(line)
 
         passenger_hit = false
         %w{PASS FAIL ERROR}.each do |state|
           state_node = line_cluster.add(Node.new(state, line_cluster.viz.add_nodes("#{line.class.name}#{state}", "label" => state)))
-          states = line.stations.map{ |s| "#{state} #{s.name}" }
+          states = line.stations.map{ |s| "#{state} #{class_label(s)}" }
           style_node_for_line(state_node, line, *states)
           style_node_for_route(state_node, route, *states)
           passenger_hit ||= style_node_for_passenger(state_node, passenger, *line.send("#{state.downcase}ed"))
@@ -183,11 +196,11 @@ module Ellington
         if connection.type == :if_all
           combos.each do |state, nodes|
             node_name = nodes.map{ |n| n.base.class.name }.join + state
-            node_label = nodes.map{ |n| "#{n.base.class.name} #{state}"}.join("\n")
-            viz = g.viz.add_nodes(node_name, "label" => node_label)
-            viz["style"] = NODE_STYLE_VIRTUAL
-            viz["color"] = NODE_COLOR_VIRTUAL
-            viz["fontcolor"] = NODE_FONTCOLOR_VIRTUAL
+            node_label = nodes.map{ |n| state_label(state) }.join("\n")
+            viz = g.viz.add_nodes(node_name, :label => node_label)
+            viz[:style] = NODE_STYLE_VIRTUAL
+            viz[:color] = NODE_COLOR_VIRTUAL
+            viz[:fontcolor] = NODE_FONTCOLOR_VIRTUAL
 
             nodes.each do |node|
               from_viz = node.viz.get_node("#{node.base.class.name}#{state}")
@@ -209,23 +222,23 @@ module Ellington
     def graph_route(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphRoute"))
       set_graph_defaults g.viz
-      g.viz["label"] = "#{route.name} Lines"
-      g.viz["ranksep"] = 0.8
+      g.viz[:label] = "#{class_label(route)} Lines"
+      g.viz[:ranksep] = 0.8
 
       route.lines.each_with_index do |line, index|
         line_cluster = g.add(Node.new(line, g.viz.add_graph("cluster#{index}")))
         set_cluster_defaults line_cluster.viz
-        line_cluster.viz["label"] = line.class.name
+        line_cluster.viz[:label] = class_label(line)
         add_state_nodes_for_line line_cluster, line, passenger
       end
 
-      viz = g.viz.add_nodes(route.initial_state)
+      viz = g.viz.add_nodes(route.initial_state, :label => state_label(route.initial_state))
       rendered_edges = {}
 
       if passenger
         passenger_nodes = g.reduce([]) do |memo, line_cluster|
           line_cluster.children.each do |node|
-            if node.viz["color"].to_s.gsub(/\W/, "") == NODE_COLOR_PASSENGER_HIT
+            if node.viz[:color].to_s.gsub(/\W/, "") == NODE_COLOR_PASSENGER_HIT
               memo << node
             end
           end
@@ -271,7 +284,7 @@ module Ellington
 
     def add_state_nodes_for_line(cluster, line, passenger)
       line.states.keys.each do |state|
-        node = cluster.add(Node.new(state, cluster.viz.add_nodes(state)))
+        node = cluster.add(Node.new(state, cluster.viz.add_nodes(state, :label => state_label(state))))
         style_node_for_line(node, line, state)
         style_node_for_route(node, route, state)
         style_node_for_passenger(node, passenger, state)
@@ -279,8 +292,8 @@ module Ellington
     end
 
     def style_node(node, color)
-      node.viz["color"] = color
-      node.viz["fillcolor"] = color
+      node.viz[:color] = color
+      node.viz[:fillcolor] = color
       true
     end
 
@@ -297,8 +310,8 @@ module Ellington
     def style_node_for_passenger(node, passenger, *states)
       return false if passenger.nil?
       return false if (passenger.state_history & states).empty?
-      node.viz["color"] = NODE_COLOR_PASSENGER_HIT
-      node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
+      node.viz[:color] = NODE_COLOR_PASSENGER_HIT
+      node.viz[:penwidth] = NODE_PENWIDTH_PASSENGER_HIT
       true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ellington
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nathan Hopkins