state_machine 0.9.4 → 0.10.0

data/test/unit/transition_test.rb

@@ -589,24 +589,12 @@ class TransitionWithAfterCallbacksTest < Test::Unit::TestCase
     assert !@run
   end
   
-  def test_should_run_if_not_successful_and_includes_failures
-    @machine.after_transition(:include_failures => true) {|object| @run = true}
-    @transition.run_callbacks {{:success => false}}
-    assert @run
-  end
-  
   def test_should_run_if_successful
     @machine.after_transition {|object| @run = true}
     @transition.run_callbacks {{:success => true}}
     assert @run
   end
   
-  def test_should_run_if_successful_and_includes_failures
-    @machine.after_transition(:include_failures => true) {|object| @run = true}
-    @transition.run_callbacks {{:success => true}}
-    assert @run
-  end
-  
   def test_should_pass_transition_as_argument
     @machine.after_transition {|*args| @args = args}
     
@@ -826,13 +814,6 @@ class TransitionWithAroundCallbacksTest < Test::Unit::TestCase
     assert !@after_run
   end
   
-  def test_should_succeed_if_including_failure_and_block_success_is_false
-    @machine.around_transition(:include_failures => true) {|block| @before_run = true; block.call; @after_run = true}
-    assert_equal true, @transition.run_callbacks {{:success => false}}
-    assert @before_run
-    assert @after_run
-  end
-  
   def test_should_succeed_if_block_success_is_false
     @machine.around_transition {|block| @before_run = true; block.call; @after_run = true}
     assert_equal true, @transition.run_callbacks {{:success => true}}
@@ -954,6 +935,128 @@ class TransitionWithMultipleAroundCallbacksTest < Test::Unit::TestCase
   end
 end
 
+class TransitionWithFailureCallbacksTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new
+    
+    @machine = StateMachine::Machine.new(@klass)
+    @machine.state :parked, :idling
+    @machine.event :ignite
+    
+    @object = @klass.new
+    @object.state = 'parked'
+    @transition = StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)
+  end
+  
+  def test_should_only_run_those_that_match_transition_context
+    @count = 0
+    callback = lambda {@count += 1}
+    
+    @machine.after_failure :do => callback
+    @machine.after_failure :on => :park, :do => callback
+    @machine.after_failure :on => :ignite, :do => callback
+    @transition.run_callbacks {{:success => false}}
+    
+    assert_equal 2, @count
+  end
+  
+  def test_should_run_if_not_successful
+    @machine.after_failure {|object| @run = true}
+    @transition.run_callbacks {{:success => false}}
+    assert @run
+  end
+  
+  def test_should_not_run_if_successful
+    @machine.after_failure {|object| @run = true}
+    @transition.run_callbacks {{:success => true}}
+    assert !@run
+  end
+  
+  def test_should_pass_transition_as_argument
+    @machine.after_failure {|*args| @args = args}
+    
+    @transition.run_callbacks {{:success => false}}
+    assert_equal [@object, @transition], @args
+  end
+  
+  def test_should_catch_halts
+    @machine.after_failure {throw :halt}
+    
+    result = nil
+    assert_nothing_thrown { result = @transition.run_callbacks {{:success => false}} }
+    assert_equal true, result
+  end
+  
+  def test_should_not_catch_exceptions
+    @machine.after_failure {raise ArgumentError}
+    assert_raise(ArgumentError) { @transition.run_callbacks {{:success => false}} }
+  end
+  
+  def test_should_not_be_able_to_run_twice
+    @count = 0
+    @machine.after_failure {@count += 1}
+    @transition.run_callbacks {{:success => false}}
+    @transition.run_callbacks {{:success => false}}
+    assert_equal 1, @count
+  end
+  
+  def test_should_not_be_able_to_run_twice_if_halted
+    @count = 0
+    @machine.after_failure {@count += 1; throw :halt}
+    @transition.run_callbacks {{:success => false}}
+    @transition.run_callbacks {{:success => false}}
+    assert_equal 1, @count
+  end
+  
+  def test_should_be_able_to_run_again_after_resetting
+    @count = 0
+    @machine.after_failure {@count += 1}
+    @transition.run_callbacks {{:success => false}}
+    @transition.reset
+    @transition.run_callbacks {{:success => false}}
+    assert_equal 2, @count
+  end
+end
+
+class TransitionWithMultipleFailureCallbacksTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new
+    
+    @machine = StateMachine::Machine.new(@klass)
+    @machine.state :parked, :idling
+    @machine.event :ignite
+    
+    @object = @klass.new
+    @object.state = 'parked'
+    @transition = StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)
+  end
+  
+  def test_should_run_in_the_order_they_were_defined
+    @callbacks = []
+    @machine.after_failure {@callbacks << 1}
+    @machine.after_failure {@callbacks << 2}
+    @transition.run_callbacks {{:success => false}}
+    
+    assert_equal [1, 2], @callbacks
+  end
+  
+  def test_should_not_run_further_callbacks_if_halted
+    @callbacks = []
+    @machine.after_failure {@callbacks << 1; throw :halt}
+    @machine.after_failure {@callbacks << 2}
+    
+    assert_equal true, @transition.run_callbacks {{:success => false}}
+    assert_equal [1], @callbacks
+  end
+  
+  def test_should_fail_if_any_callback_halted
+    @machine.after_failure {true}
+    @machine.after_failure {throw :halt}
+    
+    assert_equal true, @transition.run_callbacks {{:success => false}}
+  end
+end
+
 class TransitionWithMixedCallbacksTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
@@ -1056,16 +1159,33 @@ class TransitionWithMixedCallbacksTest < Test::Unit::TestCase
     assert_equal true, @transition.run_callbacks
     assert_equal [:before_1, :before_around_1, :before_2, :before_around_2, :after_around_2, :after_around_1, :after_1], @callbacks
   end
+end
+
+class TransitionWithBeforeCallbacksSkippedTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new
+    
+    @machine = StateMachine::Machine.new(@klass)
+    @machine.state :parked, :idling
+    @machine.event :ignite
+    
+    @object = @klass.new
+    @object.state = 'parked'
+    @transition = StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)
+  end
   
-  def test_should_run_any_callbacks_that_include_failures_if_block_success_is_false
-    @callbacks = []
-    @machine.around_transition {|block| block.call; @callbacks << :after_around_1}
-    @machine.around_transition(:include_failures => true) {|block| block.call; @callbacks << :after_around_2}
-    @machine.after_transition {@callbacks << :after_1}
-    @machine.after_transition(:include_failures => true) {@callbacks << :after_2}
+  def test_should_not_run_before_callbacks
+    @machine.before_transition {@run = true}
     
-    assert_equal true, @transition.run_callbacks {{:success => false}}
-    assert_equal [:after_around_2, :after_2], @callbacks
+    assert_equal false, @transition.run_callbacks(:before => false)
+    assert !@run
+  end
+  
+  def test_should_run_failure_callbacks
+    @machine.after_failure {@run = true}
+    
+    assert_equal false, @transition.run_callbacks(:before => false)
+    assert @run
   end
 end
 
@@ -1110,20 +1230,6 @@ class TransitionWithAfterCallbacksSkippedTest < Test::Unit::TestCase
     assert !@run
   end
   
-  def test_should_run_after_callbacks_that_include_failures_if_block_success_is_false
-    @machine.after_transition(:include_failures => true) {@run = true}
-    
-    assert_equal true, @transition.run_callbacks(:after => false) {{:success => false}}
-    assert @run
-  end
-  
-  def test_should_run_around_callbacks_that_include_failures_if_block_success_is_false
-    @machine.around_transition(:include_failures => true) {|block| block.call; @run = true}
-    
-    assert_equal true, @transition.run_callbacks(:after => false) {{:success => false}}
-    assert @run
-  end
-  
   def test_should_continue_around_transition_execution_on_second_call
     @callbacks = []
     @machine.around_transition {|block| @callbacks << :before_around_1; block.call; @callbacks << :after_around_1}
@@ -1382,3 +1488,54 @@ class TransitionTransientTest < Test::Unit::TestCase
     assert @transition.transient?
   end
 end
+
+class TransitionEqualityTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new
+    
+    @machine = StateMachine::Machine.new(@klass)
+    @machine.state :parked, :idling
+    @machine.event :ignite
+    
+    @object = @klass.new
+    @object.state = 'parked'
+    @transition = StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)
+  end
+  
+  def test_should_be_equal_with_same_properties
+    transition = StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)
+    assert_equal transition, @transition
+  end
+  
+  def test_should_not_be_equal_with_different_machines
+    machine = StateMachine::Machine.new(@klass, :namespace => :other)
+    machine.state :parked, :idling
+    machine.event :ignite
+    transition = StateMachine::Transition.new(@object, machine, :ignite, :parked, :idling)
+    
+    assert_not_equal transition, @transition
+  end
+  
+  def test_should_not_be_equal_with_different_objects
+    transition = StateMachine::Transition.new(@klass.new, @machine, :ignite, :parked, :idling)
+    assert_not_equal transition, @transition
+  end
+  
+  def test_should_not_be_equal_with_different_event_names
+    @machine.event :park
+    transition = StateMachine::Transition.new(@object, @machine, :park, :parked, :idling)
+    assert_not_equal transition, @transition
+  end
+  
+  def test_should_not_be_equal_with_different_from_state_names
+    @machine.state :first_gear
+    transition = StateMachine::Transition.new(@object, @machine, :ignite, :first_gear, :idling)
+    assert_not_equal transition, @transition
+  end
+  
+  def test_should_not_be_equal_with_different_to_state_names
+    @machine.state :first_gear
+    transition = StateMachine::Transition.new(@object, @machine, :ignite, :idling, :first_gear)
+    assert_not_equal transition, @transition
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  hash: 55
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 -04:00
+date: 2011-03-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -22,88 +28,107 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- examples/AutoShop_state.png
-- examples/vehicle.rb
-- examples/car.rb
-- examples/Vehicle_state.png
-- examples/rails-rest/view_index.html.erb
+- examples/rails-rest/view_edit.html.erb
 - examples/rails-rest/view_new.html.erb
 - examples/rails-rest/view_show.html.erb
