state_machine 0.8.1 → 0.9.0

data/test/unit/integrations/data_mapper_test.rb

@@ -1,579 +1,622 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
-begin
-  # Load library
-  require 'rubygems'
-  
-  gem 'dm-core', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
-  require 'dm-core'
-  require 'dm-core/version' unless defined?(::DataMapper::VERSION)
-  
-  # Establish database connection
-  DataMapper.setup(:default, 'sqlite3::memory:')
-  DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", :info)
-  
-  module DataMapperTest
-    class BaseTestCase < Test::Unit::TestCase
-      def default_test
-      end
-      
-      protected
-        # Creates a new DataMapper resource (and the associated table)
-        def new_resource(create_table = :foo, &block)
-          table_name = create_table || :foo
-          
-          resource = Class.new do
-            include DataMapper::Resource
-            
-            storage_names[:default] = table_name.to_s
-            def self.name; "DataMapperTest::#{storage_names[:default].capitalize}"; end
-            
-            property :id, DataMapper::Types::Serial
-            property :state, String
-            
-            auto_migrate! if create_table
-          end
-          resource.class_eval(&block) if block_given?
-          resource
-        end
-        
-        # Creates a new DataMapper observer
-        def new_observer(resource, &block)
-          observer = Class.new do
-            include DataMapper::Observer
-          end
-          observer.observe(resource)
-          observer.class_eval(&block) if block_given?
-          observer
-        end
+# Load library
+require 'rubygems'
+
+gem 'dm-core', ENV['VERSION'] ? "=#{ENV['VERSION']}" : '>=0.9.4'
+require 'dm-core'
+require 'dm-core/version' unless defined?(::DataMapper::VERSION)
+
+if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+  gem 'dm-migrations', ENV['VERSION'] ? "=#{ENV['VERSION']}" : '>=0.10.3'
+  require 'dm-migrations'
+end
+
+# Establish database connection
+DataMapper.setup(:default, 'sqlite3::memory:')
+DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", :info)
+
+module DataMapperTest
+  class BaseTestCase < Test::Unit::TestCase
+    def default_test
     end
     
-    class IntegrationTest < BaseTestCase
-      def test_should_match_if_class_inherits_from_active_record
-        assert StateMachine::Integrations::DataMapper.matches?(new_resource)
-      end
-      
-      def test_should_not_match_if_class_does_not_inherit_from_active_record
-        assert !StateMachine::Integrations::DataMapper.matches?(Class.new)
+    protected
+      # Creates a new DataMapper resource (and the associated table)
+      def new_resource(create_table = :foo, &block)
+        table_name = create_table || :foo
+        
+        resource = Class.new do
+          include DataMapper::Resource
+          
+          storage_names[:default] = table_name.to_s
+          def self.name; "DataMapperTest::#{storage_names[:default].capitalize}"; end
+          
+          property :id, DataMapper::Types::Serial
+          property :state, String
+          
+          auto_migrate! if create_table
+        end
+        resource.class_eval(&block) if block_given?
+        resource
       end
       
-      def test_should_have_defaults
-        assert_equal e = {:action => :save, :use_transactions => false}, StateMachine::Integrations::DataMapper.defaults
+      # Creates a new DataMapper observer
+      def new_observer(resource, &block)
+        observer = Class.new do
+          include DataMapper::Observer
+        end
+        observer.observe(resource)
+        observer.class_eval(&block) if block_given?
+        observer
       end
+  end
+  
+  class IntegrationTest < BaseTestCase
+    def test_should_match_if_class_includes_data_mapper
+      assert StateMachine::Integrations::DataMapper.matches?(new_resource)
     end
     
-    class MachineWithoutDatabaseTest < BaseTestCase
-      def setup
-        @resource = new_resource(false) do
-          # Simulate the database not being available entirely
-          def self.repository
-            raise DataObjects::SyntaxError
-          end
+    def test_should_not_match_if_class_does_not_include_data_mapper
+      assert !StateMachine::Integrations::DataMapper.matches?(Class.new)
+    end
+    
+    def test_should_have_defaults
+      assert_equal e = {:action => :save, :use_transactions => false}, StateMachine::Integrations::DataMapper.defaults
+    end
+  end
+  
+  class MachineWithoutDatabaseTest < BaseTestCase
+    def setup
+      @resource = new_resource(false) do
+        # Simulate the database not being available entirely
+        def self.repository
+          raise DataObjects::SyntaxError
         end
       end
-      
-      def test_should_allow_machine_creation
-        assert_nothing_raised { StateMachine::Machine.new(@resource) }
-      end
     end
     
-    class MachineUnmigratedTest < BaseTestCase
-      def setup
-        @resource = new_resource(false)
-      end
-      
-      def test_should_allow_machine_creation
-        assert_nothing_raised { StateMachine::Machine.new(@resource) }
-      end
+    def test_should_allow_machine_creation
+      assert_nothing_raised { StateMachine::Machine.new(@resource) }
+    end
+  end
+  
+  class MachineUnmigratedTest < BaseTestCase
+    def setup
+      @resource = new_resource(false)
     end
     
-    class MachineByDefaultTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource)
-      end
-      
-      def test_should_use_save_as_action
-        assert_equal :save, @machine.action
-      end
-      
-      def test_should_not_use_transactions
-        assert_equal false, @machine.use_transactions
-      end
-      
-      def test_should_not_have_any_before_callbacks
-        assert_equal 0, @machine.callbacks[:before].size
-      end
-      
-      def test_should_not_have_any_after_callbacks
-        assert_equal 0, @machine.callbacks[:after].size
-      end
+    def test_should_allow_machine_creation
+      assert_nothing_raised { StateMachine::Machine.new(@resource) }
+    end
+  end
+  
+  class MachineByDefaultTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource)
     end
     
-    class MachineWithStaticInitialStateTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          attr_accessor :value
-        end
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-      end
-      
-      def test_should_set_initial_state_on_created_object
-        record = @resource.new
-        assert_equal 'parked', record.state
+    def test_should_use_save_as_action
+      assert_equal :save, @machine.action
+    end
+    
+    def test_should_not_use_transactions
+      assert_equal false, @machine.use_transactions
+    end
+    
+    def test_should_not_have_any_before_callbacks
+      assert_equal 0, @machine.callbacks[:before].size
+    end
+    
+    def test_should_not_have_any_after_callbacks
+      assert_equal 0, @machine.callbacks[:after].size
+    end
+  end
+  
+  class MachineWithStaticInitialStateTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        attr_accessor :value
       end
-      
-      def test_should_set_initial_state_with_nil_attributes
-        @resource.class_eval do
-          def attributes=(attributes)
-            super(attributes || {})
-          end
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+    end
+    
+    def test_should_set_initial_state_on_created_object
+      record = @resource.new
+      assert_equal 'parked', record.state
+    end
+    
+    def test_should_set_initial_state_with_nil_attributes
+      @resource.class_eval do
+        def attributes=(attributes)
+          super(attributes || {})
         end
-        
-        record = @resource.new(nil)
-        assert_equal 'parked', record.state
       end
       
-      def test_should_still_set_attributes
-        record = @resource.new(:value => 1)
-        assert_equal 1, record.value
+      record = @resource.new(nil)
+      assert_equal 'parked', record.state
+    end
+    
+    def test_should_still_set_attributes
+      record = @resource.new(:value => 1)
+      assert_equal 1, record.value
+    end
+    
+    def test_should_not_allow_initialize_blocks
+      block_args = nil
+      record = @resource.new do |*args|
+        block_args = args
       end
       
-      def test_should_not_allow_initialize_blocks
-        block_args = nil
-        record = @resource.new do |*args|
-          block_args = args
-        end
+      assert_nil block_args
+    end
+    
+    def test_should_set_initial_state_before_setting_attributes
+      @resource.class_eval do
+        attr_accessor :state_during_setter
         
-        assert_nil block_args
-      end
-      
-      def test_should_set_initial_state_before_setting_attributes
-        @resource.class_eval do
-          attr_accessor :state_during_setter
-          
-          define_method(:value=) do |value|
-            self.state_during_setter = state
-          end
+        define_method(:value=) do |value|
+          self.state_during_setter = state
         end
-        
-        record = @resource.new(:value => 1)
-        assert_equal 'parked', record.state_during_setter
       end
       
-      def test_should_not_set_initial_state_after_already_initialized
-        record = @resource.new(:value => 1)
-        assert_equal 'parked', record.state
-        
-        record.state = 'idling'
-        record.attributes = {}
-        assert_equal 'idling', record.state
-      end
+      record = @resource.new(:value => 1)
+      assert_equal 'parked', record.state_during_setter
     end
     
-    class MachineWithDynamicInitialStateTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          attr_accessor :value
-        end
-        @machine = StateMachine::Machine.new(@resource, :initial => lambda {|object| :parked})
-        @machine.state :parked
-      end
-      
-      def test_should_set_initial_state_on_created_object
-        record = @resource.new
-        assert_equal 'parked', record.state
-      end
-      
-      def test_should_still_set_attributes
-        record = @resource.new(:value => 1)
-        assert_equal 1, record.value
-      end
-      
-      def test_should_not_allow_initialize_blocks
-        block_args = nil
-        record = @resource.new do |*args|
-          block_args = args
-        end
-        
-        assert_nil block_args
-      end
+    def test_should_not_set_initial_state_after_already_initialized
+      record = @resource.new(:value => 1)
+      assert_equal 'parked', record.state
       
