aasm 3.0.9 → 3.0.10

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.10
+
+ * added support for transitions from all other states (thanks to Stefan 'swrobel' Wrobel)
+
 ## 3.0.9
 
  * guard checks (e.g. may_edit?) now support guard parameters as well

data/README.md

@@ -1,4 +1,4 @@
-# AASM - Ruby state machines [![Build Status](https://secure.travis-ci.org/aasm/aasm.png)](http://travis-ci.org/aasm/aasm)
+# AASM - Ruby state machines [![Build Status](https://secure.travis-ci.org/aasm/aasm.png)](http://travis-ci.org/aasm/aasm) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/aasm/aasm)
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 
@@ -101,8 +101,9 @@ This example uses a few of the more complex features available.
         transitions :to => :intimate, :from => [:dating], :guard => :drunk?
       end
 
+      # Will allow transitioning from any state if guard allows it
       event :get_married do
-        transitions :to => :married, :from => [:dating, :intimate], :guard => :willing_to_give_up_manhood?
+        transitions :to => :married, :guard => :willing_to_give_up_manhood?
       end
     end
     aasm_initial_state Proc.new { |relationship| relationship.strictly_for_fun? ? :intimate : :dating }

data/lib/aasm/supporting_classes/event.rb

@@ -13,34 +13,11 @@ module AASM
       # executes the transition guards to determine if a transition is even
       # an option given current conditions.
       def may_fire?(obj, to_state=nil, *args)
-        transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
-        return false if transitions.size == 0
-
-        result = false
-        transitions.each do |transition|
-          next if to_state and !Array(transition.to).include?(to_state)
-          if transition.perform(obj, *args)
-            result = true
-            break
-          end
-        end
-        result
+        _fire(obj, true, to_state, *args) # true indicates test firing
       end
   
       def fire(obj, to_state=nil, *args)
-        transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
-        return nil if transitions.size == 0
-
-        next_state = nil
-        transitions.each do |transition|
-          next if to_state and !Array(transition.to).include?(to_state)
-          if transition.perform(obj, *args)
-            next_state = to_state || Array(transition.to).first
-            transition.execute(obj, *args)
-            break
-          end
-        end
-        next_state
+        _fire(obj, false, to_state, *args) # false indicates this is not a test (fire!)
       end
 
       def transitions_from_state?(state)
@@ -112,6 +89,32 @@ module AASM
         self
       end
 
+      # Execute if test? == false, otherwise return true/false depending on whether it would fire
+      def _fire(obj, test, to_state=nil, *args)
+        if @transitions.map(&:from).any?
+          transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
+          return nil 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)
+            if test
+              result = true
+            else
+              result = to_state || Array(transition.to).first
+              transition.execute(obj, *args)
+            end
+
+            break
+          end
+        end
+        result
+      end
+
       def _fire_callbacks(action, record)
         case action
           when Symbol, String
@@ -122,9 +125,12 @@ module AASM
       end
 
       def transitions(trans_opts)
+        # Create a separate transition for each from state to the given state
         Array(trans_opts[:from]).each do |s|
           @transitions << AASM::SupportingClasses::StateTransition.new(trans_opts.merge({:from => s.to_sym}))
         end
+        # Create a transition if to is specified without from (transitions from ANY state)
+        @transitions << AASM::SupportingClasses::StateTransition.new(trans_opts) if @transitions.empty? && trans_opts[:to]
       end
 
     end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

data/spec/models/silencer.rb

@@ -9,9 +9,14 @@ class Silencer
     event :cry do
       transitions :from => :silent, :to => :crying
     end
+
     event :smile do
       transitions :from => :crying, :to => :smiling
     end
+
+    event :smile_any do
+      transitions :to => :smiling
+    end
   end
 
 end

data/spec/unit/state_transition_spec.rb

@@ -19,6 +19,12 @@ describe 'transitions' do
     sub.smile!.should be_false
     sub.should be_silent
   end
+
+  it 'should not raise an exception when from is nil even if whiny' do
+    silencer = Silencer.new
+    silencer.smile_any!.should be_true
+    silencer.should be_smiling
+  end
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70261337622160 !ruby/object:Gem::Requirement
+  requirement: &70142949460520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337622160
+  version_requirements: *70142949460520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70261337621740 !ruby/object:Gem::Requirement
+  requirement: &70142949460100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337621740
+  version_requirements: *70142949460100
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70261337621320 !ruby/object:Gem::Requirement
+  requirement: &70142949459680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337621320
+  version_requirements: *70142949459680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70261337620820 !ruby/object:Gem::Requirement
+  requirement: &70142949459180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70261337620820
+  version_requirements: *70142949459180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70261337620400 !ruby/object:Gem::Requirement
+  requirement: &70142949458760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337620400
+  version_requirements: *70142949458760
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70261337651400 !ruby/object:Gem::Requirement
+  requirement: &70142949489760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337651400
+  version_requirements: *70142949489760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70261337650980 !ruby/object:Gem::Requirement
+  requirement: &70142949489340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337650980
+  version_requirements: *70142949489340
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70261337650560 !ruby/object:Gem::Requirement
+  requirement: &70142949488920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337650560
+  version_requirements: *70142949488920
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70261337650140 !ruby/object:Gem::Requirement
+  requirement: &70142949488500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261337650140
+  version_requirements: *70142949488500
 description: AASM is a continuation of the acts as state machine rails plugin, built
   for plain Ruby objects.
 email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de