aasm 3.0.24 → 3.0.25

data/lib/aasm/persistence/base.rb

@@ -35,7 +35,7 @@ module AASM
       def aasm_read_state
         state = send(self.class.aasm_column)
         if new_record?
-          state.blank? ? aasm.determine_state_name(self.class.aasm_initial_state) : state.to_sym
+          state.blank? ? aasm.determine_state_name(self.class.aasm.initial_state) : state.to_sym
         else
           state.nil? ? nil : state.to_sym
         end

data/lib/aasm/persistence/mongoid_persistence.rb

@@ -36,6 +36,8 @@ module AASM
         # Mongoid's Validatable gem dependency goes not have a before_validation_on_xxx hook yet.
         # base.before_validation_on_create :aasm_ensure_initial_state
         base.before_validation :aasm_ensure_initial_state
+        # ensure initial aasm state even when validations are skipped
+        base.before_create :aasm_ensure_initial_state
       end
 
       module ClassMethods
@@ -66,10 +68,10 @@ module AASM
         # using update_attribute (which bypasses validation)
         #
         #   foo = Foo.find(1)
-        #   foo.aasm_current_state # => :opened
+        #   foo.aasm.current_state # => :opened
         #   foo.close!
-        #   foo.aasm_current_state # => :closed
-        #   Foo.find(1).aasm_current_state # => :closed
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
         #
         # NOTE: intended to be called from an event
         def aasm_write_state(state)
@@ -87,13 +89,13 @@ module AASM
         # Writes <tt>state</tt> to the state column, but does not persist it to the database
         #
         #   foo = Foo.find(1)
-        #   foo.aasm_current_state # => :opened
+        #   foo.aasm.current_state # => :opened
         #   foo.close
-        #   foo.aasm_current_state # => :closed
-        #   Foo.find(1).aasm_current_state # => :opened
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :opened
         #   foo.save
-        #   foo.aasm_current_state # => :closed
-        #   Foo.find(1).aasm_current_state # => :closed
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
         #
         # NOTE: intended to be called from an event
         def aasm_write_state_without_persistence(state)

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.24"
+  VERSION = "3.0.25"
 end

data/spec/models/mongoid/no_scope_mongoid.rb

@@ -2,7 +2,7 @@ class NoScopeMongoid
   include Mongoid::Document
   include AASM
 
-  field :status, type: String
+  field :status, :type => String
 
   aasm :create_scopes => false, :column => :status do
     state :ignored_scope

data/spec/models/mongoid/simple_mongoid.rb

@@ -2,9 +2,10 @@ class SimpleMongoid
   include Mongoid::Document
   include AASM
 
-  field :status, type: String
+  field :status, :type => String
 
-  aasm_column :status
-  aasm_state :unknown_scope
-  aasm_state :new
+  aasm column: :status do
+    state :unknown_scope
+    state :new
+  end
 end

data/spec/models/mongoid/simple_new_dsl_mongoid.rb

@@ -2,7 +2,7 @@ class SimpleNewDslMongoid
   include Mongoid::Document
   include AASM
 
-  field :status, type: String
+  field :status, :type => String
 
   aasm :column => :status
   aasm do

data/spec/models/not_auto_loaded/process.rb

@@ -2,16 +2,18 @@ module Models
   class Process
     include AASM
 
-    aasm_state :sleeping
-    aasm_state :running
-    aasm_state :suspended
+    aasm do
+      state :sleeping
+      state :running
+      state :suspended
 
-    aasm_event :start do
-      transitions :from => :sleeping, :to => :running
-    end
+      event :start do
+        transitions :from => :sleeping, :to => :running
+      end
 
-    aasm_event :stop do
-      transitions :from => :running, :to => :suspended
+      event :stop do
+        transitions :from => :running, :to => :suspended
+      end
     end
 
   end

data/spec/models/persistence.rb

@@ -36,13 +36,6 @@ class Transient < ActiveRecord::Base
   include AASM
 end
 
-class Simple < ActiveRecord::Base
-  include AASM
-  aasm_column :status
-  aasm_state :unknown_scope
-  aasm_state :new
-end
-
 class SimpleNewDsl < ActiveRecord::Base
   include AASM
   aasm :column => :status
@@ -59,9 +52,6 @@ class NoScope < ActiveRecord::Base
   end
 end
 
-class Derivate < Simple
-end
-
 class DerivateNewDsl < SimpleNewDsl
 end
 
