ellington 0.0.5 → 0.0.6

data/lib/ellington/passenger.rb

@@ -43,6 +43,10 @@ module Ellington
       @state_history ||= []
     end
 
+    def state_history_includes?(*states)
+      (state_history & states).length == states.length
+    end
+
     def transition_to(new_state)
       if !locked?
         message = "Cannot transition an unlocked #{self.class.name}'s state"

data/lib/ellington/route.rb

@@ -40,10 +40,11 @@ module Ellington
         (@subclasses ||= []) << subclass
       end
 
-      def generate_graphs(dir)
+      def generate_graphs(dir, options={})
+        options[:format] ||= :svg
         FileUtils.mkdir_p(dir)
         @subclasses.each do |subclass|
-          Ellington::Visualizer.new(subclass.new, dir).graph
+          Ellington::Visualizer.new(subclass.new, dir, options[:format]).graph_all
         end
       end
 
@@ -122,6 +123,7 @@ module Ellington
             log route_info
           end
           Ellington.logger.info "\n" if Ellington.logger
+          binding.pry
         end
 
         required_connections.each do |connection|

data/lib/ellington/version.rb

@@ -1,3 +1,3 @@
 module Ellington
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/ellington/visualizer.rb

@@ -28,76 +28,122 @@ module Ellington
       end
     end
 
-    attr_reader :route, :dir
+    attr_reader :route, :dir, :format
 
-    def initialize(route, dir)
+    def initialize(route, dir, format=:svg)
       @route = route
       @dir = dir
+      @format = format
     end
 
-    def graph
-      graph_route_basic
-      graph_route
-      graph_lines_basic
-      graph_lines
+    FONTNAME = "Helvetica"
+    RANKSEP = 0.4
+    NODE_COLOR = "white"
+    NODE_COLOR_VIRTUAL = "gray50"
+    NODE_COLOR_LINE_GOAL = "green2"
+    NODE_COLOR_ROUTE_GOAL = "gold"
+    NODE_COLOR_PASSENGER_HIT = "royalblue1"
+    NODE_FILLCOLOR = "white"
+    NODE_FILLCOLOR_LINE_GOAL = "green2"
+    NODE_FILLCOLOR_ROUTE_GOAL = "gold"
+    NODE_FONTCOLOR_VIRTUAL = "gray40"
+    NODE_SHAPE = "box"
+    NODE_STYLE = "filled,rounded"
+    NODE_STYLE_VIRTUAL = "rounded"
+    NODE_PENWIDTH_PASSENGER_HIT = 2
+    EDGE_PENWIDTH_PASSENGER_HIT = 2
+    EDGE_COLOR_PASSENGER_HIT = "royalblue1"
+    EDGE_STYLE_PASSENGER_MISS = "dotted"
+    CLUSTER_STYLE = "filled"
+    CLUSTER_COLOR = "gray70"
+    CLUSTER_FILLCOLOR = "gray70"
+    CLUSTER_PENCOLOR = "gray50"
+
+    def graph_all(passenger=nil)
+      graph_route_basic passenger
+      graph_route passenger
+      graph_lines_basic passenger
+      graph_lines passenger
     end
 
-    def graph_lines_basic
-      g = Node.new(nil, GraphViz.new("G"))
+    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["ranksep"] = 0.4
-      g.viz["fontname"] = "Helvetica"
-      g.viz.node["fontname"] = "Helvetica"
-      g.viz.node["shape"] = "box"
-      g.viz.node["style"] = "rounded"
 
       route.lines.each_with_index do |line, index|
         line_cluster = 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["style"] = "filled"
         g << line_cluster
 
         line.stations.each do |station|
           station_node = Node.new(station, line_cluster.viz.add_nodes(station.class.name))
-          station_node.viz["style"] = "filled,rounded"
-          station_node.viz["color"] = "white"
           line_cluster << station_node
+
+          if !(line.goal & station.states.keys).empty?
+            station_node.viz["color"] = NODE_COLOR_LINE_GOAL
+            station_node.viz["fillcolor"] = NODE_COLOR_LINE_GOAL
+          end
+
+          if !(route.goal & station.states.keys).empty?
+            station_node.viz["color"] = NODE_COLOR_ROUTE_GOAL
+            station_node.viz["fillcolor"] = NODE_COLOR_ROUTE_GOAL
+          end
+
+          if passenger && !(passenger.state_history & station.states.keys).empty?
+            station_node.viz["color"] = NODE_COLOR_PASSENGER_HIT
+            station_node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
+          end
         end
 
         line_cluster.each_with_index.each do |node, node_index|
           next_node = line_cluster[node_index + 1]
-          line_cluster.viz.add_edges node.viz, next_node.viz if next_node
+          if next_node
+            station = node.base
+            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
+                edge["color"] = EDGE_COLOR_PASSENGER_HIT
+                edge["penwidth"] = EDGE_PENWIDTH_PASSENGER_HIT
+              else
+                edge["style"] = EDGE_STYLE_PASSENGER_MISS
+              end
+            end
+          end
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-lines-basic.pdf"
-      g.viz.output(:pdf => File.join(dir, file_name))
+      file_name = "#{route.name.downcase.gsub("::", "_")}-lines-basic.#{format}"
+      g.viz.output(format => File.join(dir, file_name))
     end
 
-    def graph_lines
-      g = Node.new(nil, GraphViz.new("G"))
+    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["ranksep"] = 0.4
-      g.viz["fontname"] = "Helvetica"
-      g.viz.node["fontname"] = "Helvetica"
-      g.viz.node["shape"] = "box"
-      g.viz.node["style"] = "rounded"
 
       route.lines.each_with_index do |line, index|
         line_cluster = 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["style"] = "filled"
         g << line_cluster
 
         line.states.keys.each do |state|
           state_node = Node.new(state, line_cluster.viz.add_nodes(state))
-          state_node.viz["style"] = "filled,rounded"
-          state_node.viz["color"] = "white"
           if line.goal.include?(state)
-            state_node.viz["color"] = "green2"
+            state_node.viz["color"] = NODE_COLOR_LINE_GOAL
+            state_node.viz["fillcolor"] = NODE_FILLCOLOR_LINE_GOAL
           end
           if route.goal.include?(state)
-            state_node.viz["color"] = "gold"
+            state_node.viz["color"] = NODE_COLOR_ROUTE_GOAL
+            state_node.viz["fillcolor"] = NODE_FILLCOLOR_ROUTE_GOAL
+          end
+          if passenger && passenger.state_history_includes?(state)
+            state_node.viz["color"] = NODE_COLOR_PASSENGER_HIT
+            state_node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
           end
           line_cluster << state_node
         end
@@ -106,45 +152,64 @@ module Ellington
           a = line_cluster.find(state)
           (transitions || []).each do |transition|
             b = line_cluster.find(transition)
-            line_cluster.viz.add_edges a.viz, b.viz
+            edge = line_cluster.viz.add_edges(a.viz, b.viz)
+            if passenger 
+              if passenger.state_history_includes?(state, transition)
+                edge["color"] = EDGE_COLOR_PASSENGER_HIT
+                edge["penwidth"] = EDGE_PENWIDTH_PASSENGER_HIT
+              else
+                edge["style"] = EDGE_STYLE_PASSENGER_MISS
+              end
+            end
           end
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-lines.pdf"
-      g.viz.output(:pdf => File.join(dir, file_name))
+      file_name = "#{route.name.downcase.gsub("::", "_")}-lines.#{format}"
+      g.viz.output(format => File.join(dir, file_name))
     end
 
-    def graph_route_basic
-      g = Node.new(nil, GraphViz.new("G"))
+    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["compound"] = true
-      g.viz["ranksep"] = 1.2
-      g.viz["fontname"] = "Helvetica"
-      g.viz.node["fontname"] = "Helvetica"
-      g.viz.node["shape"] = "box"
-      g.viz.node["style"] = "rounded"
 
       route.lines.each_with_index do |line, index|
         line_cluster = 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["style"] = "filled"
         g << line_cluster
 
+        passenger_hit = false
         %w{PASS FAIL ERROR}.each do |state|
           state_node = Node.new(state, line_cluster.viz.add_nodes("#{line.class.name}#{state}", "label" => state))
-          state_node.viz["style"] = "filled,rounded"
-          state_node.viz["color"] = "white"
-          if !(route.goal & line.stations.map{ |s| "#{state} #{s.name}" }).empty?
-            state_node.viz["color"] = "gold"
-          end
           line_cluster << state_node
+          states = line.stations.map{ |s| "#{state} #{s.name}" }
+
+          if !(line.goal & states).empty?
+            state_node.viz["color"] = NODE_COLOR_LINE_GOAL
+            state_node.viz["fillcolor"] = NODE_COLOR_LINE_GOAL
+          end
+
+          if !(route.goal & states).empty?
+            state_node.viz["color"] = NODE_COLOR_ROUTE_GOAL
+            state_node.viz["fillcolor"] = NODE_COLOR_ROUTE_GOAL
+          end
+
+          if passenger
+            if !passenger_hit && !(passenger.state_history & line.send("#{state.downcase}ed")).empty?
+              passenger_hit = true
+              state_node.viz["color"] = NODE_COLOR_PASSENGER_HIT
+              state_node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
+            end
+          end
         end
       end
 
       route.connections.each do |connection|
         to_node = g.find(connection.line)
-        from_line = to_node.base
+        to_line = to_node.base
 
         combos = {}
         g.to_a.each do |node|
@@ -157,10 +222,10 @@ module Ellington
         if connection.type == :if_any
           combos.each do |state, nodes|
             nodes.each do |node|
-              to_line = node.base
+              from_line = node.base
               g.viz.add_edges(
-                node.viz.get_node("#{to_line.class.name}#{state}"),
-                to_node.viz.get_node("#{from_line.class.name}PASS"),
+                node.viz.get_node("#{from_line.class.name}#{state}"),
+                to_node.viz.get_node("#{to_line.class.name}PASS"),
                 "lhead" => to_node.viz.id
               )
             end
