aasm 3.0.11 → 3.0.12

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.12
+
+ * aasm_from_states_for_state now supports to filter for specific transition
+
 ## 3.0.11
 
  * added class method aasm_from_states_for_state to retrieve all from states (regarding transitions) for a given state

data/lib/aasm/aasm.rb

@@ -31,8 +31,12 @@ module AASM
       end
     end
 
-    def aasm_from_states_for_state(state)
-      aasm.events.map {|k,v| v.transitions_to_state(state)}.flatten.map(&:from).flatten
+    def aasm_from_states_for_state(state, options={})
+      if options[:transition]
+        aasm.events[options[:transition]].transitions_to_state(state).flatten.map(&:from).flatten
+      else
+        aasm.events.map {|k,v| v.transitions_to_state(state)}.flatten.map(&:from).flatten
+      end
     end
 
     # deprecated

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.11"
+  VERSION = "3.0.12"
 end

data/spec/spec_helpers/models_spec_helper.rb

@@ -109,7 +109,7 @@ class AuthMachine
     event :unpassify do
       transitions :from => :passive, :to => :active, :guard => Proc.new {|u| false }
     end
-  
+
     event :unsuspend do
       transitions :from => :suspended, :to => :active,  :guard => Proc.new {|u| u.has_activated? }
       transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| u.has_activation_code? }

data/spec/unit/aasm_spec.rb

@@ -49,7 +49,12 @@ end
 describe "aasm_from_states_for_state" do
   it "should return all from states for a state" do
     froms = AuthMachine.aasm_from_states_for_state(:active)
-    [:pending, :passive, :suspended].each {|from| froms.should include(:pending)}
+    [:pending, :passive, :suspended].each {|from| froms.should include(from)}
+  end
+
+  it "should return from states for a state for a particular transition only" do
+    froms = AuthMachine.aasm_from_states_for_state(:active, :transition => :unsuspend)
+    [:suspended].each {|from| froms.should include(from)}
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70177242128740 !ruby/object:Gem::Requirement
+  requirement: &70194149278160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242128740
+  version_requirements: *70194149278160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70177242128320 !ruby/object:Gem::Requirement
+  requirement: &70194149277740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242128320
+  version_requirements: *70194149277740
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70177242127900 !ruby/object:Gem::Requirement
+  requirement: &70194149277320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242127900
+  version_requirements: *70194149277320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70177242127400 !ruby/object:Gem::Requirement
+  requirement: &70194149276820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70177242127400
+  version_requirements: *70194149276820
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70177242126980 !ruby/object:Gem::Requirement
+  requirement: &70194149276400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242126980
+  version_requirements: *70194149276400
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70177242126520 !ruby/object:Gem::Requirement
+  requirement: &70194149275940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242126520
+  version_requirements: *70194149275940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70177242126100 !ruby/object:Gem::Requirement
+  requirement: &70194149275520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242126100
+  version_requirements: *70194149275520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70177242125680 !ruby/object:Gem::Requirement
+  requirement: &70194149275100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242125680
+  version_requirements: *70194149275100
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70177242156720 !ruby/object:Gem::Requirement
+  requirement: &70194149306160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177242156720
+  version_requirements: *70194149306160
 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