eric-aasm 2.0.3 → 2.0.4

data/README.rdoc

@@ -44,13 +44,12 @@ Here's a quick example highlighting some of the features.
     aasm_initial_state :new
 
     aasm_state :new
-    aasm_state :read, :enter => :mark_thread_as_read
+    aasm_state :read
     aasm_state :closed
 
 
     aasm_event :view do
-      transitions :to => :read, :from => [:new], 
-        :on_transition => :send_received_receipt, :guard => :user_authorized
+      transitions :to => :read, :from => [:new]
     end
 
     aasm_event :close do
@@ -58,29 +57,6 @@ Here's a quick example highlighting some of the features.
     end
   end
 
-
-== Explanation of transitions
-
-The current state machine has the following process. If we were to call 
-<tt>Conversation#view!</tt>, we would get:
-
-     state:new
-         |
-         | <-- :exit called on state[new]
-         |
-         | <-- :guard called on state[read]
-         |
-         | <-- :on_transition called on state[read]
-         |
-         | <-- aasm_current_state set to "read"
-         |
-         | <-- :success called on state[read]
-         |
-         | <-- :enter called on state[read]
-         |
-     state:read
-
-
 = Other Stuff
 
 Author::  Scott Barron <scott at elitists dot net>

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,8 +4,15 @@ require File.join(File.dirname(__FILE__), 'state_machine')
 require File.join(File.dirname(__FILE__), 'persistence')
 
 module AASM
+  def self.Version
+    '2.0.4'
+  end
+
   class InvalidTransition < RuntimeError
   end
+
+  class UndefinedState < RuntimeError
+  end
   
   def self.included(base) #:nodoc:
     # TODO - need to ensure that a machine is being created because
@@ -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,30 +120,34 @@ 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)
-    aasm_state_object_for_state(aasm_current_state).call_action(:exit, self)
+    aasm_state_object_for_state(aasm_current_state).call_action(:exit, self, *args)
 
-    new_state = self.class.aasm_events[name].fire(self, *args)
+    new_state = self.class.aasm_events[name].fire(self, nil, *args)
     
     unless new_state.nil?
+      aasm_state_object_for_state(new_state).call_action(:enter, self, *args)
+      
+      persist_successful = true
       if persist
-        self.aasm_current_state_with_persistence = new_state
+        persist_successful = set_aasm_current_state_with_persistence(new_state)
+        self.class.aasm_events[name].execute_success_callback(self, *args) if persist_successful
       else
         self.aasm_current_state = new_state
       end
-      
-      self.send(self.class.aasm_events[name].success) if self.class.aasm_events[name].success
-      
-      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)
+
+      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
 
-      true
+      persist_successful
     else
       if self.respond_to?(:aasm_event_failed)
         self.aasm_event_failed(name)

data/lib/event.rb

@@ -19,7 +19,7 @@ module AASM
         next_state = nil
         transitions.each do |transition|
           next if to_state and !Array(transition.to).include?(to_state)
-          if transition.perform(obj)
+          if transition.perform(obj, *args)
             next_state = to_state || Array(transition.to).first
             transition.execute(obj, *args)
             break
@@ -32,6 +32,17 @@ module AASM
         @transitions.any? { |t| t.from == state }
       end
       
+      def execute_success_callback(obj, *args)
+        case success
+        when String, Symbol:
+          obj.send(success, *args)
+        when Array:
+          success.each { |meth| obj.send(meth, *args) }
+        when Proc:
+          success.call(obj, *args)
+        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.rb

@@ -15,13 +15,13 @@ module AASM
         end
       end
 
-      def call_action(action, record)
+      def call_action(action, record, *args)
         action = @options[action]
         case action
         when Symbol, String
-          record.send(action)
+          record.send(action, *args)
         when Proc
-          action.call(record)
+          action.call(record, *args)
         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/state_transition.rb

@@ -8,12 +8,12 @@ module AASM
         @opts = opts
       end
 
-      def perform(obj)
+      def perform(obj, *args)
         case @guard
         when Symbol, String
-          obj.send(@guard)
+          obj.send(@guard, *args)
         when Proc
-          @guard.call(obj)
+          @guard.call(obj, *args)
         else
           true
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eric-aasm
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Scott Barron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +37,6 @@ files:
 - lib/state.rb
 - lib/state_machine.rb
 - lib/state_transition.rb
-- lib/version.rb
 - doc/jamis.rb
 has_rdoc: true
 homepage: http://github.com/rubyist/aasm

data/lib/version.rb

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