state_machine 0.7.2 → 0.7.3

data/test/unit/callback_test.rb

@@ -19,7 +19,7 @@ class CallbackTest < Test::Unit::TestCase
   end
   
   def test_should_not_raise_exception_if_implicit_option_specified
-    assert_nothing_raised { StateMachine::Callback.new(:do => :run, :invalid => true) }
+    assert_nothing_raised { StateMachine::Callback.new(:do => :run, :invalid => :valid) }
   end
   
   def test_should_not_bind_to_objects

data/test/unit/event_collection_test.rb

@@ -168,6 +168,41 @@ class EventCollectionAttributeWithMachineActionTest < Test::Unit::TestCase
   end
 end
 
+class EventCollectionAttributeWithNamespacedMachineTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new do
+      def save
+      end
+    end
+    
+    @machine = StateMachine::Machine.new(@klass, :namespace => 'alarm', :initial => :active, :action => :save)
+    @events = StateMachine::EventCollection.new(@machine)
+    
+    @machine.event :disable
+    @machine.state :active, :off
+    @events << @disable = StateMachine::Event.new(@machine, :disable)
+    
+    @object = @klass.new
+  end
+  
+  def test_should_not_have_transition_if_nil
+    @object.state_event = nil
+    assert_nil @events.attribute_transition_for(@object)
+  end
+  
+  def test_should_have_invalid_transition_if_event_cannot_be_fired
+    @object.state_event = 'disable'
+    assert_equal false, @events.attribute_transition_for(@object)
+  end
+  
+  def test_should_have_valid_transition_if_event_can_be_fired
+    @disable.transition :active => :off
+    @object.state_event = 'disable'
+    
+    assert_instance_of StateMachine::Transition, @events.attribute_transition_for(@object)
+  end
+end
+
 class EventCollectionWithValidationsTest < Test::Unit::TestCase
   def setup
     StateMachine::Integrations.const_set('Custom', Module.new do

data/test/unit/event_test.rb

@@ -193,7 +193,7 @@ class EventTransitionsTest < Test::Unit::TestCase
   end
   
   def test_should_not_raise_exception_if_implicit_option_specified
-    assert_nothing_raised {@event.transition(:invalid => true)}
+    assert_nothing_raised {@event.transition(:invalid => :valid)}
   end
   
   def test_should_not_allow_on_option

data/test/unit/guard_test.rb

@@ -6,7 +6,7 @@ class GuardTest < Test::Unit::TestCase
   end
   
   def test_should_not_raise_exception_if_implicit_option_specified
-    assert_nothing_raised { StateMachine::Guard.new(:invalid => true) }
+    assert_nothing_raised { StateMachine::Guard.new(:invalid => :valid) }
   end
   
   def test_should_not_have_an_if_condition

data/test/unit/integrations/active_record_test.rb

@@ -526,6 +526,29 @@ begin
       end
     end
     
+    class MachineWithValidationsTest < ActiveRecord::TestCase
+      def setup
+        @model = new_model
+        @machine = StateMachine::Machine.new(@model)
+        @machine.state :parked
+        
+        @record = @model.new
+      end
+      
+      def test_should_be_valid_if_state_is_known
+        @record.state = 'parked'
+        
+        assert @record.valid?
+      end
+      
+      def test_should_not_be_valid_if_state_is_unknown
+        @record.state = 'invalid'
+        
+        assert !@record.valid?
+        assert_equal ['State is invalid'], @record.errors.full_messages
+      end
+    end
+    
     class MachineWithStateDrivenValidationsTest < ActiveRecord::TestCase
       def setup
         @model = new_model do

data/test/unit/integrations/data_mapper_test.rb

@@ -4,7 +4,7 @@ begin
   # Load library
   require 'rubygems'
   
-  gem 'dm-core', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.0'
+  gem 'dm-core', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
   require 'dm-core'
   
   # Establish database connection
@@ -324,7 +324,7 @@ begin
     end
     
     begin
-      gem 'dm-observer', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.0'
+      gem 'dm-observer', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
       require 'dm-observer'
       
       class MachineWithObserversTest < BaseTestCase
@@ -524,7 +524,7 @@ begin
     end
     
     begin
-      gem 'dm-validations', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.0'
+      gem 'dm-validations', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
       require 'dm-validations'
       
       class MachineWithValidationsTest < BaseTestCase
@@ -532,24 +532,36 @@ begin
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
           @machine.state :parked
+          
+          @record = @resource.new
         end
         
         def test_should_invalidate_using_errors
-          record = @resource.new
-          record.state = 'parked'
-          
-          @machine.invalidate(record, :state, :invalid_transition, [[:event, :park]])
+          @record.state = 'parked'
           
-          assert_equal ['cannot transition via "park"'], record.errors.on(:state)
+          @machine.invalidate(@record, :state, :invalid_transition, [[:event, :park]])
+          assert_equal ['cannot transition via "park"'], @record.errors.on(:state)
         end
         
         def test_should_clear_errors_on_reset
-          record = @resource.new
-          record.state = 'parked'
-          record.errors.add(:state, 'is invalid')
+          @record.state = 'parked'
+          @record.errors.add(:state, 'is invalid')
+          
+          @machine.reset(@record)
+          assert_nil @record.errors.on(:id)
+        end
+        
+        def test_should_be_valid_if_state_is_known
+          @record.state = 'parked'
           
-          @machine.reset(record)
-          assert_nil record.errors.on(:id)
+          assert @record.valid?
+        end
+        
+        def test_should_not_be_valid_if_state_is_unknown
+          @record.state = 'invalid'
+          
+          assert !@record.valid?
+          assert_equal ['is invalid'], @record.errors.on(:state)
         end
       end
       

data/test/unit/integrations/sequel_test.rb

@@ -336,6 +336,29 @@ begin
       end
     end
     
+    class MachineWithValidationsTest < BaseTestCase
+      def setup
+        @model = new_model
+        @machine = StateMachine::Machine.new(@model)
+        @machine.state :parked
+        
+        @record = @model.new
+      end
+      
+      def test_should_be_valid_if_state_is_known
+        @record.state = 'parked'
+        
+        assert @record.valid?
+      end
+      
+      def test_should_not_be_valid_if_state_is_unknown
+        @record.state = 'invalid'
+        
+        assert !@record.valid?
+        assert_equal ['state is invalid'], @record.errors.full_messages
+      end
+    end
+    
     class MachineWithStateDrivenValidationsTest < BaseTestCase
       def setup
         @model = new_model do

data/test/unit/machine_test.rb

@@ -55,6 +55,12 @@ class MachineByDefaultTest < Test::Unit::TestCase
     assert @machine.state(nil).initial
   end
   
+  def test_should_generate_default_messages
+    assert_equal 'is invalid', @machine.generate_message(:invalid)
+    assert_equal 'cannot transition when parked', @machine.generate_message(:invalid_event, [[:state, :parked]])
+    assert_equal 'cannot transition via "park"', @machine.generate_message(:invalid_transition, [[:event, :park]])
+  end
+  
   def test_should_not_be_extended_by_the_active_record_integration
     assert !(class << @machine; ancestors; end).include?(StateMachine::Integrations::ActiveRecord)
   end
@@ -487,6 +493,10 @@ class MachineWithCustomInvalidationTest < Test::Unit::TestCase
     @object.state = 'parked'
   end
   
+  def test_generate_custom_message
+    assert_equal 'cannot park', @machine.generate_message(:invalid_transition, [[:event, :park]])
+  end
+  
   def test_use_custom_message
     @machine.invalidate(@object, :state, :invalid_transition, [[:event, :park]])
     assert_equal 'cannot park', @object.error
@@ -1273,7 +1283,7 @@ class MachineWithTransitionCallbacksTest < Test::Unit::TestCase
   end
   
   def test_should_not_raise_exception_if_implicit_option_specified
-    assert_nothing_raised {@machine.before_transition :invalid => true, :do => lambda {}}
+    assert_nothing_raised {@machine.before_transition :invalid => :valid, :do => lambda {}}
   end
   
   def test_should_raise_exception_if_method_not_specified

data/test/unit/state_collection_test.rb

@@ -62,9 +62,19 @@ class StateCollectionTest < Test::Unit::TestCase
     assert_equal @parked, @states.match(@object)
   end
   
-  def test_should_raise_exception_if_finding_state_for_object_with_unknown_value
+  def test_should_find_bang_state_for_object_if_value_is_known
+    @object.state = 'parked'
+    assert_equal @parked, @states.match!(@object)
+  end
+  
+  def test_should_not_find_state_for_object_with_unknown_value
+    @object.state = 'invalid'
+    assert_nil @states.match(@object)
+  end
+  
+  def test_should_raise_exception_if_finding_bang_state_for_object_with_unknown_value
     @object.state = 'invalid'
-    exception = assert_raise(ArgumentError) { @states.match(@object) }
+    exception = assert_raise(ArgumentError) { @states.match!(@object) }
     assert_equal '"invalid" is not a known state value', exception.message
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -04:00
+date: 2009-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: []