ttilley-aasm 2.0.7.1 → 2.1.0

data/README.rdoc

@@ -11,14 +11,32 @@ AASM has the following features:
 * Events
 * Transitions
 
-== Download
+== New Callbacks
 
-The latest AASM can currently be pulled from the git repository on github.
+The callback chain & order on a successful event looks like:
+
+  oldstate:exit*
+  event:before
+  __find transition, if possible__
+  transition:on_transition*
+  oldstate:before_exit
+  newstate:before_enter
+  newstate:enter*
+  __update state__
+  event:success*
+  oldstate:after_exit
+  oldstate:after_enter
+  event:after
+  obj:aasm_event_fired*
+
+  (*) marks old callbacks
 
-* http://github.com/rubyist/aasm/tree/master
 
-A release and a gem are forthcoming.
+== Download
+
+The latest AASM can currently be pulled from the git repository on github.
 
+* http://github.com/ttilley/aasm/tree/master
 
 
 == Installation
@@ -26,12 +44,12 @@ A release and a gem are forthcoming.
 === From GitHub hosted gems
 
   % sudo gem sources -a http://gems.github.com # (you only need to do this once)
-  % sudo gem install rubyist-aasm
+  % sudo gem install ttilley-aasm
 
 === Building your own gems
 
   % rake gem
-  % sudo gem install pkg/aasm-2.0.1.gem
+  % sudo gem install pkg/aasm-2.1.gem
 
 
 == Simple Example
@@ -92,11 +110,9 @@ This example uses a few of the more complex features available.
 = Other Stuff
 
 Author::  Scott Barron <scott at elitists dot net>
-License:: Copyright 2006, 2007, 2008 by Scott Barron.
+License:: Original code Copyright 2006, 2007, 2008 by Scott Barron.
           Released under an MIT-style license.  See the LICENSE  file
           included in the distribution.
-Bugs::    http://rubyist.lighthouseapp.com/projects/13207-aasm/
-GitHub::  http://github.com/rubyist/aasm/tree/master
 
 == Warranty
 

data/Rakefile

@@ -54,9 +54,9 @@ EOF
     s.extra_rdoc_files = rd.rdoc_files.reject {|fn| fn =~ /\.rb$/}.to_a
     s.rdoc_options = rd.options
 
-    s.author = 'Scott Barron'
-    s.email = 'scott@elitists.net'
-    s.homepage = 'http://rubyi.st/aasm'
+    s.authors = ['Scott Barron', 'Scott Petersen']
+    s.email = 'petersen@dunedain289.com'
+    s.homepage = 'http://github.com/dunedain289/aasm'
   end
 
   package_task = Rake::GemPackageTask.new(spec) do |pkg|

data/lib/aasm.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), 'persistence')
 
 module AASM
   def self.Version
-    '2.0.7.1'
+    '2.1.0'
   end
 
   class InvalidTransition < RuntimeError
@@ -137,32 +137,47 @@ module AASM
   end
 
   def aasm_fire_event(name, persist, *args)
-    aasm_state_object_for_state(aasm_current_state).call_action(:exit, self)
+    old_state = aasm_state_object_for_state(aasm_current_state)
+    event = self.class.aasm_events[name]
 
-    old_state = self.aasm_current_state
-    new_state = self.class.aasm_events[name].fire(self, *args)
+    old_state.call_action(:exit, self)
 
-    unless new_state.nil?
-      aasm_state_object_for_state(new_state).call_action(:enter, self)
+    # new event before callback
+    event.call_action(:before, self)
 
+    new_state_name = event.fire(self, *args)
+
+    unless new_state_name.nil?
+      new_state = aasm_state_object_for_state(new_state_name)
+    
+      # new before_ callbacks
+      old_state.call_action(:before_exit, self)
+      new_state.call_action(:before_enter, self)
+      
+      new_state.call_action(:enter, self)
+      
       persist_successful = true
       if persist
-        persist_successful = set_aasm_current_state_with_persistence(new_state)
-        self.class.aasm_events[name].execute_success_callback(self) if persist_successful
+        persist_successful = set_aasm_current_state_with_persistence(new_state_name)
+        event.execute_success_callback(self) if persist_successful
       else
-        self.aasm_current_state = new_state
+        self.aasm_current_state = new_state_name
       end
 
-      if persist_successful
-        self.aasm_event_fired(name, old_state, self.aasm_current_state) if self.respond_to?(:aasm_event_fired)
+      if persist_successful 
+        old_state.call_action(:after_exit, self)
+        new_state.call_action(:after_enter, self)
+        event.call_action(:after, self)
+
+        self.aasm_event_fired(name, old_state.name, self.aasm_current_state) if self.respond_to?(:aasm_event_fired)
       else
-        self.aasm_event_failed(name, old_state) if self.respond_to?(:aasm_event_failed)
+        self.aasm_event_failed(name, old_state.name) if self.respond_to?(:aasm_event_failed)
       end
 
       persist_successful
     else
       if self.respond_to?(:aasm_event_failed)
-        self.aasm_event_failed(name, old_state)
+        self.aasm_event_failed(name, old_state.name)
       end
 
       false

data/lib/event.rb

@@ -3,12 +3,13 @@ require File.join(File.dirname(__FILE__), 'state_transition')
 module AASM
   module SupportingClasses
     class Event
-      attr_reader :name, :success
-
+      attr_reader :name, :success, :options
+      
       def initialize(name, options = {}, &block)
         @name = name
         @success = options[:success]
         @transitions = []
+        @options = options
         instance_eval(&block) if block
       end
 
@@ -32,6 +33,10 @@ module AASM
         @transitions.any? { |t| t.from == state }
       end
 
+      def transitions_from_state(state)
+        @transitions.select { |t| t.from == state }
+      end
+
       def execute_success_callback(obj, success = nil)
         callback = success || @success
         case(callback)
@@ -44,6 +49,22 @@ module AASM
         end
       end
 
+      def call_action(action, record)
+        action = @options[action]
+        case action
+        when Symbol, String
+          record.send(action)
+        when Proc
+          action.call(record)
+        when Array
+          action.each { |a| record.send(a) }
+        end
+      end
+
+      def all_transitions
+        @transitions
+      end
+
       private
       def transitions(trans_opts)
         Array(trans_opts[:from]).each do |s|

data/lib/state.rb

@@ -22,6 +22,8 @@ module AASM
           record.send(action)
         when Proc
           action.call(record)
+        when Array
+          action.each { |a| record.send(a) }
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ttilley-aasm
 version: !ruby/object:Gem::Version 
-  version: 2.0.7.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Scott Barron