0
@@ -1,5 +1,7 @@
0
 == master
0
 
0
+* Add PluginAWeek::StateMachine::Machine#states
0
+* Add PluginAWeek::StateMachine::Event#transitions
0
 * Allow creating transitions with no from state (effectively allowing the transition for *any* from state)
0
 * Reduce the number of objects created for each transition
0
 

0
@@ -11,6 +11,9 @@ module PluginAWeek #:nodoc:
0
       # The name of the action that fires the event
0
       attr_reader :name
0
       
0
+      # The list of transitions that can be made for this event
0
+      attr_reader :transitions
0
+      
0
       delegate  :owner_class,
0
                   :to => :machine
0
       
0
@@ -21,6 +24,7 @@ module PluginAWeek #:nodoc:
0
         @machine = machine
0
         @name = name
0
         @options = options.stringify_keys
0
+        @transitions = []
0
         
0
         add_transition_actions
0
         add_transition_callbacks
0
@@ -63,6 +67,7 @@ module PluginAWeek #:nodoc:
0
         callback = Proc.new {|record, *args| try_transition(transition, true, record, *args)}
0
         owner_class.send("transition_bang_on_#{name}", callback, options)
0
         
0
+        transitions << transition
0
         transition
0
       end
0
       

0
@@ -15,6 +15,9 @@ module PluginAWeek #:nodoc:
0
       # The events that trigger transitions
0
       attr_reader :events
0
       
0
+      # A list of the states defined in the transitions of all of the events
0
+      attr_reader :states
0
+      
0
       # The attribute for which the state machine is being defined
0
       attr_accessor :attribute
0
       
0
@@ -44,6 +47,7 @@ module PluginAWeek #:nodoc:
0
         @attribute = attribute.to_s
0
         @initial_state = options[:initial]
0
         @events = {}
0
+        @states = []
0
         
0
         add_named_scopes
0
       end
0
@@ -110,6 +114,12 @@ module PluginAWeek #:nodoc:
0
         name = name.to_s
0
         event = events[name] = Event.new(self, name, options)
0
         event.instance_eval(&block)
0
+        
0
+        # Record the states
0
+        event.transitions.each do |transition|
0
+          @states |= ([transition.to_state] + transition.from_states)
0
+        end
0
+        
0
         event
0
       end
0
       

0
@@ -14,6 +14,10 @@ class EventTest < Test::Unit::TestCase
0
     assert_equal 'turn_on', @event.name
0
   end
0
   
0
+  def test_should_not_have_any_transitions
0
+    assert @event.transitions.empty?
0
+  end
0
+  
0
   def test_should_define_an_event_action_on_the_owner_class
0
     switch = new_switch
0
     assert switch.respond_to?(:turn_on)
0
@@ -81,6 +85,11 @@ class EventWithTransitionsTest < Test::Unit::TestCase
0
     assert @event.transition(:to => 'on', :from => %w(off on))
0
   end
0
   
0
+  def test_should_have_transitions
0
+    @event.transition(:to => 'on')
0
+    assert @event.transitions.any?
0
+  end
0
+  
0
   def teardown
0
     Switch.class_eval do
0
       @transition_on_turn_on_callbacks = nil

0
@@ -20,6 +20,10 @@ class MachineByDefaultTest < Test::Unit::TestCase
0
   def test_should_not_have_any_events
0
     assert @machine.events.empty?
0
   end
0
+  
0
+  def test_should_not_have_any_states
0
+    assert @machine.states.empty?
0
+  end
0
 end
0
 
0
 class MachineWithInvalidOptionsTest < Test::Unit::TestCase
0
@@ -121,9 +125,27 @@ class MachineWithEventsTest < Test::Unit::TestCase
0
     assert responded
0
   end
0
   
0
-  def test_should_store_the_event
0
+  def test_should_have_events
0
     @machine.event(:turn_on) {}
0
-    assert_equal 1, @machine.events.size
0
+    assert_equal %w(turn_on), @machine.events.keys
0
+  end
0
+end
0
+
0
+class MachineWithEventsAndTransitionsTest < Test::Unit::TestCase
0
+  def setup
0
+    @machine = PluginAWeek::StateMachine::Machine.new(Switch, 'state')
0
+    @machine.event(:turn_on) do
0
+      transition :to => 'on', :from => 'off'
0
+      transition :to => 'error', :from => 'unknown'
0
+    end
0
+  end
0
+  
0
+  def test_should_have_events
0
+    assert_equal %w(turn_on), @machine.events.keys
0
+  end
0
+  
0
+  def test_should_have_states
0
+    assert_equal %w(on off error unknown), @machine.states
0
   end
0
 end
0