state_machine 0.6.1 → 0.6.2

data/test/unit/event_test.rb

@@ -78,6 +78,77 @@ class EventTest < Test::Unit::TestCase
   end
 end
 
+class EventWithConflictingHelpersTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new do
+      def can_ignite?
+        0
+      end
+      
+      def next_ignite_transition
+        0
+      end
+      
+      def ignite
+        0
+      end
+      
+      def ignite!
+        0
+      end
+    end
+    @machine = StateMachine::Machine.new(@klass)
+    @state = StateMachine::Event.new(@machine, :ignite)
+    @object = @klass.new
+  end
+  
+  def test_should_not_redefine_predicate
+    assert_equal 0, @object.can_ignite?
+  end
+  
+  def test_should_not_redefine_transition_accessor
+    assert_equal 0, @object.next_ignite_transition
+  end
+  
+  def test_should_not_redefine_action
+    assert_equal 0, @object.ignite
+  end
+  
+  def test_should_not_redefine_bang_action
+    assert_equal 0, @object.ignite!
+  end
+  
+  def test_should_allow_super_chaining
+    @klass.class_eval do
+      def can_ignite?
+        super ? 1 : 0
+      end
+      
+      def next_ignite_transition
+        super ? 1 : 0
+      end
+      
+      def ignite
+        super ? 1 : 0
+      end
+      
+      def ignite!
+        begin
+          super
+          1
+        rescue Exception => ex
+          0
+        end
+      end
+    end
+    
+    assert_equal 0, @object.can_ignite?
+    assert_equal 0, @object.next_ignite_transition
+    assert_equal 0, @object.ignite
+    assert_equal 0, @object.ignite!
+  end
+end
+
 class EventWithNamespaceTest < Test::Unit::TestCase
   def setup
     @klass = Class.new

data/test/unit/machine_test.rb

@@ -536,96 +536,102 @@ class MachineAfterChangingInitialState < Test::Unit::TestCase
   end
 end
 
-class MachineWithConflictingAttributeAccessorsTest < Test::Unit::TestCase
+class MachineWithInstanceHelpersTest < Test::Unit::TestCase
   def setup
-    @klass = Class.new do
-      attr_accessor :status
-      
-      def state
-        status
-      end
-      
-      def state=(value)
-        self.status = value
-      end
-      
-      def state?
-        true
-      end
-      
-      def state_name
-        :parked
-      end
-    end
+    @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
     @object = @klass.new
   end
   
-  def test_should_not_define_attribute_reader
-    @object.status = 'parked'
+  def test_should_not_redefine_existing_public_methods
+    @klass.class_eval do
+      def state
+        'parked'
+      end
+    end
+    
+    @machine.define_instance_method(:state) {}
     assert_equal 'parked', @object.state
   end
   
-  def test_should_not_define_attribute_writer
-    @object.state = 'parked'
-    assert_equal 'parked', @object.status
+  def test_should_not_redefine_existing_protected_methods
+    @klass.class_eval do
+      protected
+        def state
+          'parked'
+        end
+    end
+    
+    @machine.define_instance_method(:state) {}
+    assert_equal 'parked', @object.send(:state)
   end
   
-  def test_should_not_define_attribute_predicate
-    assert @object.state?
+  def test_should_not_redefine_existing_private_methods
+    @klass.class_eval do
+      private
+        def state
+          'parked'
+        end
+    end
+    
+    @machine.define_instance_method(:state) {}
+    assert_equal 'parked', @object.send(:state)
   end
   
-  def test_should_define_attribute_name_reader
-    assert_nil @object.state_name
+  def test_should_define_nonexistent_methods
+    @machine.define_instance_method(:state) {'parked'}
+    assert_equal 'parked', @object.state
   end
 end
 
-class MachineWithConflictingPrivateAttributeAccessorsTest < Test::Unit::TestCase
+class MachineWithClassHelpersTest < Test::Unit::TestCase
   def setup
-    @klass = Class.new do
-      attr_accessor :status
-      
-      private
-        def state
-          status
-        end
-        
-        def state=(value)
-          self.status = value
-        end
-        
-        def state?
-          true
-        end
-        
-        def state_name
-          :parked
-        end
-    end
+    @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @object = @klass.new
   end
   
-  def test_should_not_define_attribute_reader
-    @object.status = 'parked'
-    assert_equal 'parked', @object.send(:state)
+  def test_should_not_redefine_existing_public_methods
+    class << @klass
+      def states
+        []
+      end
+    end
+    
+    @machine.define_class_method(:states) {}
+    assert_equal [], @klass.states
   end
   
-  def test_should_not_define_attribute_writer
-    @object.send(:state=, 'parked')
-    assert_equal 'parked', @object.status
+  def test_should_not_redefine_existing_protected_methods
+    class << @klass
+      protected
+        def states
+          []
+        end
+    end
+    
+    @machine.define_class_method(:states) {}
+    assert_equal [], @klass.send(:states)
   end
   
