rename aasm_persist to aasm_write_state

add aasm_read_state to complete persistence

lib/aasm.rb

@@ -43,15 +43,20 @@ module AASM
 
   # Instance methods
   def aasm_current_state
-    # Persistance?  This won't work for activerecord objects
+    return @aasm_current_state if @aasm_current_state
-    @aasm_current_state || self.class.aasm_initial_state
+
+    if self.respond_to?(:aasm_read_state) || self.private_methods.include?('aasm_read_state')
+      @aasm_current_state = aasm_read_state
+    end
+    return @aasm_read_state if @aasm_current_state
+    self.class.aasm_initial_state
   end
 
   private
   def aasm_current_state=(state)
     @aasm_current_state = state
-    if self.respond_to?(:aasm_persist) || self.private_methods.include?('aasm_persist')
+    if self.respond_to?(:aasm_write_state) || self.private_methods.include?('aasm_write_state')
-      aasm_persist
+      aasm_write_state
     end
   end
 end

spec/aasm_spec.rb

@@ -85,14 +85,26 @@ describe AASM, '- event firing' do
     foo.aasm_current_state.should == :closed
   end
 
-  it 'should attempt to persist if aasm_persist is defined' do
+  it 'should attempt to persist if aasm_write_state is defined' do
     foo = Foo.new
     
-    def foo.aasm_persist
+    def foo.aasm_write_state
     end
 
-    foo.should_receive(:aasm_persist)
+    foo.should_receive(:aasm_write_state)
 
     foo.close!
   end
 end
+
+describe AASM, '- persistence' do
+  it 'should read the state if it has not been set and aasm_read_state is defined' do
+    foo = Foo.new
+    def foo.aasm_read_state
+    end
+
+    foo.should_receive(:aasm_read_state)
+
+    foo.aasm_current_state
+  end
+end