@@ -172,9 +237,9 @@ module Ellington
             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"] = "rounded"
-            viz["color"] = "gray50"
-            viz["fontcolor"] = "gray40"
+            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}")
@@ -190,41 +255,62 @@ module Ellington
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-route-basic.pdf"
-      g.viz.output(:pdf => File.join(dir, file_name))
+      file_name = "#{route.name.downcase.gsub("::", "_")}-route-basic.#{format}"
+      g.viz.output(format => File.join(dir, file_name))
     end
 
-    def graph_route
-      g = Node.new(nil, GraphViz.new("G"))
+    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["compound"] = true
       g.viz["ranksep"] = 0.8
-      g.viz["fontname"] = "Helvetica"
-      g.viz.node["fontname"] = "Helvetica"
-      g.viz.node["shape"] = "box"
-      g.viz.node["style"] = "rounded"
 
       route.lines.each_with_index do |line, index|
         line_cluster = 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["style"] = "filled"
         g << line_cluster
 
         line.states.keys.each do |state|
           state_node = Node.new(state, line_cluster.viz.add_nodes(state))
-          state_node.viz["style"] = "filled,rounded"
-          state_node.viz["color"] = "white"
           if line.goal.include?(state)
-            state_node.viz["color"] = "green2"
+            state_node.viz["color"] = NODE_COLOR_LINE_GOAL
+            state_node.viz["fillcolor"] = NODE_FILLCOLOR_LINE_GOAL
           end
           if route.goal.include?(state)
-            state_node.viz["color"] = "gold"
+            state_node.viz["color"] = NODE_COLOR_ROUTE_GOAL
+            state_node.viz["fillcolor"] = NODE_FILLCOLOR_ROUTE_GOAL
+          end
+          if passenger && passenger.state_history_includes?(state)
+            state_node.viz["color"] = NODE_COLOR_PASSENGER_HIT
+            state_node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
           end
           line_cluster << state_node
         end
       end
 
       viz = g.viz.add_nodes(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
+              memo << node
+            end
+          end
+          memo
+        end
+        previous_node = nil
+        passenger_nodes.each do |node|
+          from_viz = previous_node.nil? ? viz : previous_node.viz
+          rendered_edges[from_viz.id + node.viz.id] = true
+          edge = g.viz.add_edges(from_viz, node.viz)
+          edge["color"] = EDGE_COLOR_PASSENGER_HIT
+          edge["penwidth"] = EDGE_PENWIDTH_PASSENGER_HIT
+          previous_node = node
+        end
+      end
 
       route.states.each do |from_state, to_states|
         (to_states || []).each do |to_state|
@@ -237,17 +323,43 @@ module Ellington
           to_viz = to_node.viz.get_node(to_state) if to_node
           to_viz ||= g.viz.get_node(to_state)
 
-          if from_viz && to_viz
-            g.viz.add_edges(
+          if from_viz && to_viz && !rendered_edges[from_viz.id + to_viz.id]
+            rendered_edges[from_viz.id + to_viz.id] = true
+            edge = g.viz.add_edges(
               from_viz,
               to_viz
             )
+            edge["style"] = EDGE_STYLE_PASSENGER_MISS if passenger
           end
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-route.pdf"
-      g.viz.output(:pdf => File.join(dir, file_name))
+      file_name = "#{route.name.downcase.gsub("::", "_")}-route.#{format}"
+      g.viz.output(format => File.join(dir, file_name))
+    end
+
+    private
+
+    def color_name(graphviz_color)
+      graphviz_color.to_s.gsub("\"", "")
+    end
+
+    def set_graph_defaults(graph)
+      graph["compound"] = true
+      graph["ranksep"] = RANKSEP
+      graph["fontname"] = FONTNAME
+      graph.node["fontname"] = FONTNAME
+      graph.node["shape"] = NODE_SHAPE
+      graph.node["style"] = NODE_STYLE
+      graph.node["color"] = NODE_COLOR
+      graph.node["fillcolor"] = NODE_FILLCOLOR
+    end
+
+    def set_cluster_defaults(cluster)
+      cluster["style"] = CLUSTER_STYLE
+      cluster["color"] = CLUSTER_COLOR
+      cluster["fillcolor"] = CLUSTER_FILLCOLOR
+      cluster["pencolor"] = CLUSTER_PENCOLOR
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ellington
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hero
@@ -90,7 +90,6 @@ files:
 - lib/ellington/version.rb
 - lib/ellington/visualizer.rb
 - lib/ellington.rb
-- Blast.pdf
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A micro framework to ensure your projects are easy to manage, develop, &
@@ -157,4 +156,3 @@ test_files:
 - test/ticket_test.rb
 - test/transition_info_test.rb
 - test/unique_type_array_test.rb
-has_rdoc: