aasm 2.0.2 → 2.0.4

data/Rakefile

@@ -14,7 +14,7 @@ rescue Exception
   nil
 end
 
-if `ruby -Ilib -rversion -e "print AASM::VERSION::STRING"` =~ /([0-9.]+)$/
+if `ruby -Ilib -raasm -e "print AASM.Version"` =~ /([0-9.]+)$/
   CURRENT_VERSION = $1
 else
   CURRENT_VERSION = '0.0.0'
@@ -71,7 +71,7 @@ else
   Spec::Rake::SpecTask.new('cruise') do |t|
     t.spec_files = FileList['spec/**/*.rb']
     t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--exclude', 'Library']
+    t.rcov_opts = ['--exclude', 'spec', '--exclude', 'Library', '--exclude', 'rcov.rb']
   end
 
   desc "Run all examples"

data/lib/aasm.rb

@@ -4,7 +4,14 @@ require File.join(File.dirname(__FILE__), 'state_machine')
 require File.join(File.dirname(__FILE__), 'persistence')
 
 module AASM
-  class InvalidTransition < Exception
+  def self.Version
+    '2.0.4'
+  end
+
+  class InvalidTransition < RuntimeError
+  end
+
+  class UndefinedState < RuntimeError
   end
   
   def self.included(base) #:nodoc:
@@ -14,15 +21,14 @@ module AASM
     base.extend AASM::ClassMethods
     AASM::Persistence.set_persistence(base)
     AASM::StateMachine[base] = AASM::StateMachine.new('')
-
-    base.class_eval do
-      def base.inherited(klass)
-        AASM::StateMachine[klass] = AASM::StateMachine[self].dup
-      end
-    end
   end
 
   module ClassMethods
+    def inherited(klass)
+      AASM::StateMachine[klass] = AASM::StateMachine[self].clone
+      super
+    end
+
     def aasm_initial_state(set_state=nil)
       if set_state
         AASM::StateMachine[self].initial_state = set_state
@@ -96,11 +102,14 @@ module AASM
   end
 
   private
-  def aasm_current_state_with_persistence=(state)
+  def set_aasm_current_state_with_persistence(state)
+    save_success = true
     if self.respond_to?(:aasm_write_state) || self.private_methods.include?('aasm_write_state')
-      aasm_write_state(state)
+      save_success = aasm_write_state(state)
     end
-    self.aasm_current_state = state
+    self.aasm_current_state = state if save_success
+
+    save_success
   end
 
   def aasm_current_state=(state)
@@ -111,7 +120,9 @@ module AASM
   end
 
   def aasm_state_object_for_state(name)
-    self.class.aasm_states.find {|s| s == name}
+    obj = self.class.aasm_states.find {|s| s == name}
+    raise AASM::UndefinedState, "State :#{name} doesn't exist" if obj.nil?
+    obj
   end
 
   def aasm_fire_event(name, persist, *args)
@@ -122,18 +133,21 @@ module AASM
     unless new_state.nil?
       aasm_state_object_for_state(new_state).call_action(:enter, self)
       
-      if self.respond_to?(:aasm_event_fired)
-        self.aasm_event_fired(self.aasm_current_state, new_state)
-      end
-
+      persist_successful = true
       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
+        persist_successful = set_aasm_current_state_with_persistence(new_state)
+        self.class.aasm_events[name].execute_success_callback(self) if persist_successful
       else
         self.aasm_current_state = new_state
       end
 
-      true
+      if persist_successful 
+        self.aasm_event_fired(self.aasm_current_state, new_state) if self.respond_to?(:aasm_event_fired)
+      else
+        self.aasm_event_failed(name) if self.respond_to?(:aasm_event_failed)
+      end
+
+      persist_successful
     else
       if self.respond_to?(:aasm_event_failed)
         self.aasm_event_failed(name)

data/lib/event.rb

@@ -32,6 +32,17 @@ module AASM
         @transitions.any? { |t| t.from == state }
       end
       
+      def execute_success_callback(obj)
+        case success
+        when String, Symbol:
+          obj.send(success)
+        when Array:
+          success.each { |meth| obj.send(meth) }
+        when Proc:
+          success.call(obj)
+        end
+      end
+
       private
       def transitions(trans_opts)
         Array(trans_opts[:from]).each do |s|

data/lib/persistence/active_record_persistence.rb

@@ -188,7 +188,15 @@ module AASM
         #
         # NOTE: intended to be called from an event
         def aasm_write_state(state)
-          update_attribute(self.class.aasm_column, state.to_s)
+          old_value = read_attribute(self.class.aasm_column)
+          write_attribute(self.class.aasm_column, state.to_s)
+          
+          unless self.save
+            write_attribute(self.class.aasm_column, old_value)
+            return false
+          end
+          
+          true
         end
       end
 

data/lib/state_machine.rb

@@ -22,6 +22,12 @@ module AASM
       @config = OpenStruct.new
     end
 
+    def clone
+      klone = super
+      klone.states = states.clone
+      klone
+    end
+
     def create_state(name, options)
       @states << AASM::SupportingClasses::State.new(name, options) unless @states.include?(name)
     end

data/lib/version.rb

@@ -1,5 +0,0 @@
-module AASM
-  module VERSION
-    STRING = '2.0.2'
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aasm
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors: 
 - Scott Barron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 03:00:00 -04:00
+date: 2008-12-22 03:00:00 -05:00
 default_executable: 
 dependencies: []