-- examples/rails-rest/controller.rb
-- examples/rails-rest/view_edit.html.erb
 - examples/rails-rest/model.rb
 - examples/rails-rest/migration.rb
-- examples/Car_state.png
+- examples/rails-rest/view_index.html.erb
+- examples/rails-rest/controller.rb
+- examples/TrafficLight_state.png
 - examples/traffic_light.rb
-- examples/merb-rest/view_index.html.erb
+- examples/AutoShop_state.png
+- examples/Vehicle_state.png
+- examples/auto_shop.rb
+- examples/vehicle.rb
+- examples/merb-rest/view_edit.html.erb
 - examples/merb-rest/view_new.html.erb
 - examples/merb-rest/view_show.html.erb
-- examples/merb-rest/controller.rb
-- examples/merb-rest/view_edit.html.erb
 - examples/merb-rest/model.rb
-- examples/auto_shop.rb
-- examples/TrafficLight_state.png
-- lib/state_machine.rb
-- lib/tasks/state_machine.rake
-- lib/tasks/state_machine.rb
-- lib/state_machine/transition.rb
-- lib/state_machine/initializers/rails.rb
-- lib/state_machine/initializers/merb.rb
-- lib/state_machine/condition_proxy.rb
-- lib/state_machine/matcher.rb
-- lib/state_machine/state.rb
-- lib/state_machine/assertions.rb
-- lib/state_machine/integrations.rb
-- lib/state_machine/eval_helpers.rb
-- lib/state_machine/event_collection.rb
-- lib/state_machine/matcher_helpers.rb
-- lib/state_machine/guard.rb
-- lib/state_machine/event.rb
+- examples/merb-rest/view_index.html.erb
+- examples/merb-rest/controller.rb
+- examples/Car_state.png
+- examples/car.rb
 - lib/state_machine/callback.rb
+- lib/state_machine/condition_proxy.rb
+- lib/state_machine/error.rb
 - lib/state_machine/machine_collection.rb
-- lib/state_machine/machine.rb
-- lib/state_machine/transition_collection.rb
+- lib/state_machine/integrations/sequel/versions.rb
+- lib/state_machine/integrations/base.rb
+- lib/state_machine/integrations/sequel.rb
 - lib/state_machine/integrations/active_model.rb
+- lib/state_machine/integrations/data_mapper/observer.rb
+- lib/state_machine/integrations/data_mapper/versions.rb
 - lib/state_machine/integrations/mongo_mapper.rb
-- lib/state_machine/integrations/data_mapper.rb
-- lib/state_machine/integrations/active_record.rb
-- lib/state_machine/integrations/sequel.rb
 - lib/state_machine/integrations/active_record/locale.rb
-- lib/state_machine/integrations/data_mapper/observer.rb
+- lib/state_machine/integrations/active_record/versions.rb
+- lib/state_machine/integrations/mongo_mapper/locale.rb
+- lib/state_machine/integrations/mongo_mapper/versions.rb
+- lib/state_machine/integrations/data_mapper.rb
+- lib/state_machine/integrations/mongoid.rb
 - lib/state_machine/integrations/active_model/locale.rb
 - lib/state_machine/integrations/active_model/observer.rb
+- lib/state_machine/integrations/active_model/versions.rb
+- lib/state_machine/integrations/mongoid/locale.rb
+- lib/state_machine/integrations/mongoid/versions.rb
+- lib/state_machine/integrations/active_record.rb
+- lib/state_machine/integrations.rb
+- lib/state_machine/path_collection.rb
 - lib/state_machine/state_collection.rb
-- lib/state_machine/node_collection.rb
+- lib/state_machine/matcher.rb
+- lib/state_machine/machine.rb
+- lib/state_machine/branch.rb
+- lib/state_machine/event_collection.rb
+- lib/state_machine/eval_helpers.rb
+- lib/state_machine/path.rb
 - lib/state_machine/extensions.rb
+- lib/state_machine/initializers/merb.rb
+- lib/state_machine/initializers/rails.rb
 - lib/state_machine/initializers.rb
