0
@@ -37,13 +37,29 @@ module ActiveModel
0
       end
0
     end
0
 
0
-    def current_state(name = nil, new_state = nil)
0
+    def current_state(name = nil, new_state = nil, persist = false)
0
       sm   = self.class.state_machine(name)
0
-      ivar = "@#{sm.name}_current_state"
0
+      ivar = sm.current_state_variable
0
       if name && new_state
0
+        if persist && respond_to?(:write_state)
0
+          write_state(sm, new_state)
0
+        end
0
+
0
+        if respond_to?(:write_state_without_persistence)
0
+          write_state_without_persistence(sm, new_state)
0
+        end
0
+
0
         instance_variable_set(ivar, new_state)
0
       else
0
-        instance_variable_get(ivar) || instance_variable_set(ivar, sm.initial_state)
0
+        instance_variable_set(ivar, nil) unless instance_variable_defined?(ivar)
0
+        value = instance_variable_get(ivar)
0
+        return value if value
0
+
0
+        if respond_to?(:read_state)
0
+          value = instance_variable_set(ivar, read_state(sm))
0
+        end
0
+
0
+        value || sm.initial_state
0
       end
0
     end
0
   end

0
@@ -37,10 +37,6 @@ module ActiveModel
0
         @transitions.any? { |t| t.from? state }
0
       end
0
 
0
-      def success?
0
-        !!@success
0
-      end
0
-
0
       def ==(event)
0
         if event.is_a? Symbol
0
           name == event

0
@@ -28,7 +28,9 @@ module ActiveModel
0
             record.send(event_fired_callback, record.current_state, new_state)
0
           end
0
 
0
-          record.current_state(@name, new_state)
0
+          record.current_state(@name, new_state, persist)
0
+          record.send(@events[event].success) if @events[event].success
0
+          true
0
         else
0
           if record.respond_to?(event_failed_callback)
0
             record.send(event_failed_callback, event)
0
@@ -47,6 +49,10 @@ module ActiveModel
0
         events.map! { |event| event.name }
0
       end
0
 
0
+      def current_state_variable
0
+        "@#{@name}_current_state"
0
+      end
0
+
0
     private
0
       def state(name, options = {})
0
         @states << (state_index[name] ||= State.new(name, :machine => self)).update(options)

0
@@ -17,7 +17,7 @@ class EventTest < ActiveModel::TestCase
0
   end
0
 
0
   test 'should set the success option' do
0
-    assert new_event.success?
0
+    assert_equal @success, new_event.success
0
   end
0
 
0
   uses_mocha 'StateTransition creation' do

0
@@ -110,41 +110,38 @@ class StateMachineInitialStatesTest < ActiveModel::TestCase
0
     assert_equal :read, @foo.current_state(:bar)
0
   end
0
 end
0
-# 
0
-#describe AASM, '- event firing with persistence' do
0
-#  it 'should fire the Event' do
0
-#    foo = Foo.new
0
-# 
0
-#    Foo.aasm_events[:close].should_receive(:fire).with(foo)
0
-#    foo.close!
0
-#  end
0
-# 
0
-#  it 'should update the current state' do
0
-#    foo = Foo.new
0
-#    foo.close!
0
-# 
0
-#    foo.aasm_current_state.should == :closed
0
-#  end
0
-# 
0
-#  it 'should call the success callback if one was provided' do
0
-#    foo = Foo.new
0
-# 
0
-#    foo.should_receive(:success_callback)
0
-# 
0
-#    foo.close!
0
-#  end
0
-# 
0
-#  it 'should attempt to persist if aasm_write_state is defined' do
0
-#    foo = Foo.new
0
-#    
0
-#    def foo.aasm_write_state
0
-#    end
0
-# 
0
-#    foo.should_receive(:aasm_write_state)
0
-# 
0
-#    foo.close!
0
-#  end
0
-#end
0
+ 
0
+class StateMachineEventFiringWithPersistenceTest < ActiveModel::TestCase
0
+  def setup
0
+    @subj = StateMachineSubject.new
0
+  end
0
+
0
+  test 'updates the current state' do
0
+    @subj.close!
0
+
0
+    assert_equal :closed, @subj.current_state
0
+  end
0
+
0
+  uses_mocha "StateMachineEventFiringWithPersistenceTest with callbacks" do
0
+    test 'fires the Event' do
0
+      @subj.class.state_machine.events[:close].expects(:fire).with(@subj)
0
+      @subj.close!
0
+    end
0
+
0
+    test 'calls the success callback if one was provided' do
0
+      @subj.expects(:success_callback)
0
+      @subj.close!
0
+    end
0
+
0
+    test 'attempts to persist if write_state is defined' do
0
+      def @subj.write_state
0
+      end
0
+
0
+      @subj.expects(:write_state)
0
+      @subj.close!
0
+    end
0
+  end
0
+end
0
 
0
 class StateMachineEventFiringWithoutPersistence < ActiveModel::TestCase
0
   test 'updates the current state' do
0
@@ -162,30 +159,32 @@ class StateMachineEventFiringWithoutPersistence < ActiveModel::TestCase
0
       subj.close
0
     end
0
 
0
-    test 'should attempt to persist if aasm_write_state is defined' do
0
+    test 'attempts to persist if write_state is defined' do
0
       subj = StateMachineSubject.new
0
 
0
-      def subj.aasm_write_state
0
+      def subj.write_state
0
       end
0
 
0
-      subj.expects(:aasm_write_state_without_persistence)
0
+      subj.expects(:write_state_without_persistence)
0
 
0
       subj.close
0
     end
0
   end
0
 end
0
- 
0
-#describe AASM, '- persistence' do
0
-#  it 'should read the state if it has not been set and aasm_read_state is defined' do
0
-#    foo = Foo.new
0
-#    def foo.aasm_read_state
0
-#    end
0
-# 
0
-#    foo.should_receive(:aasm_read_state)
0
-# 
0
-#    foo.aasm_current_state
0
-#  end
0
-#end
0
+
0
+uses_mocha 'StateMachinePersistenceTest' do
0
+  class StateMachinePersistenceTest < ActiveModel::TestCase
0
+    test 'reads the state if it has not been set and read_state is defined' do
0
+      subj = StateMachineSubject.new
0
+      def subj.read_state
0
+      end
0
+
0
+      subj.expects(:read_state).with(StateMachineSubject.state_machine)
0
+
0
+      subj.current_state
0
+    end
0
+  end
0
+end
0
 
0
 uses_mocha 'StateMachineEventCallbacksTest' do
0
   class StateMachineEventCallbacksTest < ActiveModel::TestCase