ellington 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473bfcef639bc18d7f003e00ccafba00e7ec5c55
-  data.tar.gz: d89e7c0560cfddd667f92eb03960b8f9269c0d23
+  metadata.gz: b39e107345c1fad43d8eb115683b52627b71978f
+  data.tar.gz: f0406c1407a63cfc8bcbd48b6265ed24d2e4ad76
 SHA512:
-  metadata.gz: ec471346cc54bd230a9458ff9b7de7a01ba2f01884700250d5ca572ca79fa0def291caa53cd51773b645212d85a341c840eb1928e114e951820cb77e1ba5d194
-  data.tar.gz: e9784da113e2ff9d2c5adbf80f36415b4718dabaccba66dcfe5ad30a899161b373d15a56c66733e754ae710b3ce7b9cc16bf24c7f7bcf6c6f23acbc64121e084
+  metadata.gz: a272385be445c2afd786c7ec4eba7b2d75381b833d58771ce7298d8fa3a80694df58229347e92745fdeb59744a2b54aaf40a1606f30a9713c6c6c060aa0c8715
+  data.tar.gz: 4c2ef0b65ed7d78c481b2573dd8d9ebf555d845654eb6e176508cd2f103b0ed537c806fb88614fefe2d580dfcecda92605e04e7ccb0e54f40a83d606eca06155

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/hopsoft/ellington.png)](https://travis-ci.org/hopsoft/ellington)
 [![Dependency Status](https://gemnasium.com/hopsoft/ellington.png)](https://gemnasium.com/hopsoft/ellington)
 [![Code Climate](https://codeclimate.com/github/hopsoft/ellington.png)](https://codeclimate.com/github/hopsoft/ellington)
+[![Coverage Status](https://coveralls.io/repos/hopsoft/ellington/badge.png?branch=master)](https://coveralls.io/r/hopsoft/ellington?branch=master)
 
 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).
@@ -29,7 +30,7 @@ We've found that using consistent and cohesive physical metaphors helps people r
 
 ## Lexicon
 
-- **[Conductor](https://github.com/hopsoft/ellington/wiki/Conductor)** - A supervisor responsible for gathering `passengers` and putting them on a `route`.
+- **[Conductor](https://github.com/hopsoft/ellington/wiki/Conductor)** - A supervisor responsible for putting `passengers` on a `route`.
 - **[Passenger](https://github.com/hopsoft/ellington/wiki/Passenger)** - The stateful context that will be riding the virtual subway.
 - **[Route](https://github.com/hopsoft/ellington/wiki/Route)** - A collection of `lines` and their `connections`.
 - **[Line](https://github.com/hopsoft/ellington/wiki/Line)** - A linear track that moves the `passenger` from point A to point B.

data/lib/ellington/conductor.rb

@@ -1,67 +1,20 @@
-require "thread"
-
 module Ellington
   class Conductor
     attr_reader :route
 
     def initialize(route)
       @route = route
-      @conducting = false
-    end
-
-    def conducting?
-      @conducting
-    end
-
-    def start
-      return if conducting?
-
-      mutex.synchronize do
-        @stop = false
-        @conducting = true
-      end
-
-      @thread = Thread.new do
-        loop do
-          if @stop
-            mutex.synchronize { @conducting = false }
-            Thread.current.exit
-          end
-          gather_passengers.each do |passenger|
-            escort(passenger)
-          end
-        end
-      end
-    end
-
-    def stop
-      mutex.synchronize { @stop = true }
-    end
-
-    def wait
-      thread.join
     end
 
+    # override this method in a subclass
+    # to perform actual passenger verification
     def verify(passenger)
       true
     end
 
-    def gather_passengers
-      raise Ellington::NotImplementedError
-    end
-
-    def escort(passenger)
-      return unless verify(passenger) && passenger.locked?
+    def conduct(passenger)
+      return unless verify(passenger)
       route.lines.first.board passenger
     end
-
-    protected
-
-    attr_reader :thread
-
-    def mutex
-      @mutex ||= Mutex.new
-    end
-
   end
 end

data/lib/ellington/line.rb

@@ -91,19 +91,23 @@ module Ellington
       line_info = Ellington::LineInfo.new(self, station_info)
       if line_info.station == stations.last ||
         line_info.passenger.current_state == line_info.station.failed
-        log line_info, :station_completed => true
-        log line_info, :line_completed => true
-        changed
-        notify_observers line_info
-      else
-        log line_info, :station_completed => true
-        if line_info.passenger.current_state == line_info.station.errored
-          Ellington.logger.info "\n" if Ellington.logger
-        end
+          return complete_line(line_info)
+      end
+
+      log line_info, :station_completed => true
+      if line_info.passenger.current_state == line_info.station.errored
+        Ellington.logger.info "\n" if Ellington.logger
       end
     end
 
-    private
+    protected
+
+    def complete_line(line_info)
+      log line_info, :station_completed => true
+      log line_info, :line_completed => true
+      changed
+      notify_observers line_info
+    end
 
     def log(line_info, options={})
       return unless Ellington.logger

data/lib/ellington/passenger.rb

@@ -4,31 +4,16 @@ module Ellington
   class Passenger < SimpleDelegator
     include Observable
     attr_accessor :context, :ticket
-    attr_reader :route
+    attr_reader :route, :state_history
 
-    def initialize(context, route, ticket=nil)
-      ticket ||= Ellington::Ticket.new
+    def initialize(context, route, options={})
       @context = context
       @route = route
-      @ticket = ticket
+      @ticket = options[:ticket] || Ellington::Ticket.new
+      @state_history = options[:state_history] || []
       super context
     end
 
-    def lock
-      return context.lock if context.respond_to?(:lock)
-      @locked = true
-    end
-
-    def unlock
-      return context.unlock if context.respond_to?(:unlock)
-      @locked = false
-    end
-
-    def locked?
-      return context.locked? if context.respond_to?(:locked?)
-      @locked
-    end
-
     def current_state
       return context.current_state if context.respond_to?(:current_state)
       @current_state
@@ -39,20 +24,11 @@ module Ellington
       @current_state = value
     end
 
-    def state_history
-      @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"
-        raise Ellington::InvalidStateTransition.new(message)
-      end
-
       if !route.states.can_transition?(current_state => new_state)
         message = "Cannot transition #{self.class.name} from:#{current_state} to:#{new_state}"
         raise Ellington::InvalidStateTransition.new(message)
@@ -61,7 +37,7 @@ module Ellington
       old_state = current_state
 
       if context.respond_to?(:transition_to)
-        return_value = context.transition_to(new_state) 
+        return_value = context.transition_to(new_state)
       else
         self.current_state = new_state
       end

data/lib/ellington/route.rb

@@ -43,14 +43,6 @@ module Ellington
         (@subclasses ||= []) << subclass
       end
 
-      def generate_graphs(dir, options={})
-        options[:format] ||= :svg
-        FileUtils.mkdir_p(dir)
-        @subclasses.each do |subclass|
-          Ellington::Visualizer.new(subclass.new, dir, options[:format]).graph_all
-        end
-      end
-
       def initialized?
         @initialized
       end
@@ -116,26 +108,29 @@ module Ellington
 
       def line_completed(line_info)
         route_info = Ellington::RouteInfo.new(self, line_info)
-
-        required_connections = connections.select do |connection|
-          connection.required?(route_info.passenger)
+        connections = required_connections(route_info.passenger)
+        return complete_route(route_info) if connections.empty?
+        connections.each do |connection|
+          connection.line.board route_info.passenger, route_info.options
         end
+      end
 
-        if required_connections.empty?
-          if passed.satisfied?(route_info.passenger) || failed.satisfied?(route_info.passenger)
-            log route_info
-            changed
-            notify_observers route_info
-          end
-          Ellington.logger.info "\n" if Ellington.logger
-        end
+      protected
 
-        required_connections.each do |connection|
-          connection.line.board route_info.passenger, route_info.options
+      def complete_route(route_info)
+        if passed.satisfied?(route_info.passenger) || failed.satisfied?(route_info.passenger)
+          log route_info
+          changed
+          notify_observers route_info
         end
+        Ellington.logger.info "\n" if Ellington.logger
       end
 
-      private
+      def required_connections(passenger)
+        connections.select do |connection|
+          connection.required?(passenger)
+        end
+      end
 
       def log(route_info)
         return unless Ellington.logger

data/lib/ellington/station.rb

@@ -47,8 +47,9 @@ module Ellington
     end
 
     def can_engage?(passenger, options={})
-      passenger.locked? &&
-        route.states.can_transition?(passenger.current_state => states.keys)
+      return false unless route.states.can_transition?(passenger.current_state => states.keys)
+      return false if passenger.state_history_includes?(passed)
+      true
     end
 
     def engage(passenger, options={})
@@ -92,3 +93,4 @@ module Ellington
   end
 
 end
+

data/lib/ellington/version.rb

@@ -1,3 +1,3 @@
 module Ellington
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ellington/visualizer.rb

@@ -15,6 +15,11 @@ module Ellington
         super children
       end
 
+      def add(node)
+        self << node
+        node
+      end
+
       def name
         viz.id
       end
@@ -28,11 +33,10 @@ module Ellington
       end
     end
 
-    attr_reader :route, :dir, :format
+    attr_reader :route, :format
 
-    def initialize(route, dir, format=:svg)
+    def initialize(route, format=:svg)
       @route = route
-      @dir = dir
       @format = format
     end
 
@@ -59,51 +63,31 @@ module Ellington
     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(passenger=nil)
       g = Node.new(nil, GraphViz.new("GraphLinesBasic"))
       set_graph_defaults g.viz
       g.viz["label"] = "#{route.name} Lines - basic"
 
       route.lines.each_with_index do |line, index|
-        line_cluster = Node.new(line, g.viz.add_graph("cluster#{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
-        g << line_cluster
 
         line.stations.each do |station|
-          station_node = Node.new(station, line_cluster.viz.add_nodes(station.class.name))
-          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
+          states = station.states.keys
+          station_node = line_cluster.add(Node.new(station, line_cluster.viz.add_nodes(station.class.name)))
+          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
+            #station = node.base
+            #next_station = next_node.base
             edge = line_cluster.viz.add_edges(node.viz, next_node.viz)
-            if passenger 
+            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
@@ -116,8 +100,7 @@ module Ellington
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-lines-basic.#{format}"
-      g.viz.output(format => File.join(dir, file_name))
+      g.viz.output(format => String)
     end
 
     def graph_lines(passenger=nil)
@@ -126,34 +109,17 @@ module Ellington
       g.viz["label"] = "#{route.name} Lines"
 
       route.lines.each_with_index do |line, index|
-        line_cluster = Node.new(line, g.viz.add_graph("cluster#{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
-        g << line_cluster
-
-        line.states.keys.each do |state|
-          state_node = Node.new(state, line_cluster.viz.add_nodes(state))
-          if line.goal.include?(state)
-            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"] = 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
+        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
               if passenger.state_history_includes?(state, transition)
                 edge["color"] = EDGE_COLOR_PASSENGER_HIT
                 edge["penwidth"] = EDGE_PENWIDTH_PASSENGER_HIT
@@ -165,8 +131,7 @@ module Ellington
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-lines.#{format}"
-      g.viz.output(format => File.join(dir, file_name))
+      g.viz.output(format => String)
     end
 
     def graph_route_basic(passenger=nil)
@@ -176,34 +141,17 @@ module Ellington
       g.viz["label"] = "#{route.name} Route - basic"
 
       route.lines.each_with_index do |line, index|
-        line_cluster = Node.new(line, g.viz.add_graph("cluster#{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
-        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))
-          line_cluster << state_node
+          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}" }
-
-          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
+          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"))
         end
       end
 
@@ -255,8 +203,7 @@ module Ellington
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-route-basic.#{format}"
-      g.viz.output(format => File.join(dir, file_name))
+      g.viz.output(format => String)
     end
 
     def graph_route(passenger=nil)
@@ -266,35 +213,18 @@ module Ellington
       g.viz["ranksep"] = 0.8
 
       route.lines.each_with_index do |line, index|
-        line_cluster = Node.new(line, g.viz.add_graph("cluster#{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
-        g << line_cluster
-
-        line.states.keys.each do |state|
-          state_node = Node.new(state, line_cluster.viz.add_nodes(state))
-          if line.goal.include?(state)
-            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"] = 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
+        add_state_nodes_for_line line_cluster, line, passenger
       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| 
+        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
@@ -334,11 +264,43 @@ module Ellington
         end
       end
 
-      file_name = "#{route.name.downcase.gsub("::", "_")}-route.#{format}"
-      g.viz.output(format => File.join(dir, file_name))
+      g.viz.output(format => String)
     end
 
-    private
+    protected
+
+    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)))
+        style_node_for_line(node, line, state)
+        style_node_for_route(node, line.route, state)
+        style_node_for_passenger(node, passenger, state)
+      end
+    end
+
+    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?
+      style_node node, NODE_COLOR_LINE_GOAL
+    end
+
+    def style_node_for_route(node, route, *states)
+      return false 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?
+      node.viz["color"] = NODE_COLOR_PASSENGER_HIT
+      node.viz["penwidth"] = NODE_PENWIDTH_PASSENGER_HIT
+      true
+    end
 
     def color_name(graphviz_color)
       graphviz_color.to_s.gsub("\"", "")

data/test/attendant_test.rb

@@ -8,7 +8,6 @@ class AttendantTest < MicroTest::Test
     @station = line.stations.first
     @passenger = Ellington::Passenger.new(NumberWithHistory.new(0), route)
     @passenger.current_state = route.initial_state
-    @passenger.lock
     @attendant = Ellington::Attendant.new(@station)
     @passenger.add_observer @attendant
   end

data/test/conductor_test.rb

@@ -7,55 +7,23 @@ class ConductorTest < MicroTest::Test
     @conductor = Ellington::Conductor.new(@route)
     @passenger = Ellington::Passenger.new(NumberWithHistory.new(0), @route)
     @passenger.current_state = @route.initial_state
-    @passenger.lock
-  end
-
-  test "not conducting" do
-    assert !@conductor.conducting?
   end
 
   test "verify" do
     assert @conductor.verify(@passenger)
   end
 
-  test "gather_passengers is abstract" do
-    error = nil
-    begin
-      @conductor.gather_passengers
-    rescue Ellington::NotImplementedError => e
-      error = e
-    end
-    assert !error.nil?
-  end
-
-  test "escort" do
-    @conductor.escort(@passenger)
+  test "conduct" do
+    @conductor.conduct(@passenger)
     assert @passenger.current_state != @route.initial_state
   end
 
-  test "escort prevented when passenger doesn't verify" do
+  test "conduct prevented when passenger doesn't verify" do
     def @conductor.verify(passenger)
       false
     end
-    @conductor.escort(@passenger)
+    @conductor.conduct(@passenger)
     assert @passenger.current_state == @route.initial_state
   end
 
-  test "escort prevented when passenger is not locked" do
-    @passenger.unlock
-    assert @passenger.current_state == @route.initial_state
-  end
-
-  test "start/stop with conducting? checks" do
-    def @conductor.gather_passengers
-      sleep 0.1
-      []
-    end
-    @conductor.start
-    assert @conductor.conducting?
-    @conductor.stop
-    sleep 0.2
-    puts !@conductor.conducting?
-  end
-
 end

data/test/example.rb

@@ -190,27 +190,3 @@ class BasicMath < Ellington::Route
   log_options :passenger => [:original_value, :current_value]
 end
 
-# conductor ---------------------------------------------------------------
-class NumberConductor < Ellington::Conductor
-
-  def gather_passengers
-    sleep 1
-    (0..999).to_a.sample(10).map do |num|
-      num = NumberWithHistory.new(num)
-      passenger = Ellington::Passenger.new(num, route)
-      passenger.current_state = route.initial_state
-      passenger.lock
-      passenger
-    end
-  end
-
-end
-
-if ENV["START"]
-  route = BasicMath.new
-  conductor = NumberConductor.new(route)
-  conductor.start
-  #conductor.wait
-  sleep 5
-  conductor.stop
-end

data/test/passenger_test.rb

@@ -8,41 +8,26 @@ class PassengerTest < MicroTest::Test
     @passenger = Ellington::Passenger.new(@number, @route)
   end
 
-  test "lock" do
-    @passenger.lock
-    assert @passenger.locked?
+  test "construct with ticket option" do
+    ticket = Ellington::Ticket.new
+    passenger = Ellington::Passenger.new(@number, @route, :ticket => ticket)
+    assert passenger.ticket == ticket
   end
 
-  test "unlock" do
-    @passenger.lock
-    @passenger.unlock
-    assert !@passenger.locked?
-  end
-
-  test "transition_to fails when unlocked" do
-    error = nil
-    begin
-      @passenger.current_state = @route.initial_state
-      @passenger.transition_to @route.lines.first.states.keys.first
-    rescue Ellington::InvalidStateTransition => e
-      error = e
-    end
-    assert !error.nil?
-    assert error.message == "Cannot transition an unlocked Ellington::Passenger's state"
+  test "construct with state_history option" do
+    passenger = Ellington::Passenger.new(@number, @route, :state_history => [:foo, :bar])
+    assert passenger.state_history == [:foo, :bar]
   end
 
   test "transition_to valid state" do
-    @passenger.lock
     @passenger.current_state = @route.initial_state
     @passenger.transition_to @route.lines.first.states.keys.first
-    @passenger.unlock
     assert @passenger.current_state == @route.lines.first.states.keys.first
   end
 
   test "transition_to invalid state" do
     error = nil
     begin
-      @passenger.lock
       @passenger.current_state = :error
       @passenger.transition_to :happy
     rescue Ellington::InvalidStateTransition => e
@@ -60,10 +45,8 @@ class PassengerTest < MicroTest::Test
     end
 
     @passenger.add_observer(watcher)
-    @passenger.lock
     @passenger.current_state = @route.initial_state
     @passenger.transition_to @route.lines.first.states.keys.first
-    @passenger.unlock
 
     assert watcher.info.passenger == @passenger
     assert watcher.info.old_state == "PRE BasicMath"
@@ -71,11 +54,9 @@ class PassengerTest < MicroTest::Test
   end
 
   test "state_history" do
-    @passenger.lock
     @passenger.current_state = @route.initial_state
     @passenger.transition_to @route.lines[0].states.keys.first
     @passenger.transition_to @route.lines[2].states.keys.first
-    @passenger.unlock
     assert @passenger.state_history == ["PASS Addition Add10", "PASS Multiplication MultiplyBy10"]
   end
 

data/test/station_test.rb

@@ -8,7 +8,6 @@ class StationTest < MicroTest::Test
     @station = @line.stations.first
     @passenger = Ellington::Passenger.new(NumberWithHistory.new(0), @route)
     @passenger.current_state = @route.initial_state
-    @passenger.lock
   end
 
   test "name" do
@@ -89,6 +88,11 @@ class StationTest < MicroTest::Test
     assert !@station.can_engage?(@passenger)
   end
 
+  test "can_engage? returns false if the passed state exists in state_history" do
+    @passenger.current_state = @station.passed
+    assert !@station.can_engage?(@passenger)
+  end
+
   test "engage" do
     @passenger.current_state = @route.initial_state
     @station.engage(@passenger, nil)

data/test/target_test.rb

@@ -24,28 +24,28 @@ class TargetTest < MicroTest::Test
   end
 
   test "not satisfied for passenger in the wrong state" do
-    passenger = Ellington::Passenger.new(@number, Ellington::Ticket.new, StateJacket::Catalog.new)
+    passenger = Ellington::Passenger.new(@number, nil)
     passenger.current_state = :open
     goal = Ellington::Target.new(:closed)
     assert !goal.satisfied?(passenger)
   end
 
   test "satisfied for passenger in the right state" do
-    passenger = Ellington::Passenger.new(@number, Ellington::Ticket.new, StateJacket::Catalog.new)
+    passenger = Ellington::Passenger.new(@number, nil)
     passenger.current_state = :closed
     goal = Ellington::Target.new(:closed)
     assert goal.satisfied?(passenger)
   end
 
   test "satisfied for passenger in an expected state" do
-    passenger = Ellington::Passenger.new(@number, Ellington::Ticket.new, StateJacket::Catalog.new)
+    passenger = Ellington::Passenger.new(@number, nil)
     passenger.current_state = :two
     goal = Ellington::Target.new(:one, :two, :three)
     assert goal.satisfied?(passenger)
   end
 
   test "not satisfied for passenger not in an expected state" do
-    passenger = Ellington::Passenger.new(@number, Ellington::Ticket.new, StateJacket::Catalog.new)
+    passenger = Ellington::Passenger.new(@number, nil)
     passenger.current_state = :four
     goal = Ellington::Target.new(:one, :two, :three)
     assert !goal.satisfied?(passenger)

data/test/test_helper.rb

@@ -1,7 +1,16 @@
-require "micro_test"
-require "micro_mock"
 require "logger"
 require "delegate"
+require "micro_test"
+require "micro_mock"
+require 'simplecov'
+require "coveralls"
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.command_name 'micro_test'
+SimpleCov.start do
+  add_filter "/test/"
+end
+Coveralls.wear!
+
 require_relative "../lib/ellington"
 require_relative "example"
 

data/test/ticket_test.rb

@@ -10,7 +10,7 @@ class TicketTest < MicroTest::Test
       :debit_id => "b834fb69-2eb3-4e57-b313-16b863e91f74",
       :credit_id => "9a670fce-4826-4a90-aaf7-a58738a4ce5b"
     )
-    @passenger = Ellington::Passenger.new(0, @route, @ticket)
+    @passenger = Ellington::Passenger.new(0, @route, :ticket => @ticket)
   end
 
   test "basic ticket" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellington
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hero
@@ -150,6 +150,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An opinionated framework for modeling complex business processes.
 email:
 - natehop@gmail.com
@@ -181,7 +209,6 @@ files:
 - lib/ellington/visualizer.rb
 - lib/ellington.rb
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - Rakefile
 - README.md
@@ -222,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An opinionated framework for modeling complex business processes.
@@ -244,3 +271,4 @@ test_files:
 - test/ticket_test.rb
 - test/transition_info_test.rb
 - test/unique_type_array_test.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ellington (0.1.2)
-      hero (~> 0.1.9)
-      ruby-graphviz (~> 1.0.8)
-      state_jacket (~> 0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    awesome_print (1.1.0)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    coderay (1.0.9)
-    debug_inspector (0.0.2)
-    hero (0.1.9)
-    interception (0.3)
-    method_source (0.8.1)
-    micro_mock (1.1.0)
-    micro_test (0.3.8)
-      os
-    os (0.9.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-rescue (1.1.1)
-      interception (>= 0.3)
-      pry
-    pry-stack_explorer (0.4.9)
-      binding_of_caller (>= 0.7)
-      pry (~> 0.9.11)
-    rake (10.0.4)
-    ruby-graphviz (1.0.9)
-    slop (3.4.5)
-    state_jacket (0.1.0)
-    yell (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  awesome_print
-  ellington!
-  micro_mock
-  micro_test
-  pry-rescue
-  pry-stack_explorer
-  rake
-  yell