state_machine 1.0.2 → 1.0.3

data/test/unit/integrations/active_record_test.rb

@@ -366,14 +366,14 @@ module ActiveRecordTest
       @machine = StateMachine::Machine.new(@model)
       @machine.state :state
       
-      assert_equal "Instance method \"state?\" is already defined in ActiveRecordTest::Foo, use generic helper instead.\n", $stderr.string
+      assert_match /^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, $stderr.string
     end
     
     def test_should_output_warning_with_same_machine_attribute
       @machine = StateMachine::Machine.new(@model, :public_state, :attribute => :state)
       @machine.state :state
       
-      assert_equal "Instance method \"state?\" is already defined in ActiveRecordTest::Foo, use generic helper instead.\n", $stderr.string
+      assert_match /^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, $stderr.string
     end
     
     def teardown
@@ -879,6 +879,22 @@ module ActiveRecordTest
       assert_equal self, context
     end
     
+    def test_should_run_after_callbacks_if_model_callback_added_prior_to_state_machine_definition
+      model = new_model do
+        after_save { nil }
+      end
+      machine = StateMachine::Machine.new(model, :initial => :parked)
+      machine.other_states :idling
+      machine.event :ignite
+      after_called = false
+      machine.after_transition {after_called = true}
+      
+      record = model.new(:state => 'parked')
+      transition = StateMachine::Transition.new(record, machine, :ignite, :parked, :idling)
+      transition.perform
+      assert_equal true, after_called
+    end
+    
     def test_should_run_around_callbacks
       before_called = false
       after_called = false
@@ -1592,6 +1608,54 @@ module ActiveRecordTest
       @transition.perform
       assert_equal [:before_ignite, [:before_save, @object]], instance.notifications
     end
+    
+    def test_should_support_nil_from_states
+      callbacks = [
+        :before_ignite_from_nil_to_idling,
+        :before_ignite_from_nil,
+        :before_transition_state_from_nil_to_idling,
+        :before_transition_state_from_nil
+      ]
+      
+      notified = false
+      observer = new_observer(@model) do
+        callbacks.each do |callback|
+          define_method(callback) do |*args|
+            notifications << callback
+          end
+        end
+      end
+      
+      instance = observer.instance
+      
+      transition = StateMachine::Transition.new(@record, @machine, :ignite, nil, :idling)
+      transition.perform
+      assert_equal callbacks, instance.notifications
+    end
+    
+    def test_should_support_nil_to_states
+      callbacks = [
+        :before_ignite_from_parked_to_nil,
+        :before_ignite_to_nil,
+        :before_transition_state_from_parked_to_nil,
+        :before_transition_state_to_nil
+      ]
+      
+      notified = false
+      observer = new_observer(@model) do
+        callbacks.each do |callback|
+          define_method(callback) do |*args|
+            notifications << callback
+          end
+        end
+      end
+      
+      instance = observer.instance
+      
+      transition = StateMachine::Transition.new(@record, @machine, :ignite, :parked, nil)
+      transition.perform
+      assert_equal callbacks, instance.notifications
+    end
   end
   
   class MachineWithNamespacedObserversTest < BaseTestCase
@@ -1762,6 +1826,13 @@ module ActiveRecordTest
         assert_equal [parked, idling], @model.with_states(:parked, :idling).find(:all)
       end
       
+      def test_should_allow_lookup_by_string_name
+        parked = @model.create :state => 'parked'
+        idling = @model.create :state => 'idling'
+        
+        assert_equal [parked, idling], @model.with_states('parked', 'idling').find(:all)
+      end
+      
       def test_should_create_singular_without_scope
         assert @model.respond_to?(:without_state)
       end
@@ -1955,6 +2026,17 @@ module ActiveRecordTest
         assert_equal 'shutdown', machine.state(:parked).human_name
       end
       
+      def test_should_allow_customized_state_key_scoped_to_class
+        I18n.backend.store_translations(:en, {
+          :activerecord => {:state_machines => {:'active_record_test/foo' => {:states => {:parked => 'shutdown'}}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        machine.state :parked
+        
+        assert_equal 'shutdown', machine.state(:parked).human_name
+      end
+      
       def test_should_allow_customized_state_key_scoped_to_machine
         I18n.backend.store_translations(:en, {
           :activerecord => {:state_machines => {:state => {:states => {:parked => 'shutdown'}}}}
@@ -1977,6 +2059,16 @@ module ActiveRecordTest
         assert_equal 'shutdown', machine.state(:parked).human_name
       end
       
+      def test_should_support_nil_state_key
+        I18n.backend.store_translations(:en, {
+          :activerecord => {:state_machines => {:states => {:nil => 'empty'}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        
+        assert_equal 'empty', machine.state(nil).human_name
+      end
+      
       def test_should_allow_customized_event_key_scoped_to_class_and_machine
         I18n.backend.store_translations(:en, {
           :activerecord => {:state_machines => {:'active_record_test/foo' => {:state => {:events => {:park => 'stop'}}}}}
@@ -1988,6 +2080,17 @@ module ActiveRecordTest
         assert_equal 'stop', machine.event(:park).human_name
       end
       
+      def test_should_allow_customized_event_key_scoped_to_class
+        I18n.backend.store_translations(:en, {
+          :activerecord => {:state_machines => {:'active_record_test/foo' => {:events => {:park => 'stop'}}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        machine.event :park
+        
+        assert_equal 'stop', machine.event(:park).human_name
+      end
+      
       def test_should_allow_customized_event_key_scoped_to_machine
         I18n.backend.store_translations(:en, {
           :activerecord => {:state_machines => {:state => {:events => {:park => 'stop'}}}}

data/test/unit/integrations/data_mapper_test.rb

@@ -17,16 +17,20 @@ module DataMapperTest
     def default_test
     end
     
+    def teardown
+      @resources.uniq.each {|resource| DataMapperTest.send(:remove_const, resource)} if @resources
+    end
+    
     protected
       # Creates a new DataMapper resource (and the associated table)
       def new_resource(create_table = :foo, &block)
         table_name = create_table || :foo
+        name = table_name.to_s.capitalize
         
-        resource = Class.new do
-          (class << self; self; end).class_eval do
-            define_method(:name) { "DataMapperTest::#{table_name.to_s.capitalize}" }
-          end
-        end
+        resource = Class.new
+        DataMapperTest.send(:remove_const, name) if DataMapperTest.const_defined?(name)
+        DataMapperTest.const_set(name, resource)
+        (@resources ||= []) << name
         
         resource.class_eval do
           include DataMapper::Resource
@@ -35,10 +39,9 @@ module DataMapperTest
           
           property :id, resource.class_eval('Serial')
           property :state, String
-          
-          auto_migrate! if create_table
         end
         resource.class_eval(&block) if block_given?
+        resource.auto_migrate! if create_table
         resource
       end
       
@@ -295,7 +298,6 @@ module DataMapperTest
     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
@@ -335,7 +337,7 @@ module DataMapperTest
       @machine = StateMachine::Machine.new(@resource)
       @machine.state :state
       
-      assert_equal "Instance method \"state?\" is already defined in DataMapperTest::Foo :state instance helpers, use generic helper instead.\n", $stderr.string
+      assert_match /^Instance method "state\?" is already defined in DataMapperTest::Foo :state instance helpers, use generic helper instead.*\n$/, $stderr.string
     end
     
     def test_should_not_output_warning_with_same_machine_name
@@ -347,6 +349,7 @@ module DataMapperTest
     
     def teardown
       $stderr = @original_stderr
+      super
     end
   end
   
@@ -485,11 +488,14 @@ module DataMapperTest
     
     if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.9.8')
       def test_should_raise_exception_if_protected
-        @resource.class_eval do
+        resource = new_resource do
           protected :state=
         end
         
-        assert_raise(ArgumentError) { @resource.new(:state => 'idling') }
+        machine = StateMachine::Machine.new(resource, :initial => :parked)
+        machine.state :idling
+        
+        assert_raise(ArgumentError) { resource.new(:state => 'idling') }
       end
     end
   end
@@ -498,7 +504,6 @@ module DataMapperTest
     def setup
       @resource = new_resource do
         property :status, String
-        auto_migrate!
       end
       @state_machine = StateMachine::Machine.new(@resource, :initial => :parked)
       @status_machine = StateMachine::Machine.new(@resource, :status, :initial => :idling)
@@ -515,7 +520,6 @@ module DataMapperTest
     def setup
       @resource = new_resource do
         property :updated_at, DateTime
-        auto_migrate!
         
         # Simulate dm-timestamps
         before :update do
@@ -612,7 +616,6 @@ module DataMapperTest
     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
@@ -652,7 +655,6 @@ module DataMapperTest
     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
@@ -1812,6 +1814,13 @@ module DataMapperTest
       assert_equal [parked, idling], @resource.with_states(:parked, :idling)
     end
     
+    def test_should_allow_lookup_by_string_name
+      parked = @resource.create :state => 'parked'
+      idling = @resource.create :state => 'idling'
+      
+      assert_equal [parked, idling], @resource.with_states('parked', 'idling')
+    end
+    
     def test_should_create_singular_without_scope
       assert @resource.respond_to?(:without_state)
     end
@@ -1849,6 +1858,9 @@ module DataMapperTest
       @machine = StateMachine::Machine.new(@resource, :state)
       
       @subclass = Class.new(@resource)
+      DataMapperTest.const_set('Bar', @subclass)
+      @resources << 'Bar'
+      @subclass.auto_migrate!
       @subclass_machine = @subclass.state_machine(:state) {}
       @subclass_machine.state :parked, :idling, :first_gear
     end
@@ -1887,15 +1899,12 @@ module DataMapperTest
   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)
@@ -1912,12 +1921,5 @@ module DataMapperTest
     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
 end

data/test/unit/integrations/mongo_mapper_test.rb

@@ -295,14 +295,14 @@ module MongoMapperTest
       @machine = StateMachine::Machine.new(@model)
       @machine.state :state
       
-      assert_match /^Instance method "state\?" is already defined in .*, use generic helper instead\.\n$/, $stderr.string
+      assert_match /^Instance method "state\?" is already defined in .*, use generic helper instead.*\n$/, $stderr.string
     end
     
     def test_should_output_warning_with_same_machine_attribute
       @machine = StateMachine::Machine.new(@model, :public_state, :attribute => :state)
       @machine.state :state
       
-      assert_match /^Instance method "state\?" is already defined in .*, use generic helper instead\.\n$/, $stderr.string
+      assert_match /^Instance method "state\?" is already defined in .*, use generic helper instead.*\n$/, $stderr.string
     end
     
     def teardown
@@ -754,6 +754,22 @@ module MongoMapperTest
       assert_equal self, context
     end
     
+    def test_should_run_after_callbacks_if_model_callback_added_prior_to_state_machine_definition
+      model = new_model do
+        after_save { nil }
+      end
+      machine = StateMachine::Machine.new(model, :initial => :parked)
+      machine.other_states :idling
+      machine.event :ignite
+      after_called = false
+      machine.after_transition {after_called = true}
+      
+      record = model.new(:state => 'parked')
+      transition = StateMachine::Transition.new(record, machine, :ignite, :parked, :idling)
+      transition.perform
+      assert_equal true, after_called
+    end
+    
     def test_should_run_around_callbacks
       before_called = false
       after_called = false
@@ -814,23 +830,7 @@ module MongoMapperTest
       @result = @transition.perform
     end
     
-    if defined?(MongoMapper::Version) && MongoMapper::Version >= '0.9.0'
-      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.new_record?
-      end
-      
-      def test_should_not_run_further_callbacks
-        assert_equal [:before_1], @callbacks
-      end
-    else
+    if !defined?(MongoMapper::Version) || MongoMapper::Version =~ /^0\.[5-8]\./
       def test_should_be_successful
         assert @result
       end
@@ -846,6 +846,22 @@ module MongoMapperTest
       def test_should_run_further_callbacks
         assert_equal [:before_1, :before_2, :around_before, :around_after, :after], @callbacks
       end
+    else
+      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.new_record?
+      end
+      
+      def test_should_not_run_further_callbacks
+        assert_equal [:before_1], @callbacks
+      end
     end
   end
   
@@ -916,14 +932,14 @@ module MongoMapperTest
       assert !@record.new_record?
     end
     
-    if defined?(MongoMapper::Version) && MongoMapper::Version >= '0.9.0'
-      def test_should_not_run_further_after_callbacks
-        assert_equal [:around_before, :around_after, :after_1], @callbacks
-      end
-    else
+    if !defined?(MongoMapper::Version) || MongoMapper::Version =~ /^0\.[5-8]\./
       def test_should_still_run_further_after_callbacks
         assert_equal [:around_before, :around_after, :after_1, :after_2], @callbacks
       end
+    else
+      def test_should_not_run_further_after_callbacks
+        assert_equal [:around_before, :around_after, :after_1], @callbacks
+      end
     end
   end
   
@@ -1405,6 +1421,13 @@ module MongoMapperTest
       assert_equal [parked, idling], @model.with_states(:parked, :idling).to_a
     end
     
+    def test_should_allow_lookup_by_string_name
+      parked = @model.create :state => 'parked'
+      idling = @model.create :state => 'idling'
+      
+      assert_equal [parked, idling], @model.with_states('parked', 'idling').to_a
+    end
+    
     def test_should_create_singular_without_scope
       assert @model.respond_to?(:without_state)
     end
@@ -1428,7 +1451,7 @@ module MongoMapperTest
       assert_equal [parked, idling], @model.without_states(:first_gear).to_a
     end
     
-    if defined?(MongoMapper::Version) && MongoMapper::Version >= '0.8.0'
+    if defined?(MongoMapper::Version) && !(MongoMapper::Version =~ /^0\.[5-7]\./)
       def test_should_allow_chaining_scopes
         parked = @model.create :state => 'parked'
         idling = @model.create :state => 'idling'
@@ -1541,6 +1564,17 @@ module MongoMapperTest
         assert_equal 'shutdown', machine.state(:parked).human_name
       end
       
+      def test_should_allow_customized_state_key_scoped_to_class
+        I18n.backend.store_translations(:en, {
+          :mongo_mapper => {:state_machines => {:'mongo_mapper_test/foo' => {:states => {:parked => 'shutdown'}}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        machine.state :parked
+        
+        assert_equal 'shutdown', machine.state(:parked).human_name
+      end
+      
       def test_should_allow_customized_state_key_scoped_to_machine
         I18n.backend.store_translations(:en, {
           :mongo_mapper => {:state_machines => {:state => {:states => {:parked => 'shutdown'}}}}
@@ -1563,6 +1597,16 @@ module MongoMapperTest
         assert_equal 'shutdown', machine.state(:parked).human_name
       end
       
+      def test_should_support_nil_state_key
+        I18n.backend.store_translations(:en, {
+          :mongo_mapper => {:state_machines => {:states => {:nil => 'empty'}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        
+        assert_equal 'empty', machine.state(nil).human_name
+      end
+      
       def test_should_allow_customized_event_key_scoped_to_class_and_machine
         I18n.backend.store_translations(:en, {
           :mongo_mapper => {:state_machines => {:'mongo_mapper_test/foo' => {:state => {:events => {:park => 'stop'}}}}}
@@ -1574,6 +1618,17 @@ module MongoMapperTest
         assert_equal 'stop', machine.event(:park).human_name
       end
       
+      def test_should_allow_customized_event_key_scoped_to_class
+        I18n.backend.store_translations(:en, {
+          :mongo_mapper => {:state_machines => {:'mongo_mapper_test/foo' => {:events => {:park => 'stop'}}}}
+        })
+        
+        machine = StateMachine::Machine.new(@model)
+        machine.event :park
+        
+        assert_equal 'stop', machine.event(:park).human_name
+      end
+      
       def test_should_allow_customized_event_key_scoped_to_machine
         I18n.backend.store_translations(:en, {
           :mongo_mapper => {:state_machines => {:state => {:events => {:park => 'stop'}}}}