aasm 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402286c5cd8a9288380d837b7faeb96429a5d5e0
-  data.tar.gz: 45868b7761fa2ed0ffc42d7ab0c7ef637e52a668
+  metadata.gz: 5029171b777f00050a1716352f38a6d8336f51b3
+  data.tar.gz: d6b83b034f6c930f136307697c9c54d8d20a3fcf
 SHA512:
-  metadata.gz: e5d7c42efeb5438ba6693008b2f92c9cffdcdced9982f550091e2c12b8f756d233a0d6ddb9f6517c9754bf8204c8e7ecdd96da4e9a6209b7bc3df1fd1e35c109
-  data.tar.gz: dd23c1b785e7e917334ce577cd56412c1e1f6a6a30105edf827ab89296c9e1e77394a3762aeff67996401a8fbc887240a7a21ecd86ab178157fefd792accb670
+  metadata.gz: 47341842399bd8f3e6428602c7d13aed2c19c54f41ae63ecc491809dd8c1617b1374b1df300ebbed1598e2d8f1751540b1e1d93f7683eed24e8ab315877699b5
+  data.tar.gz: 768b6d0acb5ede97db9f890b804d5402585477886653a989f7ddb2ca304f4291af15668560c073252654dd52bb424eea193891a3e351abd0e3f8a846b8d27367

data/CHANGELOG.md

@@ -4,7 +4,11 @@
 
  * deprecated old aasm_* class methods (old-style DSL), in preparation for AASM v4.0.0
 
-## 3.3.0 (not yet released)
+## 3.3.1
+
+ * bugfix: permissible events will respect given `guards` (see [issue #150](https://github.com/aasm/aasm/issues/150))
+
+## 3.3.0
 
  * support for Rails 4.1 enum fields (see [issue #124](https://github.com/aasm/aasm/issues/124), thanks to [@bkon](https://github.com/bkon))
  * bugfix: allow lazy-evaluation for Rails 3 scopes (see [issue #144](https://github.com/aasm/aasm/issues/144), thanks to [@laurens](https://github.com/laurens))

data/README.md

@@ -288,7 +288,7 @@ in Rails 4.1+ for your state column:
 class Job < ActiveRecord::Base
   include AASM
 
-  enum state {
+  enum state: {
     sleeping: 5,
     running: 99
   }

data/lib/aasm/instance_base.rb

@@ -35,7 +35,7 @@ module AASM
     def states(options={})
       if options[:permissible]
         # ugliness level 1000
-        transitions = @instance.class.aasm.events.values.map {|e| e.transitions_from_state(current_state) }
+        transitions = @instance.class.aasm.events.values_at(*permissible_events).compact.map {|e| e.transitions_from_state(current_state) }
         tos = transitions.map {|t| t[0] ? t[0].to : nil}.flatten.compact.map(&:to_sym).uniq
         @instance.class.aasm.states.select {|s| tos.include?(s.name.to_sym)}
       else

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/spec/models/foo.rb

@@ -3,13 +3,14 @@ class Foo
   aasm do
     state :open, :initial => true, :exit => :exit
     state :closed, :enter => :enter
+    state :final
 
     event :close, :success => :success_callback do
       transitions :from => [:open], :to => [:closed]
     end
 
     event :null do
-      transitions :from => [:open], :to => :closed, :guard => :always_false
+      transitions :from => [:open], :to => [:closed, :final], :guard => :always_false
     end
   end
 

data/spec/unit/inspection_spec.rb

@@ -22,10 +22,12 @@ describe 'inspection for common cases' do
       states = foo.aasm.states
       expect(states).to include(:open)
       expect(states).to include(:closed)
+      expect(states).to include(:final)
 
       states = foo.aasm.states(:permissible => true)
       expect(states).to include(:closed)
       expect(states).not_to include(:open)
+      expect(states).not_to include(:final)
 
       foo.close
       expect(foo.aasm.states(:permissible => true)).to be_empty
@@ -77,7 +79,7 @@ end
 describe 'aasm.states_for_select' do
   it "should return a select friendly array of states" do
     expect(Foo.aasm).to respond_to(:states_for_select)
-    expect(Foo.aasm.states_for_select).to eq([['Open', 'open'], ['Closed', 'closed']])
+    expect(Foo.aasm.states_for_select).to eq([['Open', 'open'], ['Closed', 'closed'], ['Final', 'final']])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Scott Barron
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake