state_machine 0.8.0 → 0.8.1

data/test/unit/machine_collection_test.rb

@@ -69,6 +69,38 @@ class MachineCollectionStateInitializationTest < Test::Unit::TestCase
     assert_nil @object.state
     assert_equal 'active', @object.alarm_state
   end
+  
+  def test_should_not_set_states_if_ignored
+    @machines.initialize_states(@object, :ignore => [:state, :alarm_state])
+    
+    assert_nil @object.state
+    assert_nil @object.alarm_state
+  end
+  
+  def test_should_set_states_if_not_ignored_and_nil
+    @machines.initialize_states(@object, :ignore => [])
+    
+    assert_equal 'parked', @object.state
+    assert_equal 'active', @object.alarm_state
+  end
+  
+  def test_should_set_states_if_not_ignored_and_empty
+    @object.state = ''
+    @object.alarm_state = ''
+    @machines.initialize_states(@object, :ignore => [])
+    
+    assert_equal 'parked', @object.state
+    assert_equal 'active', @object.alarm_state
+  end
+  
+  def test_should_set_states_if_not_ignored_and_not_empty
+    @object.state = 'idling'
+    @object.alarm_state = 'inactive'
+    @machines.initialize_states(@object, :ignore => [])
+    
+    assert_equal 'parked', @object.state
+    assert_equal 'active', @object.alarm_state
+  end
 end
 
 class MachineCollectionFireExplicitTest < Test::Unit::TestCase
@@ -293,6 +325,10 @@ class MachineCollectionFireImplicitWithoutEventTest < MachineCollectionFireImpli
   def test_should_not_change_event_attribute
     assert_nil @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithBlankEventTest < MachineCollectionFireImplicitTest
@@ -318,6 +354,10 @@ class MachineCollectionFireImplicitWithBlankEventTest < MachineCollectionFireImp
   def test_should_not_change_event_attribute
     assert_nil @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithInvalidEventTest < MachineCollectionFireImplicitTest
@@ -343,6 +383,10 @@ class MachineCollectionFireImplicitWithInvalidEventTest < MachineCollectionFireI
   def test_should_not_reset_event_attribute
     assert_equal :invalid, @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithoutTransitionTest < MachineCollectionFireImplicitTest
@@ -369,6 +413,10 @@ class MachineCollectionFireImplicitWithoutTransitionTest < MachineCollectionFire
   def test_should_not_reset_event_attribute
     assert_equal :ignite, @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithTransitionTest < MachineCollectionFireImplicitTest
@@ -404,6 +452,10 @@ class MachineCollectionFireImplicitWithTransitionTest < MachineCollectionFireImp
     assert_nil @object.state_event
   end
   
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
+  
   def test_should_not_be_successful_if_fired_again
     @object.state_event = 'ignite'
     assert !@machines.fire_event_attributes(@object, :save) { true }
@@ -455,6 +507,10 @@ class MachineCollectionFireImplicitWithActionFailureTest < MachineCollectionFire
   def test_should_not_reset_event_attribute
     assert_equal :ignite, @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithActionErrorTest < MachineCollectionFireImplicitTest
@@ -472,34 +528,27 @@ class MachineCollectionFireImplicitWithActionErrorTest < MachineCollectionFireIm
   def test_should_not_reset_event_attribute
     assert_equal :ignite, @object.state_event
   end
+  
+  def test_should_not_have_event_transition
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitPartialTest < MachineCollectionFireImplicitTest
   def setup
     super
     
-    @ran_before_callback = false
-    @ran_after_callback = false
-    @machine.before_transition { @ran_before_callback = true }
-    @machine.after_transition { @ran_after_callback = true }
-    
     @state_event = nil
+    @state_event_transition = nil
     
     @object.state_event = 'ignite'
     @result = @machines.fire_event_attributes(@object, :save, false) do
       @state_event = @object.state_event
+      @state_event_transition = @object.send(:state_event_transition)
       true
     end
   end
   
-  def test_should_run_before_callbacks
-    assert @ran_before_callback
-  end
-  
-  def test_should_not_run_after_callbacks
-    assert !@ran_after_callback
-  end
-  
   def test_should_be_successful
     assert @result
   end
@@ -508,20 +557,33 @@ class MachineCollectionFireImplicitPartialTest < MachineCollectionFireImplicitTe
     assert_nil @state_event
   end
   
+  def test_should_not_have_event_transition_while_running_action
+    assert_nil @state_event_transition
+  end
+  
   def test_should_transition_state
     assert_equal 'idling', @object.state
   end
   
-  def test_should_not_reset_event_attribute
-    assert_equal :ignite, @object.state_event
+  def test_should_reset_event_attribute
+    assert_nil @object.state_event
   end
   
-  def test_should_reset_event_attributes_after_next_fire_on_success
+  def test_should_have_event_transition
+    assert_not_nil @object.send(:state_event_transition)
+  end
+  
+  def test_should_reset_event_after_next_fire_on_success
     assert @machines.fire_event_attributes(@object, :save) { true }
     assert_equal 'idling', @object.state
     assert_nil @object.state_event
   end
   
+  def test_should_reset_event_transition_after_next_fire_on_success
+    assert @machines.fire_event_attributes(@object, :save) { true }
+    assert_nil @object.send(:state_event_transition)
+  end
+  
   def test_should_guard_transition_after_next_fire_on_success
     @machines.fire_event_attributes(@object, :save) { true }
     
@@ -534,6 +596,7 @@ class MachineCollectionFireImplicitPartialTest < MachineCollectionFireImplicitTe
     assert !@machines.fire_event_attributes(@object, :save) { false }
     assert_equal 'parked', @object.state
     assert_equal :ignite, @object.state_event
+    assert_nil @object.send(:state_event_transition)
     
     @object.state = 'idling'
     assert !@machines.fire_event_attributes(@object, :save) { false }
@@ -550,6 +613,7 @@ class MachineCollectionFireImplicitPartialTest < MachineCollectionFireImplicitTe
     assert_raise(ArgumentError) { @machines.fire_event_attributes(@object, :save) { raise ArgumentError } }
     assert_equal 'parked', @object.state
     assert_equal :ignite, @object.state_event
+    assert_nil @object.send(:state_event_transition)
   end
   
   def test_should_guard_transition_after_next_fire_on_error
@@ -563,6 +627,62 @@ class MachineCollectionFireImplicitPartialTest < MachineCollectionFireImplicitTe
   end
 end
 
+class MachineCollectionFireImplicitPartialWithCallbacksTest < MachineCollectionFireImplicitTest
+  def setup
+    super
+    
+    @object.state_event = 'ignite'
+  end
+  
+  def test_should_run_before_callbacks
+    ran_callback = false
+    @machine.before_transition { ran_callback = true }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert ran_callback
+  end
+  
+  def test_should_not_have_event_during_before_callbacks
+    state_event = nil
+    @machine.before_transition {|object, transition| state_event = object.state_event }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert_nil state_event
+  end
+  
+  def test_should_not_have_event_transition_during_before_callbacks
+    state_event_transition = nil
+    @machine.before_transition {|object, transition| state_event_transition = object.send(:state_event_transition) }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert_nil state_event_transition
+  end
+  
+  def test_should_not_run_after_callbacks
+    ran_callback = false
+    @machine.after_transition { ran_callback = true }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert !ran_callback
+  end
+  
+  def test_should_not_have_event_during_after_callbacks
+    state_event = nil
+    @machine.after_transition {|object, transition| state_event = object.state_event }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert_nil state_event
+  end
+  
+  def test_should_not_have_event_transition_during_after_callbacks
+    state_event_transition = nil
+    @machine.after_transition {|object, transition| state_event_transition = object.send(:state_event_transition) }
+    @machines.fire_event_attributes(@object, :save, false) { true }
+    
+    assert_nil state_event_transition
+  end
+end
+
 class MachineCollectionFireImplicitNestedPartialTest < MachineCollectionFireImplicitTest
   def setup
     super
@@ -591,6 +711,10 @@ class MachineCollectionFireImplicitNestedPartialTest < MachineCollectionFireImpl
   def test_should_reset_event_attribute
     assert_nil @object.state_event
   end
+  
+  def test_should_reset_event_transition_attribute
+    assert_nil @object.send(:state_event_transition)
+  end
 end
 
 class MachineCollectionFireImplicitWithDifferentActionsTest < MachineCollectionFireImplicitTest
@@ -614,10 +738,14 @@ class MachineCollectionFireImplicitWithDifferentActionsTest < MachineCollectionF
     assert_equal 'idling', @object.state
   end
   
-  def test_should_reset_event_attributes_for_action
+  def test_should_reset_event_attribute_for_action
     assert_nil @object.state_event
   end
   
+  def test_should_reset_event_transition_attribute_for_action
+    assert_nil @object.send(:state_event_transition)
+  end
+  
   def test_should_not_transition_states_for_other_actions
     assert_equal 'active', @object.alarm_state
   end
@@ -723,11 +851,88 @@ class MachineCollectionFireImplicitWithCustomMachineNameTest < MachineCollection
     assert @machines.fire_event_attributes(@object, :save) { true }
     assert_equal 'idling', @object.state
     assert_nil @object.state_event
+    assert_nil @object.send(:state_event_transition)
   end
   
   def test_should_be_successful_on_partial_fire
     @machines.fire_event_attributes(@object, :save, false) { true }
     assert_equal 'idling', @object.state
-    assert_equal :ignite, @object.state_event
+    assert_nil @object.state_event
+    assert_not_nil @object.send(:state_event_transition)
+  end
+end
+
+class MachineFireImplicitWithMarshallingTest < MachineCollectionFireImplicitTest
+  def setup
+    super
+    self.class.const_set('Example', @klass)
+    
+    @object.state_event = 'ignite'
+  end
+  
+  def test_should_marshal_during_before_callbacks
+    @machine.before_transition {|object, transition| Marshal.dump(object)}
+    assert_nothing_raised { @machines.fire_event_attributes(@object, :save) { true } }
+  end
+  
+  def test_should_marshal_during_action
+    assert_nothing_raised do
+      @machines.fire_event_attributes(@object, :save) do
+         Marshal.dump(@object)
+         true
+      end
+    end
+  end
+  
+  def test_should_marshal_during_after_callbacks
+    @machine.after_transition {|object, transition| Marshal.dump(object)}
+    assert_nothing_raised { @machines.fire_event_attributes(@object, :save) { true } }
+  end
+  
+  def teardown
+    self.class.send(:remove_const, 'Example')
+  end
+end
+
+class MachineFireImplicitPartialWithMarshallingTest < MachineCollectionFireImplicitTest
+  def setup
+    super
+    self.class.const_set('Example', @klass)
+    
+    @object.state_event = 'ignite'
+  end
+  
+  def test_should_marshal_during_before_callbacks
+    @machine.before_transition {|object, transition| Marshal.dump(object)}
+    assert_nothing_raised do
+      @machines.fire_event_attributes(@object, :save, false) { true }
+      @machines.fire_event_attributes(@object, :save) { true }
+    end
+  end
+  
+  def test_should_marshal_during_action
+    assert_nothing_raised do
+      @machines.fire_event_attributes(@object, :save, false) do
+         Marshal.dump(@object)
+         true
+      end
+      
+      @machines.fire_event_attributes(@object, :save) do
+         Marshal.dump(@object)
+         true
+      end
+    end
+  end
+  
+  def test_should_marshal_during_after_callbacks
+    @machine.after_transition {|object, transition| Marshal.dump(object)}
+    assert_nothing_raised do
+      @machines.fire_event_attributes(@object, :save, false) { true }
+      @machines.fire_event_attributes(@object, :save) { true }
+    end
+  end
+  
+  def teardown
+    self.class.send(:remove_const, 'Example')
   end
 end

data/test/unit/machine_test.rb

@@ -1853,34 +1853,37 @@ begin
     end
     
     def test_should_save_file_with_class_name_by_default
-      graph = @machine.draw(:output => false)
-      assert_equal './Vehicle_state.png', graph.instance_variable_get('@filename')
+      graph = @machine.draw
+      assert File.exists?('./Vehicle_state.png')
     end
     
     def test_should_allow_base_name_to_be_customized
-      graph = @machine.draw(:name => 'machine', :output => false)
-      assert_equal './machine.png', graph.instance_variable_get('@filename')
+      graph = @machine.draw(:name => 'machine')
+      assert File.exists?('./machine.png')
     end
     
     def test_should_allow_format_to_be_customized
-      graph = @machine.draw(:format => 'jpg', :output => false)
-      assert_equal './Vehicle_state.jpg', graph.instance_variable_get('@filename')
-      assert_equal 'jpg', graph.instance_variable_get('@format')
+      graph = @machine.draw(:format => 'jpg')
+      assert File.exists?('./Vehicle_state.jpg')
     end
     
     def test_should_allow_path_to_be_customized
-      graph = @machine.draw(:path => "#{File.dirname(__FILE__)}/", :output => false)
-      assert_equal "#{File.dirname(__FILE__)}/Vehicle_state.png", graph.instance_variable_get('@filename')
+      graph = @machine.draw(:path => "#{File.dirname(__FILE__)}/")
+      assert File.exists?("#{File.dirname(__FILE__)}/Vehicle_state.png")
     end
     
     def test_should_allow_orientation_to_be_landscape
