statemachine 0.4.0 → 0.4.1

data/CHANGES

@@ -1,5 +1,10 @@
 = Statemachine Changelog
 
+== Version 0.4.1
+
+Simple Fixes
+* Fixed priority of default transitions, self defaults first, then superstate defaults.
+
 == Version 0.4.0
 
 Feature enhancements

data/TODO

@@ -1,4 +1,2 @@
-Specific Exceptions... so missing events can be identified.
-
 Maybe:
 Implement superstate endstate with automatic transition

data/lib/statemachine/state.rb

@@ -3,7 +3,8 @@ module Statemachine
   class State #:nodoc:
     
     attr_reader :id, :statemachine, :superstate
-    attr_accessor :entry_action, :exit_action, :default_transition
+    attr_accessor :entry_action, :exit_action
+    attr_writer :default_transition
 
     def initialize(id, superstate, state_machine)
       @id = id
@@ -20,10 +21,21 @@ module Statemachine
       return @superstate ? @transitions.merge(@superstate.transitions) : @transitions
     end
     
-    def transition_for(event)
+    def non_default_transition_for(event)
       transition = @transitions[event]
-      transition = @superstate.transition_for(event) if @superstate and not transition      
-      transition = @default_transition if not transition
+      transition = @superstate.non_default_transition_for(event) if @superstate and not transition
+      return transition
+    end
+    
+    def default_transition
+      return @default_transition if @default_transition
+      return @superstate.default_transition if @superstate
+      return nil
+    end
+    
+    def transition_for(event)
+      transition = non_default_transition_for(event)     
+      transition = default_transition if not transition
       return transition 
     end
     

data/lib/statemachine/version.rb

@@ -3,7 +3,7 @@ module Statemachine
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 4
-      TINY   = 0
+      TINY   = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/spec/default_transition_spec.rb

@@ -83,5 +83,23 @@ describe "Default Transition" do
     @sm.state.should eql(:not_default_state)
   end
 
+  it "should use not use superstate's default before using it's own default" do
+    @sm = Statemachine.build do
+      superstate :super do
+        default :super_default
+        state :base do
+          default :base_default
+        end
+      end
+      state :super_default
+      state :base_default
+      startstate :base
+    end
+    
+    @sm.blah
+    @sm.state.should eql(:base_default)
+  end
+
+  
   
 end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: statemachine
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-05-17 00:00:00 -05:00
-summary: Statemachine-0.4.0 - Statemachine Library for Ruby http://statemachine.rubyforge.org/
+  version: 0.4.1
+date: 2007-05-20 00:00:00 -07:00
+summary: Statemachine-0.4.1 - Statemachine Library for Ruby http://statemachine.rubyforge.org/
 require_paths: 
 - lib
 email: statemachine-devel@rubyforge.org