ellington 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d158926e81d20f91c3db3ae55e8a38731132f403
-  data.tar.gz: fb9bbdf73413c8e5cf970b4a741b51d1bdce8196
+  metadata.gz: 0663ec76ffb5ce9f6a83f9d705fa0db42140d321
+  data.tar.gz: 4276cb5695eec75a1ee57fe0ba24d26c16ecb688
 SHA512:
-  metadata.gz: e78d31ba43e27ad2e1c964704801e933453be29fb24de15b3bc97a7604d3c7c521e1d604cec4d6758000f7435bb6b4d8d30fc745bfdbea27aeab676d53452646
-  data.tar.gz: a5f70a00195b58cceaaba01bb20cce09dd7aac282b0b2d96e3614bdaf9be82a6e1ec3cc4b7556ad72559c9076caa1b3e8a5cfa0ef0f47e8792b63e4c49b33d9c
+  metadata.gz: 8e5b8999a2d59992f03f1d38ddf3b79c6dfb6e07df1bb4c574b3648e3f3ef92ef83b23ccfeab47a1bf2a7128fb1ac45b9cb55628288b93869dde9876a7468c7b
+  data.tar.gz: 95f942f7ff068d9dea4c0447279a5716869b6432655db10733fe5873b117c6e7e37854d0d9b528cc6561e380a3599b0b5adac7e373b18809e34e55d3ce5ef47c

data/README.md