-      def test_should_set_initial_state_after_setting_attributes
-        @resource.class_eval do
-          attr_accessor :state_during_setter
-          
-          define_method(:value=) do |value|
-            self.state_during_setter = state || 'nil'
-          end
-        end
-        
-        record = @resource.new(:value => 1)
-        assert_equal 'nil', record.state_during_setter
-      end
+      record.state = 'idling'
+      record.attributes = {}
+      assert_equal 'idling', record.state
+    end
+    
+    def test_should_use_stored_values_when_loading_from_database
+      @machine.state :idling
       
-      def test_should_not_set_initial_state_after_already_initialized
-        record = @resource.new(:value => 1)
-        assert_equal 'parked', record.state
-        
-        record.state = 'idling'
-        record.attributes = {}
-        assert_equal 'idling', record.state
-      end
+      record = @resource.get(@resource.create(:state => 'idling').id)
+      assert_equal 'idling', record.state
     end
     
-    class MachineWithColumnDefaultTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          property :status, String, :default => 'idling'
-          auto_migrate!
-        end
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
-        @record = @resource.new
-      end
+    def test_should_use_stored_values_when_loading_from_database_with_nil_state
+      @machine.state nil
       
-      def test_should_use_machine_default
-        assert_equal 'parked', @record.status
+      record = @resource.get(@resource.create(:state => nil).id)
+      assert_nil record.state
+    end
+  end
+  
+  class MachineWithDynamicInitialStateTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        attr_accessor :value
       end
+      @machine = StateMachine::Machine.new(@resource, :initial => lambda {|object| :parked})
+      @machine.state :parked
     end
     
-    class MachineWithConflictingPredicateTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          def state?(*args)
-            true
-          end
-        end
-        
-        @machine = StateMachine::Machine.new(@resource)
-        @record = @resource.new
+    def test_should_set_initial_state_on_created_object
+      record = @resource.new
+      assert_equal 'parked', record.state
+    end
+    
+    def test_should_still_set_attributes
+      record = @resource.new(:value => 1)
+      assert_equal 1, record.value
+    end
+    
+    def test_should_not_allow_initialize_blocks
+      block_args = nil
+      record = @resource.new do |*args|
+        block_args = args
       end
       
-      def test_should_not_define_attribute_predicate
-        assert @record.state?
-      end
+      assert_nil block_args
     end
     
-    class MachineWithColumnStateAttributeTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-        @machine.other_states(:idling)
+    def test_should_set_initial_state_after_setting_attributes
+      @resource.class_eval do
+        attr_accessor :state_during_setter
         
-        @record = @resource.new
-      end
-      
-      def test_should_not_override_the_column_reader
-        @record.attribute_set(:state, 'parked')
-        assert_equal 'parked', @record.state
-      end
-      
-      def test_should_not_override_the_column_writer
-        @record.state = 'parked'
-        assert_equal 'parked', @record.attribute_get(:state)
-      end
-      
-      def test_should_have_an_attribute_predicate
-        assert @record.respond_to?(:state?)
+        define_method(:value=) do |value|
+          self.state_during_setter = state || 'nil'
+        end
       end
       
-      def test_should_raise_exception_for_predicate_without_parameters
-        assert_raise(IndexError) { @record.state? }
-      end
+      record = @resource.new(:value => 1)
+      assert_equal 'nil', record.state_during_setter
+    end
+    
+    def test_should_not_set_initial_state_after_already_initialized
+      record = @resource.new(:value => 1)
+      assert_equal 'parked', record.state
       
-      def test_should_return_false_for_predicate_if_does_not_match_current_value
-        assert !@record.state?(:idling)
-      end
+      record.state = 'idling'
+      record.attributes = {}
+      assert_equal 'idling', record.state
+    end
+    
+    def test_should_use_stored_values_when_loading_from_database
+      @machine.state :idling
       
-      def test_should_return_true_for_predicate_if_matches_current_value
-        assert @record.state?(:parked)
-      end
+      record = @resource.get(@resource.create(:state => 'idling').id)
+      assert_equal 'idling', record.state
+    end
+    
+    def test_should_use_stored_values_when_loading_from_database_with_nil_state
+      @machine.state nil
       
-      def test_should_raise_exception_for_predicate_if_invalid_state_specified
-        assert_raise(IndexError) { @record.state?(:invalid) }
-      end
+      record = @resource.get(@resource.create(:state => nil).id)
+      assert_nil record.state
+    end
+  end
+  
+  class MachineWithColumnDefaultTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        property :status, String, :default => 'idling'
+        auto_migrate!
+      end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @record = @resource.new
     end
     
-    class MachineWithNonColumnStateAttributeUndefinedTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          def initialize
-            # Skip attribute initialization
-            @initialized_state_machines = true
-            super
-          end
+    def test_should_use_machine_default
+      assert_equal 'parked', @record.status
+    end
+  end
+  
+  class MachineWithConflictingPredicateTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        def state?(*args)
+          true
         end
-        
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => 'parked')
-        @record = @resource.new
       end
       
-      def test_should_define_a_new_property_for_the_attribute
-        assert_not_nil @resource.properties[:status]
-      end
+      @machine = StateMachine::Machine.new(@resource)
+      @record = @resource.new
+    end
+    
+    def test_should_not_define_attribute_predicate
+      assert @record.state?
+    end
+  end
+  
+  class MachineWithColumnStateAttributeTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @machine.other_states(:idling)
       
-      def test_should_define_a_reader_attribute_for_the_attribute
-        assert @record.respond_to?(:status)
+      @record = @resource.new
+    end
+    
+    def test_should_not_override_the_column_reader
+      @record.attribute_set(:state, 'parked')
+      assert_equal 'parked', @record.state
+    end
+    
+    def test_should_not_override_the_column_writer
+      @record.state = 'parked'
+      assert_equal 'parked', @record.attribute_get(:state)
+    end
+    
+    def test_should_have_an_attribute_predicate
+      assert @record.respond_to?(:state?)
+    end
+    
+    def test_should_raise_exception_for_predicate_without_parameters
+      assert_raise(IndexError) { @record.state? }
+    end
+    
+    def test_should_return_false_for_predicate_if_does_not_match_current_value
+      assert !@record.state?(:idling)
+    end
+    
+    def test_should_return_true_for_predicate_if_matches_current_value
+      assert @record.state?(:parked)
+    end
+    
+    def test_should_raise_exception_for_predicate_if_invalid_state_specified
+      assert_raise(IndexError) { @record.state?(:invalid) }
+    end
+  end
+  
+  class MachineWithNonColumnStateAttributeUndefinedTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        def initialize
+          # Skip attribute initialization
+          @initialized_state_machines = true
+          super
+        end
       end
       
-      def test_should_define_a_writer_attribute_for_the_attribute
-        assert @record.respond_to?(:status=)
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => 'parked')
+      @record = @resource.new
+    end
+    
+    def test_should_define_a_new_property_for_the_attribute
+      assert_not_nil @resource.properties[:status]
+    end
+    
+    def test_should_define_a_reader_attribute_for_the_attribute
+      assert @record.respond_to?(:status)
+    end
+    
+    def test_should_define_a_writer_attribute_for_the_attribute
+      assert @record.respond_to?(:status=)
+    end
+    
+    def test_should_define_an_attribute_predicate
+      assert @record.respond_to?(:status?)
+    end
+  end
+  
+  class MachineWithNonColumnStateAttributeDefinedTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        attr_accessor :status
       end
       
-      def test_should_define_an_attribute_predicate
-        assert @record.respond_to?(:status?)
-      end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @machine.other_states(:idling)
+      @record = @resource.new
     end
     
-    class MachineWithNonColumnStateAttributeDefinedTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          attr_accessor :status
+    def test_should_return_false_for_predicate_if_does_not_match_current_value
+      assert !@record.status?(:idling)
+    end
+    
+    def test_should_return_true_for_predicate_if_matches_current_value
+      assert @record.status?(:parked)
+    end
+    
+    def test_should_raise_exception_for_predicate_if_invalid_state_specified
+      assert_raise(IndexError) { @record.status?(:invalid) }
+    end
+    
+    def test_should_set_initial_state_on_created_object
+      assert_equal 'parked', @record.status
+    end
+  end
+  
+  class MachineWithInitializedStateTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @machine.state nil, :idling
+    end
+    
+    def test_should_allow_nil_initial_state_when_static
+      record = @resource.new(:state => nil)
+      assert_nil record.state
+    end
+    
+    def test_should_allow_nil_initial_state_when_dynamic
+      @machine.initial_state = lambda {:parked}
+      record = @resource.new(:state => nil)
+      assert_nil record.state
+    end
+    
+    def test_should_allow_different_initial_state_when_static
+      record = @resource.new(:state => 'idling')
+      assert_equal 'idling', record.state
+    end
+    
+    def test_should_allow_different_initial_state_when_dynamic
+      @machine.initial_state = lambda {:parked}
+      record = @resource.new(:state => 'idling')
+      assert_equal 'idling', record.state
+    end
+    
+    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.9.8')
+      def test_should_raise_exception_if_protected
+        @resource.class_eval do
+          protected :state=
         end
         
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
-        @machine.other_states(:idling)
-        @record = @resource.new
+        assert_raise(ArgumentError) { @resource.new(:state => 'idling') }
       end
-      
-      def test_should_return_false_for_predicate_if_does_not_match_current_value
-        assert !@record.status?(:idling)
+    end
+  end
+  
+  class MachineWithLoopbackTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        property :updated_at, DateTime
+        auto_migrate!
+        
+        # Simulate dm-timestamps
+        before :update do
+          return unless dirty?
+          self.updated_at = DateTime.now
+        end
       end
       
-      def test_should_return_true_for_predicate_if_matches_current_value
-        assert @record.status?(:parked)
-      end
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @machine.event :park
       
-      def test_should_raise_exception_for_predicate_if_invalid_state_specified
-        assert_raise(IndexError) { @record.status?(:invalid) }
-      end
+      @record = @resource.create(:updated_at => Time.now - 1)
+      @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
       
-      def test_should_set_initial_state_on_created_object
-        assert_equal 'parked', @record.status
-      end
+      @timestamp = @record.updated_at
+      @transition.perform
     end
     
-    class MachineWithInitializedStateTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-        @machine.state nil, :idling
-      end
-      
-      def test_should_allow_nil_initial_state_when_static
-        record = @resource.new(:state => nil)
-        assert_nil record.state
-      end
-      
-      def test_should_allow_nil_initial_state_when_dynamic
-        @machine.initial_state = lambda {:parked}
-        record = @resource.new(:state => nil)
-        assert_nil record.state
-      end
+    def test_should_update_record
+      assert_not_equal @timestamp, @record.updated_at
+    end
+  end
+  
+  class MachineWithDirtyAttributesTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @machine.event :ignite
+      @machine.state :idling
       
-      def test_should_allow_different_initial_state_when_static
-        record = @resource.new(:state => 'idling')
-        assert_equal 'idling', record.state
-      end
+      @record = @resource.create
       
-      def test_should_allow_different_initial_state_when_dynamic
-        @machine.initial_state = lambda {:parked}
-        record = @resource.new(:state => 'idling')
-        assert_equal 'idling', record.state
-      end
-      
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.9.8')
-        def test_should_raise_exception_if_protected
-          @resource.class_eval do
-            protected :state=
-          end
-          
-          assert_raise(ArgumentError) { @resource.new(:state => 'idling') }
-        end
-      end
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      @transition.perform(false)
     end
     
-    class MachineWithLoopbackTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          property :updated_at, DateTime
-          auto_migrate!
-          
-          # Simulate dm-timestamps
-          before :update do
-            return unless dirty?
-            self.updated_at = DateTime.now
-          end
-        end
-        
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-        @machine.event :park
-        
-        @record = @resource.create(:updated_at => Time.now - 1)
-        @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
-        
-        @timestamp = @record.updated_at
-        @transition.perform
-      end
-      
-      def test_should_update_record
-        assert_not_equal @timestamp, @record.updated_at
-      end
+    def test_should_include_state_in_changed_attributes
+      assert_equal e = {@resource.properties[:state] => 'idling'}, @record.dirty_attributes
     end
     
-    class MachineWithDirtyAttributesTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-        @machine.event :ignite
-        @machine.state :idling
-        
-        @record = @resource.create
-        
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-        @transition.perform(false)
-      end
-      
-      def test_should_include_state_in_changed_attributes
-        assert_equal e = {@resource.properties[:state] => 'idling'}, @record.dirty_attributes
-      end
-      
-      def test_should_track_attribute_change
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
-        else
-          assert_equal e = {:state => 'parked'},  @record.original_values
-        end
+    def test_should_track_attribute_change
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
+      else
+        assert_equal e = {:state => 'parked'},  @record.original_values
       end
+    end
+    
+    def test_should_not_reset_changes_on_multiple_transitions
+      transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
+      transition.perform(false)
       
-      def test_should_not_reset_changes_on_multiple_transitions
-        transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
-        transition.perform(false)
-        
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
-        else
-          assert_equal e = {:state => 'parked'},  @record.original_values
-        end
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
+      else
+        assert_equal e = {:state => 'parked'},  @record.original_values
       end
     end
     
-    class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :initial => :parked)
-        @machine.event :park
-        
-        @record = @resource.create
-        
-        @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
-        @transition.perform(false)
+      def test_should_have_changes_when_loaded_from_database
+        record = @resource.get(@record.id)
+        assert record.dirty_attributes.blank?
       end
+  end
+  
+  class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :initial => :parked)
+      @machine.event :park
       
-      def test_should_include_state_in_changed_attributes
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.dirty_attributes
-      end
+      @record = @resource.create
       
-      def test_should_track_attribute_change
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
-        else
-          assert_equal e = {:state => 'parked-ignored'},  @record.original_values
-        end
-      end
+      @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
+      @transition.perform(false)
     end
     
-    class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          property :status, String, :default => 'idling'
-          auto_migrate!
-        end
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
-        @machine.event :ignite
-        @machine.state :idling
-        
-        @record = @resource.create
-        
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-        @transition.perform(false)
+    def test_should_include_state_in_changed_attributes
+      assert_equal e = {@resource.properties[:state] => 'parked'}, @record.dirty_attributes
+    end
+    
+    def test_should_track_attribute_change
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
+      else
+        assert_equal e = {:state => 'parked-ignored'},  @record.original_values
       end
-      
-      def test_should_include_state_in_changed_attributes
-        assert_equal e = {@resource.properties[:status] => 'idling'}, @record.dirty_attributes
+    end
+  end
+  
+  class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        property :status, String, :default => 'idling'
+        auto_migrate!
       end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @machine.event :ignite
+      @machine.state :idling
       
-      def test_should_track_attribute_change
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
-        else
-          assert_equal e = {:status => 'parked'},  @record.original_values
-        end
-      end
+      @record = @resource.create
       
-      def test_should_not_reset_changes_on_multiple_transitions
-        transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
-        transition.perform(false)
-        
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
-        else
-          assert_equal e = {:status => 'parked'},  @record.original_values
-        end
-      end
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      @transition.perform(false)
     end
     
-    class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestCase
-      def setup
-        @resource = new_resource do
-          property :status, String, :default => 'idling'
-          auto_migrate!
-        end
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
-        @machine.event :park
-        
-        @record = @resource.create
-        
-        @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
-        @transition.perform(false)
+    def test_should_include_state_in_changed_attributes
+      assert_equal e = {@resource.properties[:status] => 'idling'}, @record.dirty_attributes
+    end
+    
+    def test_should_track_attribute_change
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
+      else
+        assert_equal e = {:status => 'parked'},  @record.original_values
       end
+    end
+    
+    def test_should_not_reset_changes_on_multiple_transitions
+      transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
+      transition.perform(false)
       
-      def test_should_include_state_in_changed_attributes
-        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.dirty_attributes
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
+      else
+        assert_equal e = {:status => 'parked'},  @record.original_values
+      end
+    end
+  end
+  
+  class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        property :status, String, :default => 'idling'
+        auto_migrate!
       end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @machine.event :park
       
-      def test_should_track_attribute_changes
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-          assert_equal e = {@resource.properties[:status] => 'parked-ignored'}, @record.original_attributes
-        else
-          assert_equal e = {:status => 'parked-ignored'},  @record.original_values
-        end
+      @record = @resource.create
+      
+      @transition = StateMachine::Transition.new(@record, @machine, :park, :parked, :parked)
+      @transition.perform(false)
+    end
+    
+    def test_should_include_state_in_changed_attributes
+      assert_equal e = {@resource.properties[:status] => 'parked'}, @record.dirty_attributes
+    end
+    
+    def test_should_track_attribute_changes
+      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal e = {@resource.properties[:status] => 'parked-ignored'}, @record.original_attributes
+      else
+        assert_equal e = {:status => 'parked-ignored'},  @record.original_values
       end
     end
+  end
+  
+  class MachineWithoutTransactionsTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :use_transactions => false)
+    end
     
-    class MachineWithoutTransactionsTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :use_transactions => false)
+    def test_should_not_rollback_transaction_if_false
+      @machine.within_transaction(@resource.new) do
+        @resource.create
+        false
       end
       
-      def test_should_not_rollback_transaction_if_false
-        @machine.within_transaction(@resource.new) do
-          @resource.create
-          false
-        end
-        
-        assert_equal 1, @resource.all.size
+      assert_equal 1, @resource.all.size
+    end
+    
+    def test_should_not_rollback_transaction_if_true
+      @machine.within_transaction(@resource.new) do
+        @resource.create
+        true
       end
       
-      def test_should_not_rollback_transaction_if_true
-        @machine.within_transaction(@resource.new) do
-          @resource.create
-          true
-        end
-        
-        assert_equal 1, @resource.all.size
-      end
+      assert_equal 1, @resource.all.size
+    end
+  end
+  
+  begin
+    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+      gem 'dm-transactions', ENV['VERSION'] ? "=#{ENV['VERSION']}" : '>=0.10.3'
+      require 'dm-transactions'
     end
     
     class MachineWithTransactionsTest < BaseTestCase
@@ -600,326 +643,485 @@ begin
         assert_equal 1, @resource.all.size
       end
     end
+  rescue LoadError
+    $stderr.puts "Skipping DataMapper Transaction tests. `gem install dm-transactions#{" -v #{ENV['VERSION']}" if ENV['VERSION']}` and try again."
+  end
+  
+  class MachineWithCallbacksTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource)
+      @machine.state :parked, :idling
+      @machine.event :ignite
+      
+      @record = @resource.new(:state => 'parked')
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+    end
     
-    class MachineWithCallbacksTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource)
-        @machine.state :parked, :idling
-        @machine.event :ignite
-        
-        @record = @resource.new(:state => 'parked')
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-      end
+    def test_should_run_before_callbacks
+      called = false
+      @machine.before_transition {called = true}
       
-      def test_should_run_before_callbacks
-        called = false
-        @machine.before_transition(lambda {called = true})
-        
-        @transition.perform
-        assert called
-      end
+      @transition.perform
+      assert called
+    end
+    
+    def test_should_pass_transition_to_before_callbacks_with_one_argument
+      transition = nil
+      @machine.before_transition {|arg| transition = arg}
       
-      def test_should_pass_transition_to_before_callbacks_with_one_argument
-        transition = nil
-        @machine.before_transition(lambda {|arg| transition = arg})
-        
-        @transition.perform
-        assert_equal @transition, transition
-      end
+      @transition.perform
+      assert_equal @transition, transition
+    end
+    
+    def test_should_pass_transition_to_before_callbacks_with_multiple_arguments
+      callback_args = nil
+      @machine.before_transition {|*args| callback_args = args}
       
-      def test_should_pass_transition_to_before_callbacks_with_multiple_arguments
-        callback_args = nil
-        @machine.before_transition(lambda {|*args| callback_args = args})
-        
-        @transition.perform
-        assert_equal [@transition], callback_args
-      end
+      @transition.perform
+      assert_equal [@transition], callback_args
+    end
+    
+    def test_should_run_before_callbacks_within_the_context_of_the_record
+      context = nil
+      @machine.before_transition {context = self}
       
-      def test_should_run_before_callbacks_within_the_context_of_the_record
-        context = nil
-        @machine.before_transition(lambda {context = self})
-        
-        @transition.perform
-        assert_equal @record, context
+      @transition.perform
+      assert_equal @record, context
+    end
+    
+    def test_should_run_after_callbacks
+      called = false
+      @machine.after_transition {called = true}
+      
+      @transition.perform
+      assert called
+    end
+    
+    def test_should_pass_transition_to_after_callbacks_with_multiple_arguments
+      callback_args = nil
+      @machine.after_transition {|*args| callback_args = args}
+      
+      @transition.perform
+      assert_equal [@transition], callback_args
+    end
+    
+    def test_should_run_after_callbacks_with_the_context_of_the_record
+      context = nil
+      @machine.after_transition {context = self}
+      
+      @transition.perform
+      assert_equal @record, context
+    end
+    
+    def test_should_run_around_callbacks
+      before_called = false
+      after_called = [false]
+      @machine.around_transition {|block| before_called = true; block.call; after_called[0] = true}
+      
+      @transition.perform
+      assert before_called
+      assert after_called[0]
+    end
+    
+    def test_should_run_around_callbacks_with_the_context_of_the_record
+      context = nil
+      @machine.around_transition {|block| context = self; block.call}
+      
+      @transition.perform
+      assert_equal @record, context
+    end
+    
+    def test_should_allow_symbolic_callbacks
+      callback_args = nil
+      
+      klass = class << @record; self; end
+      klass.send(:define_method, :after_ignite) do |*args|
+        callback_args = args
       end
       
-      def test_should_run_after_callbacks
-        called = false
-        @machine.after_transition(lambda {called = true})
-        
-        @transition.perform
-        assert called
+      @machine.before_transition(:after_ignite)
+      
+      @transition.perform
+      assert_equal [@transition], callback_args
+    end
+    
+    def test_should_allow_string_callbacks
+      class << @record
+        attr_reader :callback_result
       end
       
-      def test_should_pass_transition_to_after_callbacks_with_multiple_arguments
-        callback_args = nil
-        @machine.after_transition(lambda {|*args| callback_args = args})
-        
-        @transition.perform
-        assert_equal [@transition], callback_args
+      @machine.before_transition('@callback_result = [1, 2, 3]')
+      @transition.perform
+      
+      assert_equal [1, 2, 3], @record.callback_result
+    end
+  end
+  
+  class MachineWithFailedBeforeCallbacksTest < BaseTestCase
+    def setup
+      callbacks = []
+      
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource)
+      @machine.state :parked, :idling
+      @machine.event :ignite
+      @machine.before_transition {callbacks << :before_1; throw :halt}
+      @machine.before_transition {callbacks << :before_2}
+      @machine.after_transition {callbacks << :after}
+      @machine.around_transition {|block| callbacks << :around_before; block.call; callbacks << :around_after}
+      
+      @record = @resource.new(:state => 'parked')
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      @result = @transition.perform
+      
+      @callbacks = callbacks
+    end
+    
+    def test_should_not_be_successful
+      assert !@result
+    end
+    
+    def test_should_not_change_current_state
+      assert_equal 'parked', @record.state
+    end
+    
+    def test_should_not_run_action
+      assert @record.respond_to?(:new?) ? @record.new? : @record.new_record?
+    end
+    
+    def test_should_not_run_further_callbacks
+      assert_equal [:before_1], @callbacks
+    end
+  end
+  
+  class MachineWithFailedActionTest < BaseTestCase
+    def setup
+      @resource = new_resource do
+        before(:create) { throw :halt }
       end
       
-      def test_should_run_after_callbacks_with_the_context_of_the_record
-        context = nil
-        @machine.after_transition(lambda {context = self})
-        
-        @transition.perform
-        assert_equal @record, context
-      end
+      @machine = StateMachine::Machine.new(@resource)
+      @machine.state :parked, :idling
+      @machine.event :ignite
       
-      def test_should_allow_symbolic_callbacks
-        callback_args = nil
-        
-        klass = class << @record; self; end
-        klass.send(:define_method, :after_ignite) do |*args|
-          callback_args = args
-        end
-        
-        @machine.before_transition(:after_ignite)
-        
-        @transition.perform
-        assert_equal [@transition], callback_args
+      callbacks = []
+      @machine.before_transition {callbacks << :before}
+      @machine.after_transition {callbacks << :after}
+      @machine.after_transition(:include_failures => true) {callbacks << :after_failure}
+      @machine.around_transition {|block| callbacks << :around_before; block.call; callbacks << :around_after}
+      @machine.around_transition(:include_failures => true) do |block|
+        callbacks << :around_before_failure
+        block.call
+        callbacks << :around_after_failure
       end
       
-      def test_should_allow_string_callbacks
-        class << @record
-          attr_reader :callback_result
-        end
-        
-        @machine.before_transition('@callback_result = [1, 2, 3]')
-        @transition.perform
-        
-        assert_equal [1, 2, 3], @record.callback_result
-      end
+      @record = @resource.new(:state => 'parked')
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      @result = @transition.perform
+      
+      @callbacks = callbacks
+    end
+    
+    def test_should_not_be_successful
+      assert !@result
+    end
+    
+    def test_should_not_change_current_state
+      assert_equal 'parked', @record.state
+    end
+    
+    def test_should_not_save_record
+      assert @record.respond_to?(:new?) ? @record.new? : @record.new_record?
+    end
+    
+    def test_should_run_before_callbacks_and_after_callbacks_with_failures
+      assert_equal [:before, :around_before, :around_before_failure, :around_after_failure, :after_failure], @callbacks
+    end
+  end
+  
+  class MachineWithFailedAfterCallbacksTest < BaseTestCase
+     def setup
+      callbacks = []
+      
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource)
+      @machine.state :parked, :idling
+      @machine.event :ignite
+      @machine.after_transition {callbacks << :after_1; throw :halt}
+      @machine.after_transition {callbacks << :after_2}
+      @machine.around_transition {|block| callbacks << :around_before; block.call; callbacks << :around_after}
+      
+      @record = @resource.new(:state => 'parked')
+      @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      @result = @transition.perform
+      
+      @callbacks = callbacks
+    end
+    
+    def test_should_be_successful
+      assert @result
+    end
+    
+    def test_should_change_current_state
+      assert_equal 'idling', @record.state
     end
     
-    class MachineWithFailedBeforeCallbacksTest < BaseTestCase
+    def test_should_save_record
+      assert !(@record.respond_to?(:new?) ? @record.new? : @record.new_record?)
+    end
+    
+    def test_should_not_run_further_after_callbacks
+      assert_equal [:around_before, :around_after, :after_1], @callbacks
+    end
+  end
+  
+  begin
+    gem 'dm-validations', ENV['VERSION'] ? "=#{ENV['VERSION']}" : '>=0.9.4'
+    require 'dm-validations'
+    
+    class MachineWithValidationsTest < BaseTestCase
       def setup
-        before_count = 0
-        after_count = 0
-        
         @resource = new_resource
         @machine = StateMachine::Machine.new(@resource)
-        @machine.state :parked, :idling
-        @machine.event :ignite
-        @machine.before_transition(lambda {before_count += 1; throw :halt})
-        @machine.before_transition(lambda {before_count += 1})
-        @machine.after_transition(lambda {after_count += 1})
-        
-        @record = @resource.new(:state => 'parked')
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-        @result = @transition.perform
+        @machine.state :parked
         
-        @before_count = before_count
-        @after_count = after_count
+        @record = @resource.new
       end
       
-      def test_should_not_be_successful
-        assert !@result
+      def test_should_invalidate_using_errors
+        @record.state = 'parked'
+        
+        @machine.invalidate(@record, :state, :invalid_transition, [[:event, :park]])
+        assert_equal ['cannot transition via "park"'], @record.errors.on(:state)
       end
       
-      def test_should_not_change_current_state
-        assert_equal 'parked', @record.state
+      def test_should_auto_prefix_custom_attributes_on_invalidation
+        @machine.invalidate(@record, :event, :invalid)
+        
+        assert_equal ['is invalid'], @record.errors.on(:state_event)
       end
       
-      def test_should_not_run_action
-        assert @record.respond_to?(:new?) ? @record.new? : @record.new_record?
+      def test_should_clear_errors_on_reset
+        @record.state = 'parked'
+        @record.errors.add(:state, 'is invalid')
+        
+        @machine.reset(@record)
+        assert_nil @record.errors.on(:id)
       end
       
-      def test_should_not_run_further_before_callbacks
-        assert_equal 1, @before_count
+      def test_should_be_valid_if_state_is_known
+        @record.state = 'parked'
+        
+        assert @record.valid?
       end
       
-      def test_should_not_run_after_callbacks
-        assert_equal 0, @after_count
+      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
     
-    class MachineWithFailedActionTest < BaseTestCase
+    class MachineWithValidationsAndCustomAttributeTest < BaseTestCase
       def setup
-        @resource = new_resource do
-          before(:create) { throw :halt }
-        end
-        
-        @machine = StateMachine::Machine.new(@resource)
-        @machine.state :parked, :idling
-        @machine.event :ignite
-        
-        before_transition_called = false
-        after_transition_called = false
-        after_transition_with_failures_called = false
-        @machine.before_transition(lambda {before_transition_called = true})
-        @machine.after_transition(lambda {after_transition_called = true})
-        @machine.after_transition(lambda {after_transition_with_failures_called = true}, :include_failures => true)
-        
-        @record = @resource.new(:state => 'parked')
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-        @result = @transition.perform
+        @resource = new_resource
+        @machine = StateMachine::Machine.new(@resource, :status, :attribute => :state)
+        @machine.state :parked
         
-        @before_transition_called = before_transition_called
-        @after_transition_called = after_transition_called
-        @after_transition_with_failures_called = after_transition_with_failures_called
-      end
-      
-      def test_should_not_be_successful
-        assert !@result
-      end
-      
-      def test_should_not_change_current_state
-        assert_equal 'parked', @record.state
-      end
-      
-      def test_should_not_save_record
-        assert @record.respond_to?(:new?) ? @record.new? : @record.new_record?
-      end
-      
-      def test_should_run_before_callback
-        assert @before_transition_called
-      end
-      
-      def test_should_not_run_after_callback_if_not_including_failures
-        assert !@after_transition_called
+        @record = @resource.new
       end
       
-      def test_should_run_after_callback_if_including_failures
-        assert @after_transition_with_failures_called
+      def test_should_add_validation_errors_to_custom_attribute
+        @record.state = 'invalid'
+        
+        assert !@record.valid?
+        assert_equal ['is invalid'], @record.errors.on(:state)
+        
+        @record.state = 'parked'
+        assert @record.valid?
       end
     end
     
-    class MachineWithFailedAfterCallbacksTest < BaseTestCase
-       def setup
-        after_count = 0
+    class MachineWithStateDrivenValidationsTest < BaseTestCase
+      def setup
+        @resource = resource = new_resource do
+          attr_accessor :seatbelt
+        end
         
-        @resource = new_resource
         @machine = StateMachine::Machine.new(@resource)
-        @machine.state :parked, :idling
-        @machine.event :ignite
-        @machine.after_transition(lambda {after_count += 1; throw :halt})
-        @machine.after_transition(lambda {after_count += 1})
-        
-        @record = @resource.new(:state => 'parked')
-        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-        @result = @transition.perform
-        
-        @after_count = after_count
-      end
-      
-      def test_should_be_successful
-        assert @result
+        @machine.state :first_gear, :second_gear do
+          if resource.respond_to?(:validates_presence_of)
+            validates_presence_of :seatbelt
+          else
+            validates_present :seatbelt
+          end
+        end
+        @machine.other_states :parked
       end
       
-      def test_should_change_current_state
-        assert_equal 'idling', @record.state
+      def test_should_be_valid_if_validation_fails_outside_state_scope
+        record = @resource.new(:state => 'parked', :seatbelt => nil)
+        assert record.valid?
       end
       
-      def test_should_save_record
-        assert !(@record.respond_to?(:new?) ? @record.new? : @record.new_record?)
+      def test_should_be_invalid_if_validation_fails_within_state_scope
+        record = @resource.new(:state => 'first_gear', :seatbelt => nil)
+        assert !record.valid?
       end
       
-      def test_should_not_run_further_after_callbacks
-        assert_equal 1, @after_count
+      def test_should_be_valid_if_validation_succeeds_within_state_scope
+        record = @resource.new(:state => 'second_gear', :seatbelt => true)
+        assert record.valid?
       end
     end
     
-    begin
-      gem 'dm-validations', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
-      require 'dm-validations'
-      
-      class MachineWithValidationsTest < BaseTestCase
+    # See README caveats
+    if Gem::Version.new(::DataMapper::VERSION) > Gem::Version.new('0.9.6')
+      class MachineWithEventAttributesOnValidationTest < BaseTestCase
         def setup
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
-          @machine.state :parked
+          @machine.event :ignite do
+            transition :parked => :idling
+          end
           
           @record = @resource.new
+          @record.state = 'parked'
+          @record.state_event = 'ignite'
         end
         
-        def test_should_invalidate_using_errors
-          @record.state = 'parked'
-          
-          @machine.invalidate(@record, :state, :invalid_transition, [[:event, :park]])
-          assert_equal ['cannot transition via "park"'], @record.errors.on(:state)
+        def test_should_fail_if_event_is_invalid
+          @record.state_event = 'invalid'
+          assert !@record.valid?
+          assert_equal ['is invalid'], @record.errors.full_messages
         end
         
-        def test_should_auto_prefix_custom_attributes_on_invalidation
-          @machine.invalidate(@record, :event, :invalid)
-          
-          assert_equal ['is invalid'], @record.errors.on(:state_event)
+        def test_should_fail_if_event_has_no_transition
+          @record.state = 'idling'
+          assert !@record.valid?
+          assert_equal ['cannot transition when idling'], @record.errors.full_messages
         end
         
-        def test_should_clear_errors_on_reset
-          @record.state = 'parked'
-          @record.errors.add(:state, 'is invalid')
-          
-          @machine.reset(@record)
-          assert_nil @record.errors.on(:id)
+        def test_should_be_successful_if_event_has_transition
+          assert @record.valid?
         end
         
-        def test_should_be_valid_if_state_is_known
-          @record.state = 'parked'
+        def test_should_run_before_callbacks
+          ran_callback = false
+          @machine.before_transition { ran_callback = true }
           
-          assert @record.valid?
+          @record.valid?
+          assert ran_callback
         end
         
-        def test_should_not_be_valid_if_state_is_unknown
-          @record.state = 'invalid'
+        def test_should_run_around_callbacks_before_yield
+          ran_callback = false
+          @machine.around_transition {|block| ran_callback = true; block.call }
           
-          assert !@record.valid?
-          assert_equal ['is invalid'], @record.errors.on(:state)
+          @record.valid?
+          assert ran_callback
         end
-      end
-      
-      class MachineWithValidationsAndCustomAttributeTest < BaseTestCase
-        def setup
-          @resource = new_resource
-          @machine = StateMachine::Machine.new(@resource, :status, :attribute => :state)
-          @machine.state :parked
+        
+        def test_should_persist_new_state
+          @record.valid?
+          assert_equal 'idling', @record.state
+        end
+        
+        def test_should_not_run_after_callbacks
+          ran_callback = false
+          @machine.after_transition { ran_callback = true }
           
-          @record = @resource.new
+          @record.valid?
+          assert !ran_callback
         end
         
-        def test_should_add_validation_errors_to_custom_attribute
-          @record.state = 'invalid'
+        def test_should_not_run_after_callbacks_with_failures_disabled_if_validation_fails
+          @resource.class_eval do
+            attr_accessor :seatbelt
+            if respond_to?(:validates_presence_of)
+              validates_presence_of :seatbelt
+            else
+              validates_present :seatbelt
+            end
+          end
           
-          assert !@record.valid?
-          assert_equal ['is invalid'], @record.errors.on(:state)
+          ran_callback = false
+          @machine.after_transition { ran_callback = true }
           
-          @record.state = 'parked'
-          assert @record.valid?
+          @record.valid?
+          assert !ran_callback
         end
-      end
-      
-      class MachineWithStateDrivenValidationsTest < BaseTestCase
-        def setup
-          @resource = new_resource do
+        
+        def test_should_run_after_callbacks_with_failures_enabled_if_validation_fails
+          @resource.class_eval do
             attr_accessor :seatbelt
+            if respond_to?(:validates_presence_of)
+              validates_presence_of :seatbelt
+            else
+              validates_present :seatbelt
+            end
           end
           
-          @machine = StateMachine::Machine.new(@resource)
-          @machine.state :first_gear, :second_gear do
-            validates_present :seatbelt
-          end
-          @machine.other_states :parked
+          ran_callback = false
+          @machine.after_transition(:include_failures => true) { ran_callback = true }
+          
+          @record.valid?
+          assert ran_callback
+        end
+        
+        def test_should_not_run_around_callbacks_after_yield
+          ran_callback = [false]
+          @machine.around_transition {|block| block.call; ran_callback[0] = true }
+          
+          @record.valid?
+          assert !ran_callback[0]
         end
         
-        def test_should_be_valid_if_validation_fails_outside_state_scope
-          record = @resource.new(:state => 'parked', :seatbelt => nil)
-          assert record.valid?
+        def test_should_not_run_around_callbacks_after_yield_with_failures_disabled_if_validation_fails
+          @resource.class_eval do
+            attr_accessor :seatbelt
+            if respond_to?(:validates_presence_of)
+              validates_presence_of :seatbelt
+            else
+              validates_present :seatbelt
+            end
+          end
+          
+          ran_callback = [false]
+          @machine.around_transition {|block| block.call; ran_callback[0] = true }
+          
+          @record.valid?
+          assert !ran_callback[0]
         end
         
-        def test_should_be_invalid_if_validation_fails_within_state_scope
-          record = @resource.new(:state => 'first_gear', :seatbelt => nil)
-          assert !record.valid?
+        def test_should_run_around_callbacks_after_yield_with_failures_enabled_if_validation_fails
+          @resource.class_eval do
+            attr_accessor :seatbelt
+            if respond_to?(:validates_presence_of)
+              validates_presence_of :seatbelt
+            else
+              validates_present :seatbelt
+            end
+          end
+          
+          ran_callback = [false]
+          @machine.around_transition(:include_failures => true) {|block| block.call; ran_callback[0] = true }
+          
+          @record.valid?
+          assert ran_callback[0]
         end
         
-        def test_should_be_valid_if_validation_succeeds_within_state_scope
-          record = @resource.new(:state => 'second_gear', :seatbelt => true)
-          assert record.valid?
+        def test_should_not_run_before_transitions_within_transaction
+          @machine.before_transition { self.class.create; throw :halt }
+          
+          assert !@record.valid?
+          assert_equal 1, @resource.all.size
         end
       end
       
-      class MachineWithEventAttributesOnValidationTest < BaseTestCase
+      class MachineWithEventAttributesOnSaveTest < BaseTestCase
         def setup
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
@@ -934,69 +1136,136 @@ begin
         
         def test_should_fail_if_event_is_invalid
           @record.state_event = 'invalid'
-          assert !@record.valid?
-          assert_equal ['is invalid'], @record.errors.full_messages
+          assert !@record.save
         end
         
         def test_should_fail_if_event_has_no_transition
           @record.state = 'idling'
-          assert !@record.valid?
-          assert_equal ['cannot transition when idling'], @record.errors.full_messages
+          assert !@record.save
         end
         
         def test_should_be_successful_if_event_has_transition
-          assert @record.valid?
+          assert_equal true, @record.save
         end
         
         def test_should_run_before_callbacks
           ran_callback = false
           @machine.before_transition { ran_callback = true }
           
-          @record.valid?
+          @record.save
+          assert ran_callback
+        end
+        
+        def test_should_run_before_callbacks_once
+          before_count = 0
+          @machine.before_transition { before_count += 1 }
+          
+          @record.save
+          assert_equal 1, before_count
+        end
+        
+        def test_should_run_around_callbacks_before_yield
+          ran_callback = false
+          @machine.around_transition {|block| ran_callback = true; block.call }
+          
+          @record.save
           assert ran_callback
         end
         
+        def test_should_run_around_callbacks_before_yield_once
+          around_before_count = 0
+          @machine.around_transition {|block| around_before_count += 1; block.call }
+          
+          @record.save
+          assert_equal 1, around_before_count
+        end
+        
         def test_should_persist_new_state
-          @record.valid?
+          @record.save
           assert_equal 'idling', @record.state
         end
         
-        def test_should_not_run_after_callbacks
+        def test_should_run_after_callbacks
           ran_callback = false
           @machine.after_transition { ran_callback = true }
           
-          @record.valid?
-          assert !ran_callback
+          @record.save
+          assert ran_callback
         end
         
-        def test_should_not_run_after_callbacks_with_failures_disabled_if_validation_fails
-          @resource.class_eval do
-            attr_accessor :seatbelt
-            validates_present :seatbelt
-          end
+        def test_should_not_run_after_callbacks_with_failures_disabled_if_fails
+          @resource.before(:create) { throw :halt }
           
           ran_callback = false
           @machine.after_transition { ran_callback = true }
           
-          @record.valid?
-          assert !ran_callback
+          @record.save
+          assert !ran_callback
+        end
+        
+        def test_should_run_after_callbacks_with_failures_enabled_if_fails
+          @resource.before(:create) { throw :halt }
+          
+          ran_callback = false
+          @machine.after_transition(:include_failures => true) { ran_callback = true }
+          
+          @record.save
+          assert ran_callback
+        end
+        
+        def test_should_not_run_around_callbacks_with_failures_disabled_if_fails
+          @resource.before(:create) { throw :halt }
+          
+          ran_callback = [false]
+          @machine.around_transition {|block| block.call; ran_callback[0] = true }
+          
+          @record.save
+          assert !ran_callback[0]
+        end
+        
+        def test_should_run_around_callbacks_after_yield
+          ran_callback = [false]
+          @machine.around_transition {|block| block.call; ran_callback[0] = true }
+          
+          @record.save
+          assert ran_callback[0]
+        end
+        
+        def test_should_run_around_callbacks_after_yield_with_failures_enabled_if_fails
+          @resource.before(:create) { throw :halt }
+          
+          ran_callback = [false]
+          @machine.around_transition(:include_failures => true) {|block| block.call; ran_callback[0] = true }
+          
+          @record.save
+          assert ran_callback[0]
+        end
+        
+        def test_should_not_run_before_transitions_within_transaction
+          @machine.before_transition { self.class.create; throw :halt }
+          
+          assert_equal false, @record.save
+          assert_equal 1, @resource.all.size
         end
         
-        def test_should_run_after_callbacks_with_failures_enabled_if_validation_fails
-          @resource.class_eval do
-            attr_accessor :seatbelt
-            validates_present :seatbelt
-          end
+        def test_should_not_run_after_transitions_within_transaction
+          @machine.before_transition { self.class.create; throw :halt }
           
-          ran_callback = false
-          @machine.after_transition(:include_failures => true) { ran_callback = true }
+          assert_equal false, @record.save
+          assert_equal 1, @resource.all.size
+        end
+        
+        def test_should_not_run_around_transition_within_transaction
+          @machine.around_transition { self.class.create; throw :halt }
           
-          @record.valid?
-          assert ran_callback
+          assert_equal false, @record.save
+          assert_equal 1, @resource.all.size
         end
       end
-      
-      class MachineWithEventAttributesOnSaveTest < BaseTestCase
+    end
+    
+    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+      class MachineWithEventAttributesOnSaveBangTest < BaseTestCase
         def setup
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
@@ -1011,23 +1280,23 @@ begin
         
         def test_should_fail_if_event_is_invalid
           @record.state_event = 'invalid'
-          assert !@record.save
+          assert !@record.save!
         end
         
         def test_should_fail_if_event_has_no_transition
           @record.state = 'idling'
-          assert !@record.save
+          assert !@record.save!
         end
         
         def test_should_be_successful_if_event_has_transition
-          assert_equal true, @record.save
+          assert_equal true, @record.save!
         end
         
         def test_should_run_before_callbacks
           ran_callback = false
           @machine.before_transition { ran_callback = true }
           
-          @record.save
+          @record.save!
           assert ran_callback
         end
         
@@ -1035,47 +1304,50 @@ begin
           before_count = 0
           @machine.before_transition { before_count += 1 }
           
-          @record.save
+          @record.save!
           assert_equal 1, before_count
         end
         
+        def test_should_run_around_callbacks_before_yield
+          ran_callback = false
+          @machine.around_transition {|block| ran_callback = true; block.call }
+          
+          @record.save!
+          assert ran_callback
+        end
+        
+        def test_should_run_around_callbacks_before_yield_once
+          around_before_count = 0
+          @machine.around_transition {|block| around_before_count += 1; block.call }
+          
+          @record.save!
+          assert_equal 1, around_before_count
+        end
+        
         def test_should_persist_new_state
-          @record.save
+          @record.save!
           assert_equal 'idling', @record.state
         end
         
-        # See README caveats
-        if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.9.7')
-          def test_should_run_after_callbacks
-            ran_callback = false
-            @machine.after_transition { ran_callback = true }
-            
-            @record.save
-            assert ran_callback
-          end
+        def test_should_run_after_callbacks
+          ran_callback = false
+          @machine.after_transition { ran_callback = true }
           
-          def test_should_not_run_after_callbacks_with_failures_disabled_if_fails
-            @resource.before(:create) { throw :halt }
-            
-            ran_callback = false
-            @machine.after_transition { ran_callback = true }
-            
-            @record.save
-            assert !ran_callback
-          end
+          @record.save!
+          assert ran_callback
+        end
+        
+        def test_should_run_around_callbacks_after_yield
+          ran_callback = [false]
+          @machine.around_transition {|block| block.call; ran_callback[0] = true }
           
-          def test_should_run_after_callbacks_with_failures_enabled_if_fails
-            @resource.before(:create) { throw :halt }
-            
-            ran_callback = false
-            @machine.after_transition(:include_failures => true) { ran_callback = true }
-            
-            @record.save
-            assert ran_callback
-          end
+          @record.save!
+          assert ran_callback[0]
         end
       end
-      
+    end
+    
+    if Gem::Version.new(::DataMapper::VERSION) > Gem::Version.new('0.9.6')
       class MachineWithEventAttributesOnCustomActionTest < BaseTestCase
         def setup
           @superclass = new_resource do
@@ -1109,349 +1381,405 @@ begin
           assert_equal 'idling', @record.state
         end
       end
-    rescue LoadError
-      $stderr.puts "Skipping DataMapper Validation tests. `gem install dm-validations#{" -v #{ENV['DM_VERSION']}" if ENV['DM_VERSION']}` and try again."
     end
+  rescue LoadError
+    $stderr.puts "Skipping DataMapper Validation tests. `gem install dm-validations#{" -v #{ENV['VERSION']}" if ENV['VERSION']}` and try again."
+  end
+  
+  begin
+    gem 'dm-observer', ENV['VERSION'] ? "=#{ENV['VERSION']}" : '>=0.9.4'
+    require 'dm-observer'
     
-    begin
-      gem 'dm-observer', ENV['DM_VERSION'] ? "=#{ENV['DM_VERSION']}" : '>=0.9.4'
-      require 'dm-observer'
+    class MachineWithObserversTest < BaseTestCase
+      def setup
+        @resource = new_resource
+        @machine = StateMachine::Machine.new(@resource)
+        @machine.state :parked, :idling
+        @machine.event :ignite
+        @record = @resource.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      end
       
-      class MachineWithObserversTest < BaseTestCase
-        def setup
-          @resource = new_resource
-          @machine = StateMachine::Machine.new(@resource)
-          @machine.state :parked, :idling
-          @machine.event :ignite
-          @record = @resource.new(:state => 'parked')
-          @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
+      def test_should_provide_matcher_helpers
+        matchers = []
+        
+        new_observer(@resource) do
+          matchers = [all, any, same]
         end
         
-        def test_should_provide_matcher_helpers
-          matchers = []
-          
-          new_observer(@resource) do
-            matchers = [all, any, same]
+        assert_equal [StateMachine::AllMatcher.instance, StateMachine::AllMatcher.instance, StateMachine::LoopbackMatcher.instance], matchers
+      end
+      
+      def test_should_call_before_transition_callback_if_requirements_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          before_transition :from => :parked do
+            called = true
           end
-          
-          assert_equal [StateMachine::AllMatcher.instance, StateMachine::AllMatcher.instance, StateMachine::LoopbackMatcher.instance], matchers
         end
         
-        def test_should_call_before_transition_callback_if_requirements_match
-          called = false
-          
-          observer = new_observer(@resource) do
-            before_transition :from => :parked do
-              called = true
-            end
+        @transition.perform
+        assert called
+      end
+      
+      def test_should_not_call_before_transition_callback_if_requirements_do_not_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          before_transition :from => :idling do
+            called = true
           end
-          
-          @transition.perform
-          assert called
         end
         
-        def test_should_not_call_before_transition_callback_if_requirements_do_not_match
-          called = false
-          
-          observer = new_observer(@resource) do
-            before_transition :from => :idling do
-              called = true
-            end
+        @transition.perform
+        assert !called
+      end
+      
+      def test_should_pass_transition_to_before_callbacks
+        callback_args = nil
+        
+        observer = new_observer(@resource) do
+          before_transition do |*args|
+            callback_args = args
           end
-          
-          @transition.perform
-          assert !called
         end
         
-        def test_should_pass_transition_to_before_callbacks
-          callback_args = nil
-          
-          observer = new_observer(@resource) do
-            before_transition do |*args|
-              callback_args = args
-            end
+        @transition.perform
+        assert_equal [@transition], callback_args
+      end
+      
+      def test_should_call_after_transition_callback_if_requirements_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          after_transition :from => :parked do
+            called = true
           end
-          
-          @transition.perform
-          assert_equal [@transition], callback_args
         end
         
-        def test_should_call_after_transition_callback_if_requirements_match
-          called = false
-          
-          observer = new_observer(@resource) do
-            after_transition :from => :parked do
-              called = true
-            end
+        @transition.perform
+        assert called
+      end
+      
+      def test_should_not_call_after_transition_callback_if_requirements_do_not_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          after_transition :from => :idling do
+            called = true
           end
-          
-          @transition.perform
-          assert called
         end
         
-        def test_should_not_call_after_transition_callback_if_requirements_do_not_match
-          called = false
-          
-          observer = new_observer(@resource) do
-            after_transition :from => :idling do
-              called = true
-            end
+        @transition.perform
+        assert !called
+      end
+      
+      def test_should_pass_transition_to_after_callbacks
+        callback_args = nil
+        
+        observer = new_observer(@resource) do
+          after_transition do |*args|
+            callback_args = args
           end
-          
-          @transition.perform
-          assert !called
         end
         
-        def test_should_pass_transition_to_after_callbacks
-          callback_args = nil
-          
-          observer = new_observer(@resource) do
-            after_transition do |*args|
-              callback_args = args
-            end
+        @transition.perform
+        assert_equal [@transition], callback_args
+      end
+      
+      def test_should_call_around_transition_callback_if_requirements_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          around_transition :from => :parked do |block|
+            called = true
+            block.call
           end
-          
-          @transition.perform
-          assert_equal [@transition], callback_args
         end
         
-        def test_should_raise_exception_if_targeting_invalid_machine
-          assert_raise(RUBY_VERSION < '1.9' ? IndexError : KeyError) do
-            new_observer(@resource) do
-              before_transition :invalid, :from => :parked do
-              end
-            end
+        @transition.perform
+        assert called
+      end
+      
+      def test_should_not_call_after_transition_callback_if_requirements_do_not_match
+        called = false
+        
+        observer = new_observer(@resource) do
+          around_transition :from => :idling do |block|
+            called = true
+            block.call
           end
         end
         
-        def test_should_allow_targeting_specific_machine
-          @second_machine = StateMachine::Machine.new(@resource, :status)
-          @resource.auto_migrate!
-          
-          called_state = false
-          called_status = false
-          
-          observer = new_observer(@resource) do
-            before_transition :state, :from => :parked do
-              called_state = true
-            end
-            
-            before_transition :status, :from => :parked do
-              called_status = true
-            end
+        @transition.perform
+        assert !called
+      end
+      
+      def test_should_pass_transition_to_after_callbacks
+        callback_args = nil
+        
+        observer = new_observer(@resource) do
+          around_transition do |*args|
+            block = args.pop
+            callback_args = args
+            block.call
           end
-          
-          @transition.perform
-          
-          assert called_state
-          assert !called_status
         end
         
-        def test_should_allow_targeting_multiple_specific_machines
-          @second_machine = StateMachine::Machine.new(@resource, :status)
-          @second_machine.state :parked, :idling
-          @second_machine.event :ignite
-          @resource.auto_migrate!
-          
-          called_attribute = nil
-          
-          attributes = []
-          observer = new_observer(@resource) do
-            before_transition :state, :status, :from => :parked do |transition|
-              called_attribute = transition.attribute
+        @transition.perform
+        assert_equal [@transition], callback_args
+      end
+      
+      def test_should_raise_exception_if_targeting_invalid_machine
+        assert_raise(RUBY_VERSION < '1.9' ? IndexError : KeyError) do
+          new_observer(@resource) do
+            before_transition :invalid, :from => :parked do
             end
           end
-          
-          @transition.perform
-          assert_equal :state, called_attribute
-          
-          StateMachine::Transition.new(@record, @second_machine, :ignite, :parked, :idling).perform
-          assert_equal :status, called_attribute
         end
       end
       
-      class MachineWithMixedCallbacksTest < BaseTestCase
-        def setup
-          @resource = new_resource
-          @machine = StateMachine::Machine.new(@resource)
-          @machine.state :parked, :idling
-          @machine.event :ignite
-          @record = @resource.new(:state => 'parked')
-          @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
-          
-          @notifications = notifications = []
-          
-          # Create callbacks
-          @machine.before_transition(lambda {notifications << :callback_before_transition})
-          @machine.after_transition(lambda {notifications << :callback_after_transition})
-          
-          observer = new_observer(@resource) do
-            before_transition do
-              notifications << :observer_before_transition
-            end
-            
-            after_transition do
-              notifications << :observer_after_transition
-            end
+      def test_should_allow_targeting_specific_machine
+        @second_machine = StateMachine::Machine.new(@resource, :status)
+        @resource.auto_migrate!
+        
+        called_state = false
+        called_status = false
+        
+        observer = new_observer(@resource) do
+          before_transition :state, :from => :parked do
+            called_state = true
           end
           
-          @transition.perform
+          before_transition :status, :from => :parked do
+            called_status = true
+          end
         end
         
-        def test_should_invoke_callbacks_in_specific_order
-          expected = [
-            :callback_before_transition,
-            :observer_before_transition,
-            :callback_after_transition,
-            :observer_after_transition
-          ]
-          
-          assert_equal expected, @notifications
+        @transition.perform
+        
+        assert called_state
+        assert !called_status
+      end
+      
+      def test_should_allow_targeting_multiple_specific_machines
+        @second_machine = StateMachine::Machine.new(@resource, :status)
+        @second_machine.state :parked, :idling
+        @second_machine.event :ignite
+        @resource.auto_migrate!
+        
+        called_attribute = nil
+        
+        attributes = []
+        observer = new_observer(@resource) do
+          before_transition :state, :status, :from => :parked do |transition|
+            called_attribute = transition.attribute
+          end
         end
+        
+        @transition.perform
+        assert_equal :state, called_attribute
+        
+        StateMachine::Transition.new(@record, @second_machine, :ignite, :parked, :idling).perform
+        assert_equal :status, called_attribute
       end
-    rescue LoadError
-      $stderr.puts "Skipping DataMapper Observer tests. `gem install dm-observer#{" -v #{ENV['DM_VERSION']}" if ENV['DM_VERSION']}` and try again."
     end
     
-    class MachineWithScopesTest < BaseTestCase
+    class MachineWithMixedCallbacksTest < BaseTestCase
       def setup
         @resource = new_resource
         @machine = StateMachine::Machine.new(@resource)
