state_machine 0.4.3 → 0.5.0

data/test/unit/integrations/active_record_test.rb

@@ -87,6 +87,7 @@ begin
       def setup
         @model = new_model
         @machine = StateMachine::Machine.new(@model)
+        @machine.state :parked, :idling, :first_gear
       end
       
       def test_should_create_singular_with_scope
@@ -94,10 +95,10 @@ begin
       end
       
       def test_should_only_include_records_with_state_in_singular_with_scope
-        off = @model.create :state => 'off'
-        on = @model.create :state => 'on'
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
         
-        assert_equal [off], @model.with_state('off')
+        assert_equal [parked], @model.with_state(:parked)
       end
       
       def test_should_create_plural_with_scope
@@ -105,10 +106,10 @@ begin
       end
       
       def test_should_only_include_records_with_states_in_plural_with_scope
-        off = @model.create :state => 'off'
-        on = @model.create :state => 'on'
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
         
-        assert_equal [off, on], @model.with_states('off', 'on')
+        assert_equal [parked, idling], @model.with_states(:parked, :idling)
       end
       
       def test_should_create_singular_without_scope
@@ -116,10 +117,10 @@ begin
       end
       
       def test_should_only_include_records_without_state_in_singular_without_scope
-        off = @model.create :state => 'off'
-        on = @model.create :state => 'on'
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
         
-        assert_equal [off], @model.without_state('on')
+        assert_equal [parked], @model.without_state(:idling)
       end
       
       def test_should_create_plural_without_scope
@@ -127,11 +128,18 @@ begin
       end
       
       def test_should_only_include_records_without_states_in_plural_without_scope
-        off = @model.create :state => 'off'
-        on = @model.create :state => 'on'
-        error = @model.create :state => 'error'
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
+        first_gear = @model.create :state => 'first_gear'
         
-        assert_equal [off, on], @model.without_states('error')
+        assert_equal [parked, idling], @model.without_states(:first_gear)
+      end
+      
+      def test_should_allow_chaining_scopes
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
+        
+        assert_equal [idling], @model.without_state(:parked).with_state(:idling)
       end
       
       def test_should_rollback_transaction_if_false
@@ -154,14 +162,29 @@ begin
       
       def test_should_not_override_the_column_reader
         record = @model.new
-        record[:state] = 'off'
-        assert_equal 'off', record.state
+        record[:state] = 'parked'
+        assert_equal 'parked', record.state
       end
       
       def test_should_not_override_the_column_writer
         record = @model.new
-        record.state = 'off'
-        assert_equal 'off', record[:state]
+        record.state = 'parked'
+        assert_equal 'parked', record[:state]
+      end
+    end
+    
+    class MachineWithoutDatabaseTest < ActiveRecord::TestCase
+      def setup
+        @model = new_model(false) do
+          # Simulate the database not being available entirely
+          def self.connection
+            raise ActiveRecord::ConnectionNotEstablished
+          end
+        end
+      end
+      
+      def test_should_allow_machine_creation
+        assert_nothing_raised { StateMachine::Machine.new(@model) }
       end
     end
     
@@ -181,20 +204,21 @@ begin
     class MachineWithInitialStateTest < ActiveRecord::TestCase
       def setup
         @model = new_model
-        @machine = StateMachine::Machine.new(@model, :initial => 'off')
+        @machine = StateMachine::Machine.new(@model, :initial => :parked)
         @record = @model.new
       end
       
       def test_should_set_initial_state_on_created_object
-        assert_equal 'off', @record.state
+        assert_equal 'parked', @record.state
       end
     end
     
     class MachineWithColumnStateAttributeTest < ActiveRecord::TestCase
       def setup
         @model = new_model
-        @machine = StateMachine::Machine.new(@model, :initial => 'off')
-        @machine.other_states('on')
+        @machine = StateMachine::Machine.new(@model, :initial => :parked)
+        @machine.other_states(:idling)
+        
         @record = @model.new
       end
       
@@ -210,23 +234,23 @@ begin
       end
       
       def test_should_return_false_for_predicate_if_does_not_match_current_value
-        assert !@record.state?('on')
+        assert !@record.state?(:idling)
       end
       
       def test_should_return_true_for_predicate_if_matches_current_value
-        assert @record.state?('off')
+        assert @record.state?(:parked)
       end
       
       def test_should_raise_exception_for_predicate_if_invalid_state_specified
-        assert_raise(ArgumentError) { @record.state?('invalid') }
+        assert_raise(ArgumentError) { @record.state?(:invalid) }
       end
     end
     
     class MachineWithNonColumnStateAttributeTest < ActiveRecord::TestCase
       def setup
         @model = new_model
-        @machine = StateMachine::Machine.new(@model, :status, :initial => 'off')
-        @machine.other_states('on')
+        @machine = StateMachine::Machine.new(@model, :status, :initial => :parked)
+        @machine.other_states(:idling)
         @record = @model.new
       end
       
@@ -250,28 +274,30 @@ begin
       end
       
       def test_should_return_false_for_predicate_if_does_not_match_current_value
-        assert !@record.status?('on')
+        assert !@record.status?(:idling)
       end
       
       def test_should_return_true_for_predicate_if_matches_current_value
-        assert @record.status?('off')
+        assert @record.status?(:parked)
       end
       
       def test_should_raise_exception_for_predicate_if_invalid_state_specified
-        assert_raise(ArgumentError) { @record.status?('invalid') }
+        assert_raise(ArgumentError) { @record.status?(:invalid) }
       end
       
       def test_should_set_initial_state_on_created_object
-        assert_equal 'off', @record.status
+        assert_equal 'parked', @record.status
       end
     end
     
     class MachineWithCallbacksTest < ActiveRecord::TestCase
       def setup
         @model = new_model
-        @machine = StateMachine::Machine.new(@model, :initial => 'off')
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine = StateMachine::Machine.new(@model, :initial => :parked)
+        @machine.other_states :idling
+        
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
       end
       
       def test_should_run_before_callbacks
@@ -339,20 +365,20 @@ begin
       end
       
       def test_should_include_transition_states_in_known_states
-        @machine.before_transition :to => 'error', :do => lambda {}
+        @machine.before_transition :to => :first_gear, :do => lambda {}
         
-        assert_equal %w(error off), @machine.states.keys.sort
+        assert_equal [:parked, :idling, :first_gear], @machine.states.map {|state| state.name}
       end
       
       def test_should_allow_symbolic_callbacks
         callback_args = nil
         
         klass = class << @record; self; end
-        klass.send(:define_method, :after_turn_on) do |*args|
+        klass.send(:define_method, :after_ignite) do |*args|
           callback_args = args
         end
         
-        @machine.before_transition(:after_turn_on)
+        @machine.before_transition(:after_ignite)
         
         @transition.perform
         assert_equal [@transition], callback_args
@@ -376,10 +402,12 @@ begin
         
         @model = new_model
         @machine = StateMachine::Machine.new(@model)
+        @machine.state :parked, :idling
         @machine.before_transition(lambda {@before_count += 1; false})
         @machine.before_transition(lambda {@before_count += 1})
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         @result = @transition.perform
       end
       
@@ -388,7 +416,7 @@ begin
       end
       
       def test_should_not_change_current_state
-        assert_equal 'off', @record.state
+        assert_equal 'parked', @record.state
       end
       
       def test_should_not_run_action
@@ -403,12 +431,13 @@ begin
     class MachineWithFailedActionTest < ActiveRecord::TestCase
       def setup
         @model = new_model do
-          validates_inclusion_of :state, :in => %w(maybe)
+          validates_inclusion_of :state, :in => %w(first_gear)
         end
         
         @machine = StateMachine::Machine.new(@model)
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine.state :parked, :idling
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         @result = @transition.perform
       end
       
@@ -417,7 +446,7 @@ begin
       end
       
       def test_should_change_current_state
-        assert_equal 'on', @record.state
+        assert_equal 'idling', @record.state
       end
       
       def test_should_not_save_record
@@ -431,10 +460,12 @@ begin
         
         @model = new_model
         @machine = StateMachine::Machine.new(@model)
+        @machine.state :parked, :idling
         @machine.after_transition(lambda {@after_count += 1; false})
         @machine.after_transition(lambda {@after_count += 1})
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         @result = @transition.perform
       end
       
@@ -443,7 +474,7 @@ begin
       end
       
       def test_should_change_current_state
-        assert_equal 'on', @record.state
+        assert_equal 'idling', @record.state
       end
       
       def test_should_save_record
@@ -459,13 +490,14 @@ begin
       def setup
         @model = new_model
         @machine = StateMachine::Machine.new(@model)
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine.state :parked, :idling
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
       end
       
       def test_should_call_before_event_method
         observer = new_observer(@model) do
-          def before_turn_on(*args)
+          def before_ignite(*args)
             notifications << args
           end
         end
@@ -489,7 +521,7 @@ begin
       
       def test_should_call_after_event_method
         observer = new_observer(@model) do
-          def after_turn_on(*args)
+          def after_ignite(*args)
             notifications << args
           end
         end
@@ -513,8 +545,8 @@ begin
       
       def test_should_call_event_method_before_transition_method
         observer = new_observer(@model) do
-          def before_turn_on(*args)
-            notifications << :before_turn_on
+          def before_ignite(*args)
+            notifications << :before_ignite
           end
           
           def before_transition(*args)
@@ -524,12 +556,12 @@ begin
         instance = observer.instance
         
         @transition.perform
-        assert_equal [:before_turn_on, :before_transition], instance.notifications
+        assert_equal [:before_ignite, :before_transition], instance.notifications
       end
       
       def test_should_call_methods_outside_the_context_of_the_record
         observer = new_observer(@model) do
-          def before_turn_on(*args)
+          def before_ignite(*args)
             notifications << self
           end
         end
@@ -543,14 +575,15 @@ begin
     class MachineWithNamespacedObserversTest < ActiveRecord::TestCase
       def setup
         @model = new_model
-        @machine = StateMachine::Machine.new(@model, :namespace => 'switch')
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine = StateMachine::Machine.new(@model, :namespace => 'car')
+        @machine.state :parked, :idling
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
       end
       
       def test_should_call_namespaced_before_event_method
         observer = new_observer(@model) do
-          def before_turn_on_switch(*args)
+          def before_ignite_car(*args)
             notifications << args
           end
         end
@@ -562,7 +595,7 @@ begin
       
       def test_should_call_namespaced_after_event_method
         observer = new_observer(@model) do
-          def after_turn_on_switch(*args)
+          def after_ignite_car(*args)
             notifications << args
           end
         end
@@ -577,8 +610,9 @@ begin
       def setup
         @model = new_model
         @machine = StateMachine::Machine.new(@model)
-        @record = @model.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine.state :parked, :idling
+        @record = @model.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         
         @notifications = []
         
@@ -588,16 +622,16 @@ begin
         
         # Create observer callbacks
         observer = new_observer(@model) do
-          def before_turn_on(*args)
-            notifications << :observer_before_turn_on
+          def before_ignite(*args)
+            notifications << :observer_before_ignite
           end
           
           def before_transition(*args)
             notifications << :observer_before_transition
           end
           
-          def after_turn_on(*args)
-            notifications << :observer_after_turn_on
+          def after_ignite(*args)
+            notifications << :observer_after_ignite
           end
           
           def after_transition(*args)
@@ -613,10 +647,10 @@ begin
       def test_should_invoke_callbacks_in_specific_order
         expected = [
           :callback_before_transition,
-          :observer_before_turn_on,
+          :observer_before_ignite,
           :observer_before_transition,
           :callback_after_transition,
-          :observer_after_turn_on,
+          :observer_after_ignite,
           :observer_after_transition
         ]
         

data/test/unit/integrations/data_mapper_test.rb

@@ -7,7 +7,7 @@ begin
   
   # Establish database connection
   DataMapper.setup(:default, 'sqlite3::memory:')
-  DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", 0)
+  DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", :info)
   
   module DataMapperTest
     class BaseTestCase < Test::Unit::TestCase
@@ -68,6 +68,7 @@ begin
       def setup
         @resource = new_resource
         @machine = StateMachine::Machine.new(@resource)
+        @machine.state :parked, :idling, :first_gear
       end
       
       def test_should_create_singular_with_scope
@@ -75,10 +76,10 @@ begin
       end
       
       def test_should_only_include_records_with_state_in_singular_with_scope
-        off = @resource.create :state => 'off'
-        on = @resource.create :state => 'on'
+        parked = @resource.create :state => 'parked'
+        idling = @resource.create :state => 'idling'
         
-        assert_equal [off], @resource.with_state('off')
+        assert_equal [parked], @resource.with_state(:parked)
       end
       
       def test_should_create_plural_with_scope
@@ -86,10 +87,10 @@ begin
       end
       
       def test_should_only_include_records_with_states_in_plural_with_scope
-        off = @resource.create :state => 'off'
-        on = @resource.create :state => 'on'
+        parked = @resource.create :state => 'parked'
+        idling = @resource.create :state => 'idling'
         
-        assert_equal [off, on], @resource.with_states('off', 'on')
+        assert_equal [parked, idling], @resource.with_states(:parked, :idling)
       end
       
       def test_should_create_singular_without_scope
@@ -97,10 +98,10 @@ begin
       end
       
       def test_should_only_include_records_without_state_in_singular_without_scope
-        off = @resource.create :state => 'off'
-        on = @resource.create :state => 'on'
+        parked = @resource.create :state => 'parked'
+        idling = @resource.create :state => 'idling'
         
-        assert_equal [off], @resource.without_state('on')
+        assert_equal [parked], @resource.without_state(:idling)
       end
       
       def test_should_create_plural_without_scope
@@ -108,11 +109,18 @@ begin
       end
       
       def test_should_only_include_records_without_states_in_plural_without_scope
-        off = @resource.create :state => 'off'
-        on = @resource.create :state => 'on'
-        error = @resource.create :state => 'error'
+        parked = @resource.create :state => 'parked'
+        idling = @resource.create :state => 'idling'
+        first_gear = @resource.create :state => 'first_gear'
         