-  def test_should_not_define_attribute_predicate
-    assert @object.send(:state?)
+  def test_should_not_redefine_existing_private_methods
+    class << @klass
+      private
+        def states
+          []
+        end
+    end
+    
+    @machine.define_class_method(:states) {}
+    assert_equal [], @klass.send(:states)
   end
   
-  def test_should_define_attribute_name_reader
-    assert_nil @object.send(:state_name)
+  def test_should_define_nonexistent_methods
+    @machine.define_class_method(:states) {[]}
+    assert_equal [], @klass.states
   end
 end
 
-class MachineWithConflictingScopesTest < Test::Unit::TestCase
+class MachineWithConflictingHelpersTest < Test::Unit::TestCase
   def setup
     @klass = Class.new do
       def self.with_state
@@ -643,37 +649,124 @@ class MachineWithConflictingScopesTest < Test::Unit::TestCase
       def self.without_states
         :without_states
       end
+      
+      attr_accessor :status
+      
+      def state
+        'parked'
+      end
+      
+      def state=(value)
+        self.status = value
+      end
+      
+      def state?
+        true
+      end
+      
+      def state_name
+        :parked
+      end
     end
     
-    integration = Module.new do
-      def define_with_scope(name)
-        raise ArgumentError, 'should not define a with scope'
+    StateMachine::Integrations.const_set('Custom', Module.new do
+      def create_with_scope(name)
+        lambda {|klass, values| []}
       end
       
-      def define_without_scope(name)
-        raise ArgumentError, 'should not define a without scope'
+      def create_without_scope(name)
+        lambda {|klass, values| []}
       end
-    end
-    StateMachine::Integrations.const_set('Custom', integration)
+    end)
+    
     @machine = StateMachine::Machine.new(@klass, :integration => :custom)
+    @machine.state :parked, :idling
+    @object = @klass.new
   end
   
-  def test_should_not_define_singular_with_scope
+  def test_should_not_redefine_singular_with_scope
     assert_equal :with_state, @klass.with_state
   end
   
-  def test_should_not_define_plural_with_scope
+  def test_should_not_redefine_plural_with_scope
     assert_equal :with_states, @klass.with_states
   end
   
-  def test_should_not_define_singular_without_scope
+  def test_should_not_redefine_singular_without_scope
     assert_equal :without_state, @klass.without_state
   end
   
-  def test_should_not_define_plural_without_scope
+  def test_should_not_redefine_plural_without_scope
     assert_equal :without_states, @klass.without_states
   end
   
+  def test_should_not_redefine_attribute_writer
+    assert_equal 'parked', @object.state
+  end
+  
+  def test_should_not_redefine_attribute_writer
+    @object.state = 'parked'
+    assert_equal 'parked', @object.status
+  end
+  
+  def test_should_not_define_attribute_predicate
+    assert @object.state?
+  end
+  
+  def test_should_not_redefine_attribute_name_reader
+    assert_equal :parked, @object.state_name
+  end
+  
+  def test_should_allow_super_chaining
+    @klass.class_eval do
+      def self.with_state(*states)
+        super == []
+      end
+      
+      def self.with_states(*states)
+        super == []
+      end
+      
+      def self.without_state(*states)
+        super == []
+      end
+      
+      def self.without_states(*states)
+        super == []
+      end
+      
+      attr_accessor :status
+      
+      def state
+        super || 'parked'
+      end
+      
+      def state=(value)
+        super
+        self.status = value
+      end
+      
+      def state?(state)
+        super ? 1 : 0
+      end
+      
+      def state_name
+        super == :parked ? 1 : 0
+      end
+    end
+    
+    assert_equal true, @klass.with_state
+    assert_equal true, @klass.with_states
+    assert_equal true, @klass.without_state
+    assert_equal true, @klass.without_states
+    
+    assert_equal 'parked', @object.state
+    @object.state = 'idling'
+    assert_equal 'idling', @object.status
+    assert_equal 0, @object.state?(:parked)
+    assert_equal 0, @object.state_name
+  end
+  
   def teardown
     StateMachine::Integrations.send(:remove_const, 'Custom')
   end

data/test/unit/state_test.rb

@@ -272,20 +272,30 @@ class StateNotInitialTest < Test::Unit::TestCase
   end
 end
 
-class StateWithConflictingPredicateTest < Test::Unit::TestCase
+class StateWithConflictingHelpersTest < Test::Unit::TestCase
   def setup
     @klass = Class.new do
       def parked?
-        1
+        0
       end
     end
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.state :parked
     @object = @klass.new
   end
   
-  def test_should_redefine_state_predicate
-    assert_equal false, @object.parked?
+  def test_should_not_redefine_state_predicate
+    assert_equal 0, @object.parked?
+  end
+  
+  def test_should_allow_super_chaining
+    @klass.class_eval do
+      def parked?
+        super ? 1 : 0
+      end
+    end
+    
+    assert_equal 0, @object.parked?
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 00:00:00 -05:00
+date: 2009-03-07 23:00:00 -05:00
 default_executable: 
 dependencies: []