@@ -72,8 +62,10 @@ class Thief < ActiveRecord::Base
     set_table_name "thieves"
   end
   include AASM
-  aasm_initial_state  Proc.new { |thief| thief.skilled ? :rich : :jailed }
-  aasm_state          :rich
-  aasm_state          :jailed
+  aasm do
+    state :rich
+    state :jailed
+    initial_state Proc.new {|thief| thief.skilled ? :rich : :jailed }
+  end
   attr_accessor :skilled, :aasm_state
 end

data/spec/unit/callbacks_spec.rb

@@ -1,23 +1,5 @@
 require 'spec_helper'
 
-describe 'callbacks for the old DSL' do
-  let(:callback) {CallbackOldDsl.new}
-
-  it "should get close callbacks" do
-    callback.should_receive(:exit_open).once.ordered
-    callback.should_receive(:before).once.ordered
-    callback.should_receive(:before_exit_open).once.ordered                   # these should be before the state changes
-    callback.should_receive(:before_enter_closed).once.ordered
-    callback.should_receive(:enter_closed).once.ordered
-    callback.should_receive(:aasm_write_state).once.ordered.and_return(true)  # this is when the state changes
-    callback.should_receive(:after_exit_open).once.ordered                    # these should be after the state changes
-    callback.should_receive(:after_enter_closed).once.ordered
-    callback.should_receive(:after).once.ordered
-
-    callback.close!
-  end
-end
-
 describe 'callbacks for the new DSL' do
   let(:callback) {CallbackNewDsl.new}
 
@@ -40,8 +22,10 @@ describe 'event callbacks' do
   describe "with an error callback defined" do
     before do
       class Foo
-        aasm_event :safe_close, :success => :success_callback, :error => :error_callback do
-          transitions :to => :closed, :from => [:open]
+        aasm do
+          event :safe_close, :success => :success_callback, :error => :error_callback do
+            transitions :to => :closed, :from => [:open]
+          end
         end
       end
 

data/spec/unit/complex_example_spec.rb

@@ -4,7 +4,7 @@ describe 'on initialization' do
   let(:auth) {AuthMachine.new}
 
   it 'should be in the pending state' do
-    auth.aasm_current_state.should == :pending
+    auth.aasm.current_state.should == :pending
   end
 
   it 'should have an activation code' do
@@ -55,14 +55,14 @@ describe 'when being unsuspended' do
     auth.suspend!
     auth.unsuspend!
 
-    auth.aasm_current_state.should == :active
+    auth.aasm.current_state.should == :active
   end
 
   it 'should be pending if not previously activated, but an activation code is present' do
     auth.suspend!
     auth.unsuspend!
 
-    auth.aasm_current_state.should == :pending
+    auth.aasm.current_state.should == :pending
   end
 
   it 'should be passive if not previously activated and there is no activation code' do
@@ -70,6 +70,6 @@ describe 'when being unsuspended' do
     auth.suspend!
     auth.unsuspend!
 
-    auth.aasm_current_state.should == :passive
+    auth.aasm.current_state.should == :passive
   end
 end

data/spec/unit/event_spec.rb

@@ -26,7 +26,7 @@ describe 'adding an event' do
   end
 
   it 'should create transitions' do
-    transitions = event.all_transitions
+    transitions = event.transitions
     transitions[0].from.should == :open
     transitions[0].to.should == :closed
     transitions[1].from.should == :received
@@ -60,8 +60,7 @@ end
 
 describe 'firing an event' do
   it 'should return nil if the transitions are empty' do
-    obj = double('object')
-    obj.stub(:aasm_current_state)
+    obj = double('object', :aasm => double('aasm', :current_state => 'open'))
 
     event = AASM::Event.new(:event)
     event.fire(obj).should be_nil
@@ -72,8 +71,7 @@ describe 'firing an event' do
       transitions :to => :closed, :from => [:open, :received]
     end
 
-    obj = double('object')
-    obj.stub(:aasm_current_state).and_return(:open)
+    obj = double('object', :aasm => double('aasm', :current_state => :open))
 
     event.fire(obj).should == :closed
   end
@@ -83,8 +81,7 @@ describe 'firing an event' do
       transitions :to => :closed, :from => [:open, :received], :guard => :guard_fn
     end
 
-    obj = double('object')
-    obj.stub(:aasm_current_state).and_return(:open)
+    obj = double('object', :aasm => double('aasm', :current_state => :open))
     obj.should_receive(:guard_fn).with('arg1', 'arg2').and_return(true)
 
     event.fire(obj, nil, 'arg1', 'arg2').should == :closed
@@ -96,8 +93,10 @@ describe 'should fire callbacks' do
   describe 'success' do
     it "if it's a symbol" do
       ThisNameBetterNotBeInUse.instance_eval {
-        aasm_event :with_symbol, :success => :symbol_success_callback do
-          transitions :to => :symbol, :from => [:initial]
+        aasm do
+          event :with_symbol, :success => :symbol_success_callback do
+            transitions :to => :symbol, :from => [:initial]
+          end
         end
       }
 
@@ -108,8 +107,10 @@ describe 'should fire callbacks' do
 
     it "if it's a string" do
       ThisNameBetterNotBeInUse.instance_eval {
-        aasm_event :with_string, :success => 'string_success_callback' do
-          transitions :to => :string, :from => [:initial]
+        aasm do
+          event :with_string, :success => 'string_success_callback' do
+            transitions :to => :string, :from => [:initial]
+          end
         end
       }
 
@@ -120,8 +121,10 @@ describe 'should fire callbacks' do
 
     it "if passed an array of strings and/or symbols" do
       ThisNameBetterNotBeInUse.instance_eval {
-        aasm_event :with_array, :success => [:success_callback1, 'success_callback2'] do
-          transitions :to => :array, :from => [:initial]
+        aasm do
+          event :with_array, :success => [:success_callback1, 'success_callback2'] do
+            transitions :to => :array, :from => [:initial]
+          end
         end
       }
 
@@ -133,8 +136,10 @@ describe 'should fire callbacks' do
 
     it "if passed an array of strings and/or symbols and/or procs" do
       ThisNameBetterNotBeInUse.instance_eval {
-        aasm_event :with_array_including_procs, :success => [:success_callback1, 'success_callback2', lambda { proc_success_callback }] do
-          transitions :to => :array, :from => [:initial]
+        aasm do
+          event :with_array_including_procs, :success => [:success_callback1, 'success_callback2', lambda { proc_success_callback }] do
+            transitions :to => :array, :from => [:initial]
+          end
         end
       }
 
@@ -147,8 +152,10 @@ describe 'should fire callbacks' do
 
     it "if it's a proc" do
       ThisNameBetterNotBeInUse.instance_eval {
-        aasm_event :with_proc, :success => lambda { proc_success_callback } do
-          transitions :to => :proc, :from => [:initial]
+        aasm do
+          event :with_proc, :success => lambda { proc_success_callback } do
+            transitions :to => :proc, :from => [:initial]
+          end
         end
       }
 
@@ -161,14 +168,16 @@ describe 'should fire callbacks' do
   describe 'after' do
     it "if they set different ways" do
       ThisNameBetterNotBeInUse.instance_eval do
-        aasm_event :with_afters, :after => :do_one_thing_after do
-          after do
-            do_another_thing_after_too
+        aasm do
+          event :with_afters, :after => :do_one_thing_after do
+            after do
+              do_another_thing_after_too
+            end
+            after do
+              do_third_thing_at_last
+            end
+            transitions :to => :proc, :from => [:initial]
           end
-          after do
-            do_third_thing_at_last
-          end
-          transitions :to => :proc, :from => [:initial]
         end
       end
 
@@ -183,11 +192,13 @@ describe 'should fire callbacks' do
   describe 'before' do
     it "if it's a proc" do
       ThisNameBetterNotBeInUse.instance_eval do
-        aasm_event :before_as_proc do
-          before do
-            do_something_before
+        aasm do
+          event :before_as_proc do
+            before do
+              do_something_before
+            end
+            transitions :to => :proc, :from => [:initial]
           end
-          transitions :to => :proc, :from => [:initial]
         end
       end
 
@@ -199,11 +210,13 @@ describe 'should fire callbacks' do
 
   it 'in right order' do
     ThisNameBetterNotBeInUse.instance_eval do
-      aasm_event :in_right_order, :after => :do_something_after do
-        before do
-          do_something_before
+      aasm do
+        event :in_right_order, :after => :do_something_after do
+          before do
+            do_something_before
+          end
+          transitions :to => :proc, :from => [:initial]
         end
-        transitions :to => :proc, :from => [:initial]
       end
     end
 
@@ -219,22 +232,22 @@ describe 'parametrised events' do
 
   it 'should transition to specified next state (sleeping to showering)' do
     pe.wakeup!(:showering)
-    pe.aasm_current_state.should == :showering
+    pe.aasm.current_state.should == :showering
   end
 
   it 'should transition to specified next state (sleeping to working)' do
     pe.wakeup!(:working)
-    pe.aasm_current_state.should == :working
+    pe.aasm.current_state.should == :working
   end
 
   it 'should transition to default (first or showering) state' do
     pe.wakeup!
-    pe.aasm_current_state.should == :showering
+    pe.aasm.current_state.should == :showering
   end
 
   it 'should transition to default state when on_transition invoked' do
     pe.dress!(nil, 'purple', 'dressy')
-    pe.aasm_current_state.should == :working
+    pe.aasm.current_state.should == :working
   end
 
   it 'should call on_transition method with args' do

data/spec/unit/initial_state_spec.rb

@@ -5,8 +5,8 @@ class Banker
   aasm do
     state :retired
     state :selling_bad_mortgages
+    initial_state Proc.new { |banker| banker.rich? ? :retired : :selling_bad_mortgages }
   end
-  aasm_initial_state  Proc.new { |banker| banker.rich? ? :retired : :selling_bad_mortgages }
   RICH = 1_000_000
   attr_accessor :balance
   def initialize(balance = 0); self.balance = balance; end
@@ -17,12 +17,11 @@ describe 'initial states' do
   let(:bar) {Bar.new}
 
   it 'should use the first state defined if no initial state is given' do
-    bar.aasm_current_state.should == :read
-    # bar.aasm.current_state.should == :read # not yet supported
+    bar.aasm.current_state.should == :read
   end
 
   it 'should determine initial state from the Proc results' do
-    Banker.new(Banker::RICH - 1).aasm_current_state.should == :selling_bad_mortgages
-    Banker.new(Banker::RICH + 1).aasm_current_state.should == :retired
+    Banker.new(Banker::RICH - 1).aasm.current_state.should == :selling_bad_mortgages
+    Banker.new(Banker::RICH + 1).aasm.current_state.should == :retired
   end
 end

data/spec/unit/inspection_spec.rb

@@ -1,19 +1,6 @@
 require 'spec_helper'
 
 describe 'inspection for common cases' do
-  it 'should support the old DSL' do
-    Foo.should respond_to(:aasm_states)
-    Foo.aasm_states.should include(:open)
-    Foo.aasm_states.should include(:closed)
-
-    Foo.should respond_to(:aasm_initial_state)
-    Foo.aasm_initial_state.should == :open
-
-    Foo.should respond_to(:aasm_events)
-    Foo.aasm_events.should include(:close)
-    Foo.aasm_events.should include(:null)
-  end
-
   it 'should support the new DSL' do
     Foo.aasm.should respond_to(:states)
     Foo.aasm.states.should include(:open)
@@ -74,35 +61,35 @@ end
 
 describe "special cases" do
   it "should support valid a state name" do
-    Argument.aasm_states.should include(:invalid)
-    Argument.aasm_states.should include(:valid)
+    Argument.aasm.states.should include(:invalid)
+    Argument.aasm.states.should include(:valid)
 
     argument = Argument.new
     argument.invalid?.should be_true
-    argument.aasm_current_state.should == :invalid
+    argument.aasm.current_state.should == :invalid
 
     argument.valid!
     argument.valid?.should be_true
-    argument.aasm_current_state.should == :valid
+    argument.aasm.current_state.should == :valid
   end
 end
 
-describe :aasm_states_for_select do
+describe 'aasm.states_for_select' do
   it "should return a select friendly array of states" do
-    Foo.should respond_to(:aasm_states_for_select)
-    Foo.aasm_states_for_select.should == [['Open', 'open'], ['Closed', 'closed']]
+    Foo.aasm.should respond_to(:states_for_select)
+    Foo.aasm.states_for_select.should == [['Open', 'open'], ['Closed', 'closed']]
   end
 end
 
-describe :aasm_from_states_for_state do
+describe 'aasm.from_states_for_state' do
   it "should return all from states for a state" do
-    AuthMachine.should respond_to(:aasm_from_states_for_state)
-    froms = AuthMachine.aasm_from_states_for_state(:active)
+    AuthMachine.aasm.should respond_to(:from_states_for_state)
+    froms = AuthMachine.aasm.from_states_for_state(:active)
     [: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)
+    froms = AuthMachine.aasm.from_states_for_state(:active, :transition => :unsuspend)
     [:suspended].each {|from| froms.should include(from)}
   end
 end