-- test/files/en.yml
+- lib/state_machine/node_collection.rb
+- lib/state_machine/assertions.rb
+- lib/state_machine/event.rb
+- lib/state_machine/state.rb
+- lib/state_machine/matcher_helpers.rb
+- lib/state_machine/transition.rb
+- lib/state_machine/transition_collection.rb
+- lib/tasks/state_machine.rake
+- lib/tasks/state_machine.rb
+- lib/state_machine.rb
+- test/functional/state_machine_test.rb
 - test/files/switch.rb
-- test/unit/callback_test.rb
-- test/unit/transition_test.rb
+- test/files/en.yml
 - test/unit/machine_test.rb
-- test/unit/event_test.rb
-- test/unit/event_collection_test.rb
-- test/unit/invalid_transition_test.rb
-- test/unit/state_collection_test.rb
-- test/unit/invalid_event_test.rb
+- test/unit/transition_test.rb
+- test/unit/matcher_helpers_test.rb
+- test/unit/invalid_parallel_transition_test.rb
+- test/unit/state_test.rb
+- test/unit/path_collection_test.rb
+- test/unit/node_collection_test.rb
 - test/unit/assertions_test.rb
-- test/unit/integrations_test.rb
-- test/unit/transition_collection_test.rb
-- test/unit/guard_test.rb
+- test/unit/state_machine_test.rb
+- test/unit/invalid_event_test.rb
+- test/unit/branch_test.rb
+- test/unit/event_test.rb
+- test/unit/callback_test.rb
 - test/unit/eval_helpers_test.rb
 - test/unit/integrations/mongo_mapper_test.rb
 - test/unit/integrations/data_mapper_test.rb
-- test/unit/integrations/sequel_test.rb
 - test/unit/integrations/active_model_test.rb
 - test/unit/integrations/active_record_test.rb
+- test/unit/integrations/sequel_test.rb
+- test/unit/integrations/base_test.rb
+- test/unit/integrations/mongoid_test.rb
+- test/unit/error_test.rb
+- test/unit/state_collection_test.rb
+- test/unit/invalid_transition_test.rb
+- test/unit/integrations_test.rb
+- test/unit/transition_collection_test.rb
 - test/unit/matcher_test.rb
-- test/unit/node_collection_test.rb
-- test/unit/matcher_helpers_test.rb
-- test/unit/state_test.rb
 - test/unit/machine_collection_test.rb
-- test/unit/state_machine_test.rb
+- test/unit/event_collection_test.rb
+- test/unit/path_test.rb
 - test/unit/condition_proxy_test.rb
-- test/functional/state_machine_test.rb
 - test/test_helper.rb
 - CHANGELOG.rdoc
 - init.rb
@@ -120,48 +145,60 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds support for creating state machines for attributes on any Ruby class
 test_files: 
-- test/unit/callback_test.rb
-- test/unit/transition_test.rb
+- test/functional/state_machine_test.rb
 - test/unit/machine_test.rb
-- test/unit/event_test.rb
-- test/unit/event_collection_test.rb
-- test/unit/invalid_transition_test.rb
-- test/unit/state_collection_test.rb
-- test/unit/invalid_event_test.rb
+- test/unit/transition_test.rb
+- test/unit/matcher_helpers_test.rb
+- test/unit/invalid_parallel_transition_test.rb
+- test/unit/state_test.rb
+- test/unit/path_collection_test.rb
+- test/unit/node_collection_test.rb
 - test/unit/assertions_test.rb
-- test/unit/integrations_test.rb
-- test/unit/transition_collection_test.rb
-- test/unit/guard_test.rb
+- test/unit/state_machine_test.rb
+- test/unit/invalid_event_test.rb
+- test/unit/branch_test.rb
+- test/unit/event_test.rb
+- test/unit/callback_test.rb
 - test/unit/eval_helpers_test.rb
 - test/unit/integrations/mongo_mapper_test.rb
 - test/unit/integrations/data_mapper_test.rb
-- test/unit/integrations/sequel_test.rb
 - test/unit/integrations/active_model_test.rb
 - test/unit/integrations/active_record_test.rb
+- test/unit/integrations/sequel_test.rb
+- test/unit/integrations/base_test.rb
+- test/unit/integrations/mongoid_test.rb
+- test/unit/error_test.rb
+- test/unit/state_collection_test.rb
+- test/unit/invalid_transition_test.rb
+- test/unit/integrations_test.rb
+- test/unit/transition_collection_test.rb
 - test/unit/matcher_test.rb
-- test/unit/node_collection_test.rb
-- test/unit/matcher_helpers_test.rb
-- test/unit/state_test.rb
 - test/unit/machine_collection_test.rb
-- test/unit/state_machine_test.rb
+- test/unit/event_collection_test.rb
+- test/unit/path_test.rb
 - test/unit/condition_proxy_test.rb
-- test/functional/state_machine_test.rb