@@ -1,4 +1,4 @@
-[![Lines of Code](http://img.shields.io/badge/lines_of_code-932-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
+[![Lines of Code](http://img.shields.io/badge/lines_of_code-870-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
 [![Code Status](http://img.shields.io/codeclimate/github/hopsoft/ellington.svg?style=flat)](https://codeclimate.com/github/hopsoft/ellington)
 [![Dependency Status](http://img.shields.io/gemnasium/hopsoft/ellington.svg?style=flat)](https://gemnasium.com/hopsoft/ellington)
 [![Build Status](http://img.shields.io/travis/hopsoft/ellington.svg?style=flat)](https://travis-ci.org/hopsoft/ellington)
@@ -7,6 +7,15 @@
 
 # Ellington
 
+### Important
+
+__The wiki docs are out of date!__
+
+You'll have to review the examples & code itself for now.
+I'll be working to bring the wiki docs current soon.
+
+---
+
 Named after [Duke Ellington](http://www.dukeellington.com/) whose signature tune was ["Take the 'A' Train"](http://en.wikipedia.org/wiki/Take_the_%22A%22_Train).
 The song was written about [New York City's A train](http://en.wikipedia.org/wiki/A_%28New_York_City_Subway_service%29).
 

data/lib/ellington/connection.rb

@@ -1,25 +1,17 @@
 module Ellington
   class Connection
-    attr_reader :line, :type, :states
+    attr_reader :line, :states, :strict
 
-    def initialize(line, type, *states)
+    def initialize(line, *states, strict: false)
       @line = line
-      @type = type
       @states = Ellington::Target.new(*states)
+      @strict = strict
     end
 
     def required?(passenger)
       return false if line.boarded?(passenger)
-
-      if type == :if_any
-        return states.satisfied?(passenger) 
-      end
-
-      if type == :if_all
-        return (passenger.state_history & states).length == states.length
-      end
-
-      false
+      return (passenger.state_history & states).length == states.length if strict
+      states.satisfied?(passenger)
     end
 
   end

data/lib/ellington/route.rb

@@ -92,9 +92,8 @@ module Ellington
         @connections ||= Ellington::ConnectionList.new
       end
 
-      def connect_to(line, if_any: [], if_all: [])
-        connections << Ellington::Connection.new(line, :if_any, if_any) unless if_any.empty?
-        connections << Ellington::Connection.new(line, :if_all, if_all) unless if_all.empty?
+      def connect(line, after: [], strict: false)
+        connections << Ellington::Connection.new(line, *after, strict: false)
       end
 
       def passenger_attrs_to_log

data/lib/ellington/version.rb

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

data/lib/ellington/visualizer.rb

@@ -41,28 +41,28 @@ module Ellington
       @short_names = short_names
     end
 
-    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"
+    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"
+    EDGE_COLOR_PASSENGER_HIT    = "royalblue1"
+    EDGE_STYLE_PASSENGER_MISS   = "dotted"
+    CLUSTER_STYLE               = "filled"
+    CLUSTER_COLOR               = "gray70"
+    CLUSTER_FILLCOLOR           = "gray70"
+    CLUSTER_PENCOLOR            = "gray50"
 
     def class_label(obj)
       klass = obj
@@ -76,77 +76,6 @@ module Ellington
       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] = "#{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] = 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(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)
-        end
-
-        line_cluster.each_with_index.each do |node, node_index|
-          next_node = line_cluster[node_index + 1]
-          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
-
-      g.viz.output(format => String)
-    end
-
-    def graph_lines(passenger=nil)
-      g = Node.new(nil, GraphViz.new("GraphLines"))
-      set_graph_defaults g.viz
-      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] = class_label(line)
-        add_state_nodes_for_line line_cluster, line, passenger
-
-        line.states.each do |state, transitions|
-          a = line_cluster.find(state)
-          (transitions || []).each do |transition|
-            b = line_cluster.find(transition)
-            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
-
-      g.viz.output(format => String)
-    end
-
     def graph_route_basic(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphRouteBasic"))
       set_graph_defaults g.viz
@@ -158,13 +87,12 @@ module Ellington
         set_cluster_defaults line_cluster.viz
         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} #{class_label(s)}" }
+          states = line.stations.map{ |s| "#{state} #{s.name}" }
           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"))
+          style_node_for_passenger(state_node, passenger, *line.send("#{state.downcase}ed"))
         end
       end
 
@@ -198,15 +126,6 @@ module Ellington
             node_name = nodes.map{ |n| n.base.class.name }.join + state
             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}")
-              g.viz.add_edges from_viz, viz
-            end
-
             g.viz.add_edges(
               viz,
               to_node.viz.get_node("#{connection.line.class.name}#{state}"),
@@ -272,7 +191,7 @@ module Ellington
               from_viz,
               to_viz
             )
-            edge["style"] = EDGE_STYLE_PASSENGER_MISS if passenger
+            edge[:style] = EDGE_STYLE_PASSENGER_MISS if passenger
           end
         end
       end
@@ -294,25 +213,23 @@ module Ellington
     def style_node(node, color)
       node.viz[:color] = color
       node.viz[:fillcolor] = color
-      true
     end
 
     def style_node_for_line(node, line, *states)
-      return false if (line.goal & states).empty?
+      return if (line.goal & states).empty?
       style_node node, NODE_COLOR_LINE_GOAL
     end
 
     def style_node_for_route(node, route, *states)
-      return false if (route.goal & states).empty?
+      return if (route.goal & states).empty?
       style_node node, NODE_COLOR_ROUTE_GOAL
     end
 
     def style_node_for_passenger(node, passenger, *states)
-      return false if passenger.nil?
-      return false if (passenger.state_history & states).empty?
+      return if passenger.nil?
+      return if (passenger.state_history & states).empty?
       node.viz[:color] = NODE_COLOR_PASSENGER_HIT
       node.viz[:penwidth] = NODE_PENWIDTH_PASSENGER_HIT
-      true
     end
 
     def color_name(graphviz_color)
@@ -320,21 +237,21 @@ module Ellington
     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
+      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
+      cluster[:style]     = CLUSTER_STYLE
+      cluster[:color]     = CLUSTER_COLOR
+      cluster[:fillcolor] = CLUSTER_FILLCOLOR
+      cluster[:pencolor]  = CLUSTER_PENCOLOR
     end
 
   end

data/test/connection_test.rb

@@ -5,7 +5,7 @@ class ConnectionTest < PryTest::Test
   before do
     @route = BasicMath.new
     @line = @route.lines.first
-    @connection = Ellington::Connection.new(@route.lines[1], :if_currently, @line.passed)
+    @connection = Ellington::Connection.new(@route.lines[1], @line.passed)
   end
 
   test "line" do

data/test/example.rb

@@ -115,9 +115,8 @@ class BasicMath < Ellington::Route
 
   goal division.passed, multiplication.passed
 
-  connect_to division, :if_any => addition.passed
-  connect_to multiplication, :if_any => addition.failed
+  connect division, after: addition.passed
+  connect multiplication, after: addition.failed
 
   set_passenger_attrs_to_log :original_value, :current_value
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellington
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hero