From 2bb30ee84bfd17972872fb567759323639147142 Mon Sep 17 00:00:00 2001
From: Scott Barron <scott@elitists.net>
Date: Sat, 31 May 2008 14:39:25 -0700
Subject: [PATCH] Combine event firing logic for ! (persistent) and non-!
 (non-persistent) event triggers

---
 lib/aasm.rb | 59 +++++++++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/lib/aasm.rb b/lib/aasm.rb
index f6430ed..e1ccb05 100644
--- a/lib/aasm.rb
+++ b/lib/aasm.rb
@@ -39,44 +39,12 @@ module AASM
       end
 
       define_method("#{name.to_s}!") do
-        new_state = self.class.aasm_events[name].fire(self)
-        unless new_state.nil?
-          if self.respond_to?(:aasm_event_fired)
-            self.aasm_event_fired(self.aasm_current_state, new_state)
-          end
-          
-          self.aasm_current_state_with_persistence = new_state
-
-          self.send(self.class.aasm_events[name].success) if self.class.aasm_events[name].success
-
-          true
-        else
-          if self.respond_to?(:aasm_event_failed)
-            self.aasm_event_failed(name)
-          end
-          
-          false
-        end
+        aasm_fire_event(name, true)
       end
 
       define_method("#{name.to_s}") do
-        new_state = self.class.aasm_events[name].fire(self)
-        unless new_state.nil?
-          if self.respond_to?(:aasm_event_fired)
-            self.aasm_event_fired(self.aasm_current_state, new_state)
-          end
-          
-          self.aasm_current_state = new_state
-          true
-        else
-          if self.respond_to?(:aasm_event_failed)
-            self.aasm_event_failed(name)
-          end
-          
-          false
-        end
+        aasm_fire_event(name, false)
       end
-
     end
 
     def aasm_states
@@ -128,4 +96,27 @@ module AASM
     @aasm_current_state = state
   end
 
+  def aasm_fire_event(name, persist)
+    new_state = self.class.aasm_events[name].fire(self)
+    unless new_state.nil?
+      if self.respond_to?(:aasm_event_fired)
+        self.aasm_event_fired(self.aasm_current_state, new_state)
+      end
+
+      if persist
+        self.aasm_current_state_with_persistence = new_state
+        self.send(self.class.aasm_events[name].success) if self.class.aasm_events[name].success
+      else
+        self.aasm_current_state = new_state
+      end
+
+      true
+    else
+      if self.respond_to?(:aasm_event_failed)
+        self.aasm_event_failed(name)
+      end
+      
+      false
+    end
+  end
 end