-        @machine.state :parked, :first_gear
-        @machine.state :idling, :value => lambda {'idling'}
-      end
-      
-      def test_should_create_singular_with_scope
-        assert @resource.respond_to?(:with_state)
-      end
-      
-      def test_should_only_include_records_with_state_in_singular_with_scope
-        parked = @resource.create :state => 'parked'
-        idling = @resource.create :state => 'idling'
+        @machine.state :parked, :idling
+        @machine.event :ignite
+        @record = @resource.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         
-        assert_equal [parked], @resource.with_state(:parked)
-      end
-      
-      def test_should_create_plural_with_scope
-        assert @resource.respond_to?(:with_states)
-      end
-      
-      def test_should_only_include_records_with_states_in_plural_with_scope
-        parked = @resource.create :state => 'parked'
-        idling = @resource.create :state => 'idling'
+        @notifications = notifications = []
         
-        assert_equal [parked, idling], @resource.with_states(:parked, :idling)
-      end
-      
-      def test_should_create_singular_without_scope
-        assert @resource.respond_to?(:without_state)
+        # Create callbacks
+        @machine.before_transition {notifications << :callback_before_transition}
+        @machine.after_transition {notifications << :callback_after_transition}
+        @machine.around_transition do |block|
+          notifications << :callback_around_before_transition
+          block.call
+          notifications << :callback_around_after_transition
+        end
+        
+        observer = new_observer(@resource) do
+          before_transition do
+            notifications << :observer_before_transition
+          end
+          
+          after_transition do
+            notifications << :observer_after_transition
+          end
+          
+          around_transition do |block|
+            notifications << :observer_around_before_transition
+            block.call
+            notifications << :observer_around_after_transition
+          end
+        end
+        
+        @transition.perform
       end
       
-      def test_should_only_include_records_without_state_in_singular_without_scope
-        parked = @resource.create :state => 'parked'
-        idling = @resource.create :state => 'idling'
+      def test_should_invoke_callbacks_in_specific_order
+        expected = [
+          :callback_before_transition,
+          :callback_around_before_transition,
+          :observer_before_transition,
+          :observer_around_before_transition,
+          :observer_around_after_transition,
+          :callback_around_after_transition,
+          :callback_after_transition,
+          :observer_after_transition
+        ]
         
-        assert_equal [parked], @resource.without_state(:idling)
+        assert_equal expected, @notifications
       end
+    end
+  rescue LoadError
+    $stderr.puts "Skipping DataMapper Observer tests. `gem install dm-observer#{" -v #{ENV['VERSION']}" if ENV['VERSION']}` and try again."
+  end
+  
+  class MachineWithScopesTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource)
+      @machine.state :parked, :first_gear
+      @machine.state :idling, :value => lambda {'idling'}
+    end
+    
+    def test_should_create_singular_with_scope
+      assert @resource.respond_to?(:with_state)
+    end
+    
+    def test_should_only_include_records_with_state_in_singular_with_scope
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
       
-      def test_should_create_plural_without_scope
-        assert @resource.respond_to?(:without_states)
-      end
+      assert_equal [parked], @resource.with_state(:parked)
+    end
+    
+    def test_should_create_plural_with_scope
+      assert @resource.respond_to?(:with_states)
+    end
+    
+    def test_should_only_include_records_with_states_in_plural_with_scope
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
       
-      def test_should_only_include_records_without_states_in_plural_without_scope
-        parked = @resource.create :state => 'parked'
-        idling = @resource.create :state => 'idling'
-        first_gear = @resource.create :state => 'first_gear'
-        
-        assert_equal [parked, idling], @resource.without_states(:first_gear)
-      end
+      assert_equal [parked, idling], @resource.with_states(:parked, :idling)
+    end
+    
+    def test_should_create_singular_without_scope
+      assert @resource.respond_to?(:without_state)
+    end
+    
+    def test_should_only_include_records_without_state_in_singular_without_scope
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
       
-      def test_should_allow_chaining_scopes
-        parked = @resource.create :state => 'parked'
-        idling = @resource.create :state => 'idling'
-        
-        assert_equal [idling], @resource.without_state(:parked).with_state(:idling)
-      end
+      assert_equal [parked], @resource.without_state(:idling)
     end
     
-    class MachineWithScopesAndOwnerSubclassTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :state)
-        
-        @subclass = Class.new(@resource)
-        @subclass_machine = @subclass.state_machine(:state) {}
-        @subclass_machine.state :parked, :idling, :first_gear
-      end
+    def test_should_create_plural_without_scope
+      assert @resource.respond_to?(:without_states)
+    end
+    
+    def test_should_only_include_records_without_states_in_plural_without_scope
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
+      first_gear = @resource.create :state => 'first_gear'
       
-      def test_should_only_include_records_with_subclass_states_in_with_scope
-        parked = @subclass.create :state => 'parked'
-        idling = @subclass.create :state => 'idling'
-        
-        assert_equal [parked, idling], @subclass.with_states(:parked, :idling)
-      end
+      assert_equal [parked, idling], @resource.without_states(:first_gear)
+    end
+    
+    def test_should_allow_chaining_scopes
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
       
-      def test_should_only_include_records_without_subclass_states_in_without_scope
-        parked = @subclass.create :state => 'parked'
-        idling = @subclass.create :state => 'idling'
-        first_gear = @subclass.create :state => 'first_gear'
-        
-        assert_equal [parked, idling], @subclass.without_states(:first_gear)
-      end
+      assert_equal [idling], @resource.without_state(:parked).with_state(:idling)
+    end
+  end
+  
+  class MachineWithScopesAndOwnerSubclassTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :state)
+      
+      @subclass = Class.new(@resource)
+      @subclass_machine = @subclass.state_machine(:state) {}
+      @subclass_machine.state :parked, :idling, :first_gear
     end
     
-    class MachineWithComplexPluralizationScopesTest < BaseTestCase
-      def setup
-        @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :status)
-      end
+    def test_should_only_include_records_with_subclass_states_in_with_scope
+      parked = @subclass.create :state => 'parked'
+      idling = @subclass.create :state => 'idling'
       
-      def test_should_create_singular_with_scope
-        assert @resource.respond_to?(:with_status)
-      end
+      assert_equal [parked, idling], @subclass.with_states(:parked, :idling)
+    end
+    
+    def test_should_only_include_records_without_subclass_states_in_without_scope
+      parked = @subclass.create :state => 'parked'
+      idling = @subclass.create :state => 'idling'
+      first_gear = @subclass.create :state => 'first_gear'
       
-      def test_should_create_plural_with_scope
-        assert @resource.respond_to?(:with_statuses)
-      end
+      assert_equal [parked, idling], @subclass.without_states(:first_gear)
+    end
+  end
+  
+  class MachineWithComplexPluralizationScopesTest < BaseTestCase
+    def setup
+      @resource = new_resource
+      @machine = StateMachine::Machine.new(@resource, :status)
     end
     
-    class MachineWithScopesAndJoinsTest < BaseTestCase
-      def setup
-        @company = new_resource(:company)
-        DataMapperTest.const_set('Company', @company)
-        
-        @vehicle = new_resource(:vehicle) do
-          property :company_id, Integer
-          auto_migrate!
-          
-          belongs_to :company
-        end
-        DataMapperTest.const_set('Vehicle', @vehicle)
-        
-        @company_machine = StateMachine::Machine.new(@company, :initial => :active)
-        @vehicle_machine = StateMachine::Machine.new(@vehicle, :initial => :parked)
-        @vehicle_machine.state :idling
-        
-        @ford = @company.create
-        @mustang = @vehicle.create(:company => @ford)
-      end
+    def test_should_create_singular_with_scope
+      assert @resource.respond_to?(:with_status)
+    end
+    
+    def test_should_create_plural_with_scope
+      assert @resource.respond_to?(:with_statuses)
+    end
+  end
+  
+  class MachineWithScopesAndJoinsTest < BaseTestCase
+    def setup
+      @company = new_resource(:company)
+      DataMapperTest.const_set('Company', @company)
       
-      def test_should_find_records_in_with_scope
-        assert_equal [@mustang], @vehicle.with_states(:parked).all(Vehicle.company.state => 'active')
+      @vehicle = new_resource(:vehicle) do
+        property :company_id, Integer
+        auto_migrate!
+        
+        belongs_to :company
       end
+      DataMapperTest.const_set('Vehicle', @vehicle)
       
-      def test_should_find_records_in_without_scope
-        assert_equal [@mustang], @vehicle.without_states(:idling).all(Vehicle.company.state => 'active')
-      end
+      @company_machine = StateMachine::Machine.new(@company, :initial => :active)
+      @vehicle_machine = StateMachine::Machine.new(@vehicle, :initial => :parked)
+      @vehicle_machine.state :idling
       
-      def teardown
-        DataMapperTest.class_eval do
-          remove_const('Vehicle')
-          remove_const('Company')
-        end
+      @ford = @company.create
+      @mustang = @vehicle.create(:company => @ford)
+    end
+    
+    def test_should_find_records_in_with_scope
+      assert_equal [@mustang], @vehicle.with_states(:parked).all(Vehicle.company.state => 'active')
+    end
+    
+    def test_should_find_records_in_without_scope
+      assert_equal [@mustang], @vehicle.without_states(:idling).all(Vehicle.company.state => 'active')
+    end
+    
+    def teardown
+      DataMapperTest.class_eval do
+        remove_const('Vehicle')
+        remove_const('Company')
       end
     end
   end
-rescue LoadError => ex
-  $stderr.puts "Skipping DataMapper tests. `gem install dm-core#{" -v #{ENV['DM_VERSION']}" if ENV['DM_VERSION']}`, `gem install cucumber rspec hoe launchy do_sqlite3` and try again."
 end