-        assert_equal [off, on], @resource.without_states('error')
+        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'
+        
+        assert_equal [idling], @resource.without_state(:parked).with_state(:idling)
       end
       
       def test_should_rollback_transaction_if_false
@@ -135,14 +143,14 @@ begin
       
       def test_should_not_override_the_column_reader
         record = @resource.new
-        record.attribute_set(:state, 'off')
-        assert_equal 'off', record.state
+        record.attribute_set(:state, 'parked')
+        assert_equal 'parked', record.state
       end
       
       def test_should_not_override_the_column_writer
         record = @resource.new
-        record.state = 'off'
-        assert_equal 'off', record.attribute_get(:state)
+        record.state = 'parked'
+        assert_equal 'parked', record.attribute_get(:state)
       end
     end
     
@@ -159,19 +167,19 @@ begin
     class MachineWithInitialStateTest < BaseTestCase
       def setup
         @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :initial => 'off')
+        @machine = StateMachine::Machine.new(@resource, :initial => 'parked')
         @record = @resource.new
       end
       
       def test_should_set_initial_state_on_created_object
-        assert_equal 'off', @record.state
+        assert_equal 'parked', @record.state
       end
     end
     
     class MachineWithNonColumnStateAttributeTest < BaseTestCase
       def setup
         @resource = new_resource
-        @machine = StateMachine::Machine.new(@resource, :status, :initial => 'off')
+        @machine = StateMachine::Machine.new(@resource, :status, :initial => 'parked')
         @record = @resource.new
       end
       
@@ -184,7 +192,7 @@ begin
       end
       
       def test_should_set_initial_state_on_created_object
-        assert_equal 'off', @record.status
+        assert_equal 'parked', @record.status
       end
     end
     
@@ -192,8 +200,9 @@ begin
       def setup
         @resource = new_resource
         @machine = StateMachine::Machine.new(@resource)
-        @record = @resource.new(:state => 'off')
-        @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+        @machine.state :parked, :idling
+        @record = @resource.new(:state => 'parked')
+        @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
       end
       
       def test_should_run_before_callbacks
@@ -256,11 +265,11 @@ begin
         callback_args = nil
         
         klass = class << @record; self; end
-        klass.send(:define_method, :after_turn_on) do |*args|
+        klass.send(:define_method, :after_ignite) do |*args|
           callback_args = args
         end
         
-        @machine.before_transition(:after_turn_on)
+        @machine.before_transition(:after_ignite)
         
         @transition.perform
         assert_equal [@transition], callback_args
@@ -285,15 +294,16 @@ begin
         def setup
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
-          @record = @resource.new(:state => 'off')
-          @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+          @machine.state :parked, :idling
+          @record = @resource.new(:state => 'parked')
+          @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
         end
         
         def test_should_call_before_transition_callback_if_requirements_match
           called = false
           
           observer = new_observer(@resource) do
-            before_transition :from => 'off' do
+            before_transition :from => :parked do
               called = true
             end
           end
@@ -306,7 +316,7 @@ begin
           called = false
           
           observer = new_observer(@resource) do
-            before_transition :from => 'on' do
+            before_transition :from => :idling do
               called = true
             end
           end
@@ -322,11 +332,11 @@ begin
           called_status = false
           
           observer = new_observer(@resource) do
-            before_transition :state, :from => 'off' do
+            before_transition :state, :from => :parked do
               called_state = true
             end
             
-            before_transition :status, :from => 'off' do
+            before_transition :status, :from => :parked do
               called_status = true
             end
           end
@@ -354,7 +364,7 @@ begin
           called = false
           
           observer = new_observer(@resource) do
-            after_transition :from => 'off' do
+            after_transition :from => :parked do
               called = true
             end
           end
@@ -367,7 +377,7 @@ begin
           called = false
           
           observer = new_observer(@resource) do
-            after_transition :from => 'on' do
+            after_transition :from => :idling do
               called = true
             end
           end
@@ -394,8 +404,9 @@ begin
         def setup
           @resource = new_resource
           @machine = StateMachine::Machine.new(@resource)
-          @record = @resource.new(:state => 'off')
-          @transition = StateMachine::Transition.new(@record, @machine, 'turn_on', 'off', 'on')
+          @machine.state :parked, :idling
+          @record = @resource.new(:state => 'parked')
+          @transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, :idling)
           
           @notifications = notifications = []
           
@@ -432,5 +443,5 @@ begin
     end
   end
 rescue LoadError
-  $stderr.puts 'Skipping DataMapper Core tests. `gem install dm-core` and try again.'
+  $stderr.puts 'Skipping DataMapper tests. `gem install dm-core rspec hoe launchy do_sqlite3` and try again.'
 end