@@ -9,6 +9,3 @@ * Real transition actions * Default states - -* Entry/exit actions and guards can be a symbol representing a method name - instead of a proc. \ No newline at end of file TODO @@ -18,7 +18,7 @@ module RailsStudio #:nodoc: end def guard(obj) - @guard ? @guard.call(obj) : true + @guard ? obj.send(:run_transition_action, @guard) : true end def ==(obj) @@ -79,6 +79,15 @@ module RailsStudio #:nodoc: s.from == current_state end end + + def run_transition_action(action) + if action.kind_of?(Symbol) + self.method(action).call + else + action.call(self) + end + end + private :run_transition_action end module ClassMethods @@ -120,9 +129,11 @@ module RailsStudio #:nodoc: exitact = self.class.read_inheritable_attribute(:states)[current_state][:exit] enteract = self.class.read_inheritable_attribute(:states)[ns.to][:enter] - enteract.call(self) if enteract && !loopback + run_transition_action(enteract) if enteract && !loopback + self.update_attribute(self.class.state_column, ns.to.to_s) - exitact.call(self) if exitact && !loopback + + run_transition_action(exitact) if exitact && !loopback break end end lib/acts_as_state_machine.rb @@ -117,6 +117,11 @@ class ActsAsStateMachineTest < Test::Unit::TestCase assert !c.read_exit end + def test_run_transition_action_is_private + c = Conversation.create + assert_raise(NoMethodError) { c.run_transition_action :foo } + end + def test_find_all_in_state cs = Conversation.find_in_state(:all, :read) test/acts_as_state_machine_test.rb @@ -5,7 +5,7 @@ class Conversation < ActiveRecord::Base acts_as_state_machine :initial => :needs_attention, :column => 'state_machine' state :needs_attention - state :read, :enter => Proc.new { |o| o.read_enter = true }, + state :read, :enter => :read_enter_action, :exit => Proc.new { |o| o.read_exit = true } state :closed state :awaiting_response @@ -22,10 +22,10 @@ class Conversation < ActiveRecord::Base event :reply do transitions :to => :awaiting_response, :from => [:read, :closed] end - + event :close do transitions :to => :closed, :from => [:read, :awaiting_response], :guard => Proc.new {|o| o.can_close?} - transitions :to => :read, :from => [:read, :awaiting_response] + transitions :to => :read, :from => [:read, :awaiting_response], :guard => :always_true end event :junk do @@ -39,4 +39,12 @@ class Conversation < ActiveRecord::Base def can_close? @can_close end + + def read_enter_action + self.read_enter = true + end + + def always_true + true + end end test/fixtures/conversation.rb 60c625fb97d0c2c0693d7e12b903bfe4c3148695 sbarron sbarron@a9f67fa3-8408-0410-ad84-b6cefbfd10ac http://github.com/sudothinker/acts_as_state_machine/commit/ff00b78fd51eecc781ef5ebee78d883371e42294 ff00b78fd51eecc781ef5ebee78d883371e42294 2006-01-20T12:25:05-08:00 2006-01-20T12:25:05-08:00 git-svn-id: http://elitists.textdriven.com/svn/plugins/acts_as_state_machine/trunk@45 a9f67fa3-8408-0410-ad84-b6cefbfd10ac ead94eb2f433bcd0a83606fed229f0315f25f89b sbarron sbarron@a9f67fa3-8408-0410-ad84-b6cefbfd10ac