state_machine 0.5.2 → 0.6.0

data/test/unit/integrations/sequel_test.rb

@@ -307,6 +307,35 @@ begin
         assert_equal [1, 2, 3], @record.callback_result
       end
     end
+    
+    class MachineWithStateDrivenValidationsTest < BaseTestCase
+      def setup
+        @model = new_model do
+          attr_accessor :seatbelt
+        end
+        
+        @machine = StateMachine::Machine.new(@model)
+        @machine.state :first_gear do
+          validates_presence_of :seatbelt
+        end
+        @machine.other_states :parked
+      end
+      
+      def test_should_be_valid_if_validation_fails_outside_state_scope
+        record = @model.new(:state => 'parked', :seatbelt => nil)
+        assert record.valid?
+      end
+      
+      def test_should_be_invalid_if_validation_fails_within_state_scope
+        record = @model.new(:state => 'first_gear', :seatbelt => nil)
+        assert !record.valid?
+      end
+      
+      def test_should_be_valid_if_validation_succeeds_within_state_scope
+        record = @model.new(:state => 'first_gear', :seatbelt => true)
+        assert record.valid?
+      end
+    end
   end
 rescue LoadError
   $stderr.puts 'Skipping Sequel tests. `gem install sequel` and try again.'

data/test/unit/machine_test.rb

@@ -373,6 +373,16 @@ class MachineTest < Test::Unit::TestCase
     
     assert called
   end
+  
+  def test_should_provide_matcher_helpers_during_initialization
+    matchers = []
+    
+    StateMachine::Machine.new(Class.new) do
+      matchers = [all, any, same]
+    end
+    
+    assert_equal [StateMachine::AllMatcher.instance, StateMachine::AllMatcher.instance, StateMachine::LoopbackMatcher.instance], matchers
+  end
 end
 
 class MachineAfterBeingCopiedTest < Test::Unit::TestCase
@@ -927,6 +937,11 @@ class MachineWithEventsTest < Test::Unit::TestCase
     assert responded
   end
   
+  def test_should_be_aliased_as_on
+    event = @machine.on(:ignite) {}
+    assert_equal :ignite, event.name
+  end
+  
   def test_should_have_events
     event = @machine.event(:ignite)
     assert_equal [event], @machine.events.to_a
@@ -1029,9 +1044,8 @@ class MachineWithTransitionCallbacksTest < Test::Unit::TestCase
     @object.callbacks = []
   end
   
-  def test_should_raise_exception_if_invalid_option_specified
-    exception = assert_raise(ArgumentError) {@machine.before_transition :invalid => true, :do => lambda {}}
-    assert_equal 'Invalid key(s): invalid', exception.message
+  def test_should_not_raise_exception_if_implicit_option_specified
+    assert_nothing_raised {@machine.before_transition :invalid => true, :do => lambda {}}
   end
   
   def test_should_raise_exception_if_do_option_not_specified
@@ -1095,6 +1109,14 @@ class MachineWithTransitionCallbacksTest < Test::Unit::TestCase
     assert_equal [:park], @object.callbacks
   end
   
+  def test_should_support_implicit_requirement
+    @machine.before_transition :parked => :idling, :do => lambda {|object| object.callbacks << :parked}
+    @machine.before_transition :idling => :parked, :do => lambda {|object| object.callbacks << :idling}
+    
+    @event.fire(@object)
+    assert_equal [:parked], @object.callbacks
+  end
+  
   def test_should_track_states_defined_in_transition_callbacks
     @machine.before_transition :from => :parked, :to => :idling, :do => lambda {}
     @machine.after_transition :from => :first_gear, :to => :second_gear, :do => lambda {}

data/test/unit/matcher_helpers_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class MatcherHelpersAllTest < Test::Unit::TestCase
+  include StateMachine::MatcherHelpers
+  
+  def setup
+    @matcher = all
+  end
+  
+  def test_should_build_an_all_matcher
+    assert_equal StateMachine::AllMatcher.instance, @matcher
+  end
+end
+
+class MatcherHelpersAnyTest < Test::Unit::TestCase
+  include StateMachine::MatcherHelpers
+  
+  def setup
+    @matcher = any
+  end
+  
+  def test_should_build_an_all_matcher
+    assert_equal StateMachine::AllMatcher.instance, @matcher
+  end
+end
+
+class MatcherHelpersSameTest < Test::Unit::TestCase
+  include StateMachine::MatcherHelpers
+  
+  def setup
+    @matcher = same
+  end
+  
+  def test_should_build_a_loopback_matcher
+    assert_equal StateMachine::LoopbackMatcher.instance, @matcher
+  end
+end

data/test/unit/node_collection_test.rb

@@ -6,10 +6,6 @@ class NodeCollectionByDefaultTest < Test::Unit::TestCase
   end
   
   def test_should_not_have_any_nodes
-    assert !@collection.any?
-  end
-  
-  def test_should_have_a_zero_length
     assert_equal 0, @collection.length
   end
   

data/test/unit/state_collection_test.rb

@@ -6,10 +6,6 @@ class StateCollectionByDefaultTest < Test::Unit::TestCase
   end
   
   def test_should_not_have_any_nodes
-    assert !@states.any?
-  end
-  
-  def test_should_have_a_zero_length
     assert_equal 0, @states.length
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -05:00
+date: 2009-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,7 @@ files:
 - lib/state_machine/integrations/active_record.rb
 - lib/state_machine/integrations/data_mapper.rb
 - lib/state_machine/eval_helpers.rb
+- lib/state_machine/matcher_helpers.rb
 - lib/state_machine/transition.rb
 - lib/state_machine/callback.rb
 - lib/state_machine/extensions.rb
@@ -51,6 +52,7 @@ files:
 - lib/state_machine/state_collection.rb
 - lib/state_machine/assertions.rb
 - lib/state_machine/matcher.rb
+- lib/state_machine/condition_proxy.rb
 - lib/state_machine/machine.rb
 - lib/state_machine.rb
 - test/sequel.log
@@ -61,6 +63,7 @@ files:
 - test/classes
 - test/classes/switch.rb
 - test/unit
+- test/unit/matcher_helpers_test.rb
 - test/unit/node_collection_test.rb
 - test/unit/matcher_test.rb
 - test/unit/integrations
@@ -77,6 +80,7 @@ files:
 - test/unit/state_test.rb
 - test/unit/guard_test.rb
 - test/unit/assertions_test.rb
+- test/unit/condition_proxy_test.rb
 - test/unit/machine_test.rb
 - test/unit/integrations_test.rb
 - CHANGELOG.rdoc
@@ -112,6 +116,7 @@ specification_version: 2
 summary: Adds support for creating state machines for attributes on any Ruby class
 test_files: 
 - test/functional/state_machine_test.rb
+- test/unit/matcher_helpers_test.rb
 - test/unit/node_collection_test.rb
 - test/unit/matcher_test.rb
 - test/unit/integrations/data_mapper_test.rb
@@ -127,5 +132,6 @@ test_files:
 - test/unit/state_test.rb
 - test/unit/guard_test.rb
 - test/unit/assertions_test.rb
+- test/unit/condition_proxy_test.rb
 - test/unit/machine_test.rb
 - test/unit/integrations_test.rb