-      graph = @machine.draw(:orientation => 'landscape', :output => false)
-      assert_equal 'LR', graph['rankdir']
+      graph = @machine.draw(:orientation => 'landscape')
+      assert_equal 'LR', graph['rankdir'].to_s.gsub('"', '')
     end
     
     def test_should_allow_orientation_to_be_portrait
-      graph = @machine.draw(:orientation => 'portrait', :output => false)
-      assert_equal 'TB', graph['rankdir']
+      graph = @machine.draw(:orientation => 'portrait')
+      assert_equal 'TB', graph['rankdir'].to_s.gsub('"', '')
+    end
+    
+    def teardown
+      FileUtils.rm Dir["{.,#{File.dirname(__FILE__)}}/*.{png,jpg}"]
     end
   end
   

data/test/unit/state_test.rb

@@ -626,9 +626,8 @@ class StateWithInvalidMethodCallTest < Test::Unit::TestCase
     @object = @klass.new
   end
   
-  def test_should_raise_an_exception
-    exception = assert_raise(NoMethodError) { @state.call(@object, :invalid) }
-    assert_equal "undefined method 'invalid' for #{@object} with idling state", exception.message
+  def test_should_call_method_missing_arg
+    assert_equal 1, @state.call(@object, :invalid, lambda {1})
   end
 end
 
@@ -648,11 +647,11 @@ class StateWithValidMethodCallTest < Test::Unit::TestCase
   end
   
   def test_should_not_raise_an_exception
-    assert_nothing_raised { @state.call(@object, :speed) }
+    assert_nothing_raised { @state.call(@object, :speed, lambda {raise}) }
   end
   
   def test_should_pass_arguments_through
-    assert_equal 1, @state.call(@object, :speed, 1)
+    assert_equal 1, @state.call(@object, :speed, lambda {}, 1)
   end
   
   def test_should_pass_blocks_through
@@ -660,7 +659,7 @@ class StateWithValidMethodCallTest < Test::Unit::TestCase
   end
   
   def test_should_pass_both_arguments_and_blocks_through
-    assert_equal [1, 2], @state.call(@object, :speed, 1) {2}
+    assert_equal [1, 2], @state.call(@object, :speed, lambda {}, 1) {2}
   end
 end
 
@@ -682,15 +681,15 @@ begin
     end
     
     def test_should_use_ellipse_shape
-      assert_equal 'ellipse', @node['shape']
+      assert_equal 'ellipse', @node['shape'].to_s.gsub('"', '')
     end
     
     def test_should_set_width_to_one
-      assert_equal '1', @node['width']
+      assert_equal '1', @node['width'].to_s.gsub('"', '')
     end
     
     def test_should_set_height_to_one
-      assert_equal '1', @node['height']
+      assert_equal '1', @node['height'].to_s.gsub('"', '')
     end
     
     def test_should_use_stringified_name_as_name
@@ -698,7 +697,7 @@ begin
     end
     
     def test_should_use_description_as_label
-      assert_equal 'parked (1)', @node['label']
+      assert_equal 'parked (1)', @node['label'].to_s.gsub('"', '')
     end
   end
   
@@ -715,7 +714,7 @@ begin
     end
     
     def test_should_use_ellipse_as_shape
-      assert_equal 'ellipse', @node['shape']
+      assert_equal 'ellipse', @node['shape'].to_s.gsub('"', '')
     end
     
     def test_should_draw_edge_between_point_and_state
@@ -738,7 +737,7 @@ begin
     end
     
     def test_should_use_description_as_label
-      assert_equal 'nil', @node['label']
+      assert_equal 'nil', @node['label'].to_s.gsub('"', '')
     end
   end
   
@@ -756,7 +755,7 @@ begin
     end
     
     def test_should_use_description_as_label
-      assert_equal 'parked (*)', @node['label']
+      assert_equal 'parked (*)', @node['label'].to_s.gsub('"', '')
     end
   end
   
@@ -773,7 +772,7 @@ begin
     end
     
     def test_should_use_ellipse_as_shape
-      assert_equal 'ellipse', @node['shape']
+      assert_equal 'ellipse', @node['shape'].to_s.gsub('"', '')
     end
   end
   
@@ -787,7 +786,7 @@ begin
     end
     
     def test_should_use_doublecircle_as_shape
-      assert_equal 'doublecircle', @node['shape']
+      assert_equal 'doublecircle', @node['shape'].to_s.gsub('"', '')
     end
   end
 rescue LoadError