Merge d62045c into 70176a7

README.md

@@ -313,16 +313,16 @@ Given the `Job` class from above:
 ```ruby
 job = Job.new
 
-job.states
+job.aasm.states
 => [:sleeping, :running, :cleaning]
 
-job.states(:permissible => true)
+job.aasm.states(:permissible => true)
 => [:running]
 job.run
-job.states(:permissible => true)
+job.aasm.states(:permissible => true)
 => [:cleaning, :sleeping]
 
-job.events
+job.aasm.events
 => [:run, :clean, :sleep]
 ```
 

lib/aasm/event.rb

@@ -64,16 +64,16 @@ def update(options = {}, &block)
       self
     end
 
-    # Execute if test? == false, otherwise return true/false depending on whether it would fire
+    # Execute if test == false, otherwise return true/false depending on whether it would fire
     def _fire(obj, test, to_state=nil, *args)
+      result = test ? false : nil
       if @transitions.map(&:from).any?
         transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
-        return nil if transitions.size == 0
+        return result if transitions.size == 0
       else
         transitions = @transitions
       end
 
-      result = test ? false : nil
       transitions.each do |transition|
         next if to_state and !Array(transition.to).include?(to_state)
         if transition.perform(obj, *args)