From 9c48f76e9c2bc5f7fcb35693c071e31312417ae2 Mon Sep 17 00:00:00 2001
From: Luiz Branco <me@luizbranco.com>
Date: Fri, 29 Nov 2013 12:39:50 -0200
Subject: [PATCH 01/21] Fix after_commit callback doc

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3adc168..91fd486 100644
--- a/README.md
+++ b/README.md
@@ -325,9 +325,9 @@ class Job < ActiveRecord::Base
 
   aasm do
     state :sleeping, :initial => true
-    state :running
+    state :running, :after_commit => :notify_about_running_job
 
-    event :run, :after_commit => :notify_about_running_job do
+    event :run do
       transitions :from => :sleeping, :to => :running
     end
   end

From 41ca5679bf9fecfef60429ccc6a9bec55935ddc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:46:36 +0100
Subject: [PATCH 02/21] deprecate usage of aasm_current_state (getter method)

---
 lib/aasm/aasm.rb                                |  4 ++--
 lib/aasm/event.rb                               |  2 +-
 .../persistence/active_record_persistence.rb    | 16 ++++++++--------
 lib/aasm/persistence/mongoid_persistence.rb     | 16 ++++++++--------
 spec/unit/complex_example_spec.rb               |  8 ++++----
 spec/unit/event_spec.rb                         | 17 +++++++----------
 spec/unit/initial_state_spec.rb                 |  7 +++----
 spec/unit/inspection_spec.rb                    |  4 ++--
 .../active_record_persistence_spec.rb           | 12 ++++++------
 spec/unit/simple_example_spec.rb                |  3 +--
 spec/unit/subclassing_spec.rb                   |  4 ++--
 11 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 09385ca..7dc266d 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -103,9 +103,9 @@ module AASM
     true
   end
 
-  # deprecated
+  # deprecated, remove in v4.0.0
   def aasm_current_state
-    # warn "#aasm_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.state instead!"
+    warn "#aasm_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.current_state instead!"
     aasm.current_state
   end
 
diff --git a/lib/aasm/event.rb b/lib/aasm/event.rb
index 7a3c8d5..b565267 100644
--- a/lib/aasm/event.rb
+++ b/lib/aasm/event.rb
@@ -68,7 +68,7 @@ module AASM
     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 }
+        transitions = @transitions.select { |t| t.from == obj.aasm.current_state }
         return result if transitions.size == 0
       else
         transitions = @transitions
diff --git a/lib/aasm/persistence/active_record_persistence.rb b/lib/aasm/persistence/active_record_persistence.rb
index 5adb45c..8ea4044 100644
--- a/lib/aasm/persistence/active_record_persistence.rb
+++ b/lib/aasm/persistence/active_record_persistence.rb
@@ -71,10 +71,10 @@ module AASM
         # Writes <tt>state</tt> to the state column and persists 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 # => :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)
@@ -97,13 +97,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)
diff --git a/lib/aasm/persistence/mongoid_persistence.rb b/lib/aasm/persistence/mongoid_persistence.rb
index 082f112..44f9864 100644
--- a/lib/aasm/persistence/mongoid_persistence.rb
+++ b/lib/aasm/persistence/mongoid_persistence.rb
@@ -66,10 +66,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 +87,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)
diff --git a/spec/unit/complex_example_spec.rb b/spec/unit/complex_example_spec.rb
index b743349..89e1884 100644
--- a/spec/unit/complex_example_spec.rb
+++ b/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
diff --git a/spec/unit/event_spec.rb b/spec/unit/event_spec.rb
index 936c66b..5601a94 100644
--- a/spec/unit/event_spec.rb
+++ b/spec/unit/event_spec.rb
@@ -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
@@ -219,22 +216,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
diff --git a/spec/unit/initial_state_spec.rb b/spec/unit/initial_state_spec.rb
index f5afef9..85c5da0 100644
--- a/spec/unit/initial_state_spec.rb
+++ b/spec/unit/initial_state_spec.rb
@@ -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
diff --git a/spec/unit/inspection_spec.rb b/spec/unit/inspection_spec.rb
index 8d245c2..2d51fa3 100644
--- a/spec/unit/inspection_spec.rb
+++ b/spec/unit/inspection_spec.rb
@@ -79,11 +79,11 @@ describe "special cases" do
 
     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
 
diff --git a/spec/unit/persistence/active_record_persistence_spec.rb b/spec/unit/persistence/active_record_persistence_spec.rb
index 8cb202c..f162cf8 100644
--- a/spec/unit/persistence/active_record_persistence_spec.rb
+++ b/spec/unit/persistence/active_record_persistence_spec.rb
@@ -24,24 +24,24 @@ describe "instance methods" do
   end
 
   it "should return the initial state when new and the aasm field is nil" do
-    gate.aasm_current_state.should == :opened
+    gate.aasm.current_state.should == :opened
   end
 
   it "should return the aasm column when new and the aasm field is not nil" do
     gate.aasm_state = "closed"
-    gate.aasm_current_state.should == :closed
+    gate.aasm.current_state.should == :closed
   end
 
   it "should return the aasm column when not new and the aasm_column is not nil" do
     gate.stub(:new_record?).and_return(false)
     gate.aasm_state = "state"
-    gate.aasm_current_state.should == :state
+    gate.aasm.current_state.should == :state
   end
 
   it "should allow a nil state" do
     gate.stub(:new_record?).and_return(false)
     gate.aasm_state = nil
-    gate.aasm_current_state.should be_nil
+    gate.aasm.current_state.should be_nil
   end
 
   it "should call aasm_ensure_initial_state on validation before create" do
@@ -119,8 +119,8 @@ end
 describe 'initial states' do
 
   it 'should support conditions' do
-    Thief.new(:skilled => true).aasm_current_state.should == :rich
-    Thief.new(:skilled => false).aasm_current_state.should == :jailed
+    Thief.new(:skilled => true).aasm.current_state.should == :rich
+    Thief.new(:skilled => false).aasm.current_state.should == :jailed
   end
 end
 
diff --git a/spec/unit/simple_example_spec.rb b/spec/unit/simple_example_spec.rb
index b7a5c61..3d88c65 100644
--- a/spec/unit/simple_example_spec.rb
+++ b/spec/unit/simple_example_spec.rb
@@ -20,8 +20,7 @@ describe 'state machine' do
   let(:payment) {Payment.new}
 
   it 'starts with an initial state' do
-    payment.aasm_current_state.should == :initialised
-    # payment.aasm.current_state.should == :initialised # not yet supported
+    payment.aasm.current_state.should == :initialised
     payment.should respond_to(:initialised?)
     payment.should be_initialised
   end
diff --git a/spec/unit/subclassing_spec.rb b/spec/unit/subclassing_spec.rb
index 7ceb44d..cf31466 100644
--- a/spec/unit/subclassing_spec.rb
+++ b/spec/unit/subclassing_spec.rb
@@ -24,8 +24,8 @@ describe 'subclassing' do
 
   it 'should not break if I call Son#update_state' do
     son.update_state
-    son.aasm_current_state.should == :pending_details_confirmation
+    son.aasm.current_state.should == :pending_details_confirmation
   end
-  
+
 end
 

From 243814d2912799e49023d154838fa07a272ea651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:49:33 +0100
Subject: [PATCH 03/21] deprecate usage of aasm_enter_initial_state (getter
 method)

---
 lib/aasm/aasm.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 7dc266d..e58288a 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -103,15 +103,15 @@ module AASM
     true
   end
 
-  # deprecated, remove in v4.0.0
+  # deprecated, remove this method in v4.0.0
   def aasm_current_state
     warn "#aasm_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.current_state instead!"
     aasm.current_state
   end
 
-  # deprecated
+  # deprecated, remove this method in v4.0.0
   def aasm_enter_initial_state
-    # warn "#aasm_enter_initial_state is deprecated and will be removed in version 3.2.0; please use #aasm.enter_initial_state instead!"
+    warn "#aasm_enter_initial_state is deprecated and will be removed in version 4.0.0; please use #aasm.enter_initial_state instead!"
     aasm.enter_initial_state
   end
 

From 71031e456339aecf626843e14feb1b37a8a1808a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:50:48 +0100
Subject: [PATCH 04/21] deprecate usage of aasm_events_for_current_state
 (getter method)

---
 lib/aasm/aasm.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index e58288a..8282b6a 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -115,9 +115,9 @@ module AASM
     aasm.enter_initial_state
   end
 
-  # deprecated
+  # deprecated, remove this method in v4.0.0
   def aasm_events_for_current_state
-    # warn "#aasm_events_for_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.events instead!"
+    warn "#aasm_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.events(aasm.current_state) instead!"
     aasm.events(aasm.current_state)
   end
 

From 7795be46f493dfeeaa5da4b55a12827c15cb92f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:51:39 +0100
Subject: [PATCH 05/21] deprecate usage of
 aasm_permissible_events_for_current_state (getter method)

---
 lib/aasm/aasm.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 8282b6a..98828f2 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -121,9 +121,9 @@ module AASM
     aasm.events(aasm.current_state)
   end
 
-  # deprecated
+  # deprecated, remove this method in v4.0.0
   def aasm_permissible_events_for_current_state
-    # warn "#aasm_permissible_events_for_current_state is deprecated and will be removed in version 3.2.0; please use #aasm.permissible_events instead!"
+    warn "#aasm_permissible_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.permissible_events instead!"
     aasm.permissible_events
   end
 

From 399f73bc0e4cd6df2c48c4980652e4c23a585b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:52:40 +0100
Subject: [PATCH 06/21] deprecate usage of aasm_events_for_state (getter
 method)

---
 lib/aasm/aasm.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 98828f2..e79d9f5 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -127,9 +127,9 @@ module AASM
     aasm.permissible_events
   end
 
-  # deprecated
+  # deprecated, remove this method in v4.0.0
   def aasm_events_for_state(state_name)
-    # warn "#aasm_events_for_state(state_name) is deprecated and will be removed in version 3.2.0; please use #aasm.events(state_name) instead!"
+    warn "#aasm_events_for_state(state_name) is deprecated and will be removed in version 4.0.0; please use #aasm.events(state_name) instead!"
     aasm.events(state_name)
   end
 

From a4c39d5ade4d4cb50c71749acf48d050543483b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 20:56:50 +0100
Subject: [PATCH 07/21] deprecate usage of aasm_human_state (getter method)

---
 lib/aasm.rb                 |  3 ---
 lib/aasm/aasm.rb            |  4 ++--
 lib/aasm/deprecated/aasm.rb | 15 ---------------
 spec/unit/localizer_spec.rb | 12 ++++++------
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 lib/aasm/deprecated/aasm.rb

diff --git a/lib/aasm.rb b/lib/aasm.rb
index 0a0c370..9a93b02 100644
--- a/lib/aasm.rb
+++ b/lib/aasm.rb
@@ -13,6 +13,3 @@ require 'ostruct'
     persistence
     aasm
   ).each { |file| require File.join(File.dirname(__FILE__), 'aasm', file) }
-
-# load the deprecated methods and modules
-Dir[File.join(File.dirname(__FILE__), 'aasm', 'deprecated', '*.rb')].sort.each { |f| require File.expand_path(f) }
diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index e79d9f5..8beca23 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -133,9 +133,9 @@ module AASM
     aasm.events(state_name)
   end
 
-  # deprecated
+  # deprecated, remove this method in v4.0.0
   def aasm_human_state
-    # warn "#aasm_human_state is deprecated and will be removed in version 3.2.0; please use #aasm.human_state instead!"
+    warn "#aasm_human_state is deprecated and will be removed in version 4.0.0; please use #aasm.human_state instead!"
     aasm.human_state
   end
 
diff --git a/lib/aasm/deprecated/aasm.rb b/lib/aasm/deprecated/aasm.rb
deleted file mode 100644
index 95a70ac..0000000
--- a/lib/aasm/deprecated/aasm.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module AASM
-
-  module ClassMethods
-    def human_event_name(*args)
-      warn "AASM.human_event_name is deprecated and will be removed in version 3.1.0; please use AASM.aasm_human_event_name instead!"
-      aasm_human_event_name(*args)
-    end
-  end
-
-  def human_state
-    warn "AASM#human_state is deprecated and will be removed in version 3.1.0; please use AASM#aasm_human_state instead!"
-    aasm_human_state
-  end
-
-end
diff --git a/spec/unit/localizer_spec.rb b/spec/unit/localizer_spec.rb
index c31dc33..c8dc178 100644
--- a/spec/unit/localizer_spec.rb
+++ b/spec/unit/localizer_spec.rb
@@ -52,13 +52,13 @@ describe AASM::Localizer, "new style" do
   let (:foo_opened) { LocalizerTestModel.new }
   let (:foo_closed) { LocalizerTestModel.new.tap { |x| x.aasm_state = :closed  } }
 
-  context 'aasm_human_state' do
+  context 'aasm.human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's open now!"
+      foo_opened.aasm.human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do
-      foo_closed.aasm_human_state.should == "Closed"
+      foo_closed.aasm.human_state.should == "Closed"
     end
   end
 
@@ -87,13 +87,13 @@ describe AASM::Localizer, "deprecated style" do
   let (:foo_opened) { LocalizerTestModel.new }
   let (:foo_closed) { LocalizerTestModel.new.tap { |x| x.aasm_state = :closed  } }
 
-  context 'aasm_human_state' do
+  context 'aasm.human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's open now!"
+      foo_opened.aasm.human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do
-      foo_closed.aasm_human_state.should == "Closed"
+      foo_closed.aasm.human_state.should == "Closed"
     end
   end
 

From 15a8db6db0e495a7d2cb15e2b950e3426119ea4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:29:15 +0100
Subject: [PATCH 08/21] deprecate usage of AASM.aasm_initial_state= (setter
 method)

---
 lib/aasm/aasm.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 8beca23..8a00496 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -45,8 +45,9 @@ module AASM
       end
     end
 
-    # deprecated
+    # deprecated, remove this method in v4.0.0
     def aasm_initial_state=(state)
+      warn ".aasm_initial_state= is deprecated and will be removed in version 4.0.0"
       AASM::StateMachine[self].initial_state = state
     end
 

From cbb3d78a8018abe1d99738459137c87ac5316f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:30:07 +0100
Subject: [PATCH 09/21] deprecate usage of AASM.aasm_state (setter method)

---
 lib/aasm/aasm.rb                              |  1 +
 spec/models/callback_old_dsl.rb               | 41 -------------------
 spec/models/mongoid/simple_mongoid.rb         |  7 ++--
 spec/models/not_auto_loaded/process.rb        | 18 ++++----
 spec/models/persistence.rb                    | 16 ++------
 spec/unit/callbacks_spec.rb                   | 18 --------
 spec/unit/inspection_spec.rb                  | 17 +-------
 spec/unit/localizer_spec.rb                   | 12 +++---
 .../active_record_persistence_spec.rb         | 27 +-----------
 9 files changed, 29 insertions(+), 128 deletions(-)
 delete mode 100644 spec/models/callback_old_dsl.rb

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 8a00496..1e510e0 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -53,6 +53,7 @@ module AASM
 
     # deprecated
     def aasm_state(name, options={})
+      warn ".aasm_state is deprecated and will be removed in version 4.0.0; please use .aasm.state instead!"
       aasm.state(name, options)
     end
 
diff --git a/spec/models/callback_old_dsl.rb b/spec/models/callback_old_dsl.rb
deleted file mode 100644
index 3df6f34..0000000
--- a/spec/models/callback_old_dsl.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class CallbackOldDsl
-  include AASM
-
-  aasm_initial_state :open
-  aasm_state :open,
-    :before_enter => :before_enter_open,
-    :after_enter  => :after_enter_open,
-    :before_exit  => :before_exit_open,
-    :exit         => :exit_open,
-    :after_exit   => :after_exit_open
-  aasm_state :closed,
-    :before_enter => :before_enter_closed,
-    :enter        => :enter_closed,
-    :after_enter  => :after_enter_closed,
-    :before_exit  => :before_exit_closed,
-    :after_exit   => :after_exit_closed
-
-  aasm_event :close, :before => :before, :after => :after do
-    transitions :to => :closed, :from => [:open]
-  end
-
-  aasm_event :open, :before => :before, :after => :after do
-    transitions :to => :open, :from => :closed
-  end
-
-  def before_enter_open; end
-  def before_exit_open; end
-  def after_enter_open; end
-  def after_exit_open; end
-
-  def before_enter_closed; end
-  def before_exit_closed; end
-  def after_enter_closed; end
-  def after_exit_closed; end
-
-  def before; end
-  def after; end
-
-  def enter_closed; end
-  def exit_open; end
-end
diff --git a/spec/models/mongoid/simple_mongoid.rb b/spec/models/mongoid/simple_mongoid.rb
index ed7cb07..9c16435 100644
--- a/spec/models/mongoid/simple_mongoid.rb
+++ b/spec/models/mongoid/simple_mongoid.rb
@@ -4,7 +4,8 @@ class SimpleMongoid
 
   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
diff --git a/spec/models/not_auto_loaded/process.rb b/spec/models/not_auto_loaded/process.rb
index 67fc8a4..2a63f3a 100644
--- a/spec/models/not_auto_loaded/process.rb
+++ b/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
diff --git a/spec/models/persistence.rb b/spec/models/persistence.rb
index f38f2e5..2704eec 100644
--- a/spec/models/persistence.rb
+++ b/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
 
@@ -73,7 +63,9 @@ class Thief < ActiveRecord::Base
   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
+  end
   attr_accessor :skilled, :aasm_state
 end
diff --git a/spec/unit/callbacks_spec.rb b/spec/unit/callbacks_spec.rb
index b1faad6..659b2d9 100644
--- a/spec/unit/callbacks_spec.rb
+++ b/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}
 
diff --git a/spec/unit/inspection_spec.rb b/spec/unit/inspection_spec.rb
index 2d51fa3..ba6666d 100644
--- a/spec/unit/inspection_spec.rb
+++ b/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,8 +61,8 @@ 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
diff --git a/spec/unit/localizer_spec.rb b/spec/unit/localizer_spec.rb
index c8dc178..95dc4f5 100644
--- a/spec/unit/localizer_spec.rb
+++ b/spec/unit/localizer_spec.rb
@@ -10,12 +10,12 @@ class LocalizerTestModel < ActiveRecord::Base
 
   attr_accessor :aasm_state
 
-  aasm_initial_state :opened
-  aasm_state :opened
-  aasm_state :closed
-
-  aasm_event :close
-  aasm_event :open
+  aasm do
+    state :opened, initial: true
+    state :closed
+    event :close
+    event :open
+  end
 end
 
 describe 'localized state names' do
diff --git a/spec/unit/persistence/active_record_persistence_spec.rb b/spec/unit/persistence/active_record_persistence_spec.rb
index f162cf8..92475dd 100644
--- a/spec/unit/persistence/active_record_persistence_spec.rb
+++ b/spec/unit/persistence/active_record_persistence_spec.rb
@@ -59,15 +59,11 @@ end
 
 describe 'subclasses' do
   it "should have the same states as its parent class" do
-    Derivate.aasm_states.should == Simple.aasm_states
+    DerivateNewDsl.aasm.states.should == SimpleNewDsl.aasm.states
   end
 
   it "should have the same events as its parent class" do
-    Derivate.aasm_events.should == Simple.aasm_events
-  end
-
-  it "should have the same column as its parent class" do
-    Derivate.aasm_column.should == :status
+    DerivateNewDsl.aasm.events.should == SimpleNewDsl.aasm.events
   end
 
   it "should have the same column as its parent even for the new dsl" do
@@ -76,26 +72,7 @@ describe 'subclasses' do
   end
 end
 
-describe "named scopes with the old DSL" do
-
-  context "Does not already respond_to? the scope name" do
-    it "should add a scope" do
-      Simple.should respond_to(:unknown_scope)
-      SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation).should be_true
-    end
-  end
-
-  context "Already respond_to? the scope name" do
-    it "should not add a scope" do
-      Simple.should respond_to(:new)
-      Simple.new.class.should == Simple
-    end
-  end
-
-end
-
 describe "named scopes with the new DSL" do
-
   context "Does not already respond_to? the scope name" do
     it "should add a scope" do
       SimpleNewDsl.should respond_to(:unknown_scope)

From 37ff3db2d835906071b53e47e792accd6822091a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:31:51 +0100
Subject: [PATCH 10/21] make clear what needs to be done

---
 lib/aasm/aasm.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 1e510e0..6e44bea 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -45,13 +45,13 @@ module AASM
       end
     end
 
-    # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
     def aasm_initial_state=(state)
       warn ".aasm_initial_state= is deprecated and will be removed in version 4.0.0"
       AASM::StateMachine[self].initial_state = state
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_state(name, options={})
       warn ".aasm_state is deprecated and will be removed in version 4.0.0; please use .aasm.state instead!"
       aasm.state(name, options)
@@ -105,37 +105,37 @@ module AASM
     true
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_current_state
     warn "#aasm_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.current_state instead!"
     aasm.current_state
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_enter_initial_state
     warn "#aasm_enter_initial_state is deprecated and will be removed in version 4.0.0; please use #aasm.enter_initial_state instead!"
     aasm.enter_initial_state
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_events_for_current_state
     warn "#aasm_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.events(aasm.current_state) instead!"
     aasm.events(aasm.current_state)
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_permissible_events_for_current_state
     warn "#aasm_permissible_events_for_current_state is deprecated and will be removed in version 4.0.0; please use #aasm.permissible_events instead!"
     aasm.permissible_events
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_events_for_state(state_name)
     warn "#aasm_events_for_state(state_name) is deprecated and will be removed in version 4.0.0; please use #aasm.events(state_name) instead!"
     aasm.events(state_name)
   end
 
-  # deprecated, remove this method in v4.0.0
+    # TODO remove this method in v4.0.0
   def aasm_human_state
     warn "#aasm_human_state is deprecated and will be removed in version 4.0.0; please use #aasm.human_state instead!"
     aasm.human_state

From 3cb9ec2e163614bb4a6e647e5045a8be68181cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:36:28 +0100
Subject: [PATCH 11/21] deprecate usage of AASM.aasm_event (setter method)

---
 lib/aasm/aasm.rb            |  3 +-
 lib/aasm/base.rb            |  2 --
 spec/unit/callbacks_spec.rb |  6 ++--
 spec/unit/event_spec.rb     | 66 +++++++++++++++++++++++--------------
 4 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 6e44bea..ca69871 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -57,8 +57,9 @@ module AASM
       aasm.state(name, options)
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_event(name, options = {}, &block)
+      warn ".aasm_event is deprecated and will be removed in version 4.0.0; please use .aasm.event instead!"
       aasm.event(name, options, &block)
     end
 
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
index 1226549..227a799 100644
--- a/lib/aasm/base.rb
+++ b/lib/aasm/base.rb
@@ -46,8 +46,6 @@ module AASM
 
     # define an event
     def event(name, options={}, &block)
-      # @clazz.aasm_event(name, options, &block)
-
       @state_machine.events[name] = AASM::Event.new(name, options, &block)
 
       # an addition over standard aasm so that, before firing an event, you can ask
diff --git a/spec/unit/callbacks_spec.rb b/spec/unit/callbacks_spec.rb
index 659b2d9..4bad201 100644
--- a/spec/unit/callbacks_spec.rb
+++ b/spec/unit/callbacks_spec.rb
@@ -22,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
 
diff --git a/spec/unit/event_spec.rb b/spec/unit/event_spec.rb
index 5601a94..f459e24 100644
--- a/spec/unit/event_spec.rb
+++ b/spec/unit/event_spec.rb
@@ -93,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
       }
 
@@ -105,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
       }
 
@@ -117,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
       }
 
@@ -130,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
       }
 
@@ -144,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
       }
 
@@ -158,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
 
@@ -180,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
 
@@ -196,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
 

From 17004b3760ac8711ef115554b25ea4460012da28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:42:26 +0100
Subject: [PATCH 12/21] deprecate usage of AASM.aasm_events and
 AASM.aasm_states (getter methods)

---
 lib/aasm/aasm.rb              |  8 +++++---
 spec/unit/subclassing_spec.rb | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index ca69871..f8ee849 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -63,13 +63,15 @@ module AASM
       aasm.event(name, options, &block)
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_states
+      warn ".aasm_states is deprecated and will be removed in version 4.0.0; please use .aasm.states instead!"
       aasm.states
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_events
+      warn ".aasm_events is deprecated and will be removed in version 4.0.0; please use .aasm.events instead!"
       aasm.events
     end
 
@@ -145,7 +147,7 @@ module AASM
 private
 
   def aasm_fire_event(event_name, options, *args, &block)
-    event = self.class.aasm_events[event_name]
+    event = self.class.aasm.events[event_name]
     begin
       old_state = aasm.state_object_for_name(aasm.current_state)
       old_state.fire_callbacks(:exit, self)
diff --git a/spec/unit/subclassing_spec.rb b/spec/unit/subclassing_spec.rb
index cf31466..a2d6602 100644
--- a/spec/unit/subclassing_spec.rb
+++ b/spec/unit/subclassing_spec.rb
@@ -4,18 +4,18 @@ describe 'subclassing' do
   let(:son) {Son.new}
 
   it 'should have the parent states' do
-    Foo.aasm_states.each do |state|
-      FooTwo.aasm_states.should include(state)
+    Foo.aasm.states.each do |state|
+      FooTwo.aasm.states.should include(state)
     end
-    Baz.aasm_states.should == Bar.aasm_states
+    Baz.aasm.states.should == Bar.aasm.states
   end
 
   it 'should not add the child states to the parent machine' do
-    Foo.aasm_states.should_not include(:foo)
+    Foo.aasm.states.should_not include(:foo)
   end
 
   it "should have the same events as its parent" do
-    Baz.aasm_events.should == Bar.aasm_events
+    Baz.aasm.events.should == Bar.aasm.events
   end
 
   it 'should know how to respond to `may_add_details?`' do

From 9fa60651b4d02885141dd0f50bc4c67446943cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:44:00 +0100
Subject: [PATCH 13/21] deprecate usage of AASM.aasm_states_for_select (getter
 method)

---
 lib/aasm/aasm.rb             | 3 ++-
 spec/unit/inspection_spec.rb | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index f8ee849..aa187ed 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -75,8 +75,9 @@ module AASM
       aasm.events
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def aasm_states_for_select
+      warn ".aasm_states_for_select is deprecated and will be removed in version 4.0.0; please use .aasm.states_for_select instead!"
       aasm.states_for_select
     end
 
diff --git a/spec/unit/inspection_spec.rb b/spec/unit/inspection_spec.rb
index ba6666d..30d762b 100644
--- a/spec/unit/inspection_spec.rb
+++ b/spec/unit/inspection_spec.rb
@@ -74,10 +74,10 @@ describe "special cases" do
   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
 

From 45250d09e2fe547666dc0ee287124d305802c4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 21:48:37 +0100
Subject: [PATCH 14/21] deprecate usage of AASM.aasm_from_states_for_state
 (getter method)

---
 lib/aasm/aasm.rb             | 9 +++------
 lib/aasm/base.rb             | 8 ++++++++
 spec/unit/inspection_spec.rb | 8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index aa187ed..42a28e4 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -36,13 +36,10 @@ module AASM
       end
     end
 
-    # is this better?: aasm.states.name.from_states
+    # TODO remove this method in v4.0.0
     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
+      warn ".aasm_from_states_for_state is deprecated and will be removed in version 4.0.0; please use .aasm.from_states_for_state instead!"
+      aasm.from_states_for_state(state, options)
     end
 
     # TODO remove this method in v4.0.0
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
index 227a799..8b80966 100644
--- a/lib/aasm/base.rb
+++ b/lib/aasm/base.rb
@@ -76,5 +76,13 @@ module AASM
       states.map { |state| state.for_select }
     end
 
+    def from_states_for_state(state, options={})
+      if options[:transition]
+        events[options[:transition]].transitions_to_state(state).flatten.map(&:from).flatten
+      else
+        events.map {|k,v| v.transitions_to_state(state)}.flatten.map(&:from).flatten
+      end
+    end
+
   end
 end
diff --git a/spec/unit/inspection_spec.rb b/spec/unit/inspection_spec.rb
index 30d762b..9ac597a 100644
--- a/spec/unit/inspection_spec.rb
+++ b/spec/unit/inspection_spec.rb
@@ -81,15 +81,15 @@ describe 'aasm.states_for_select' do
   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

From c5ae69ca64ed4402ca5058deeb109c7e11ab2c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 22:46:04 +0100
Subject: [PATCH 15/21] deprecate usage of AASM.aasm_initial_state (getter and
 setter method)

---
 lib/aasm/aasm.rb                | 5 +++--
 lib/aasm/base.rb                | 9 ++++++---
 lib/aasm/instance_base.rb       | 2 +-
 lib/aasm/persistence/base.rb    | 2 +-
 spec/models/persistence.rb      | 2 +-
 spec/unit/initial_state_spec.rb | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/aasm/aasm.rb b/lib/aasm/aasm.rb
index 42a28e4..85e1d1d 100644
--- a/lib/aasm/aasm.rb
+++ b/lib/aasm/aasm.rb
@@ -26,12 +26,13 @@ module AASM
       @aasm
     end
 
-    # TODO: maybe better: aasm.initial_state
+    # TODO remove this method in v4.0.0
     def aasm_initial_state(set_state=nil)
       if set_state
-        # deprecated way to set the value
+        warn ".aasm_initial_state(:name) is deprecated and will be removed in version 4.0.0; please use .aasm.initial_state = :name instead!"
         AASM::StateMachine[self].initial_state = set_state
       else
+        warn ".aasm_initial_state is deprecated and will be removed in version 4.0.0; please use .aasm.initial_state instead!"
         AASM::StateMachine[self].initial_state
       end
     end
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
index 8b80966..618f3a3 100644
--- a/lib/aasm/base.rb
+++ b/lib/aasm/base.rb
@@ -25,13 +25,16 @@ module AASM
       end
     end
 
-    def initial_state
-      @state_machine.initial_state
+    def initial_state(new_initial_state=nil)
+      if new_initial_state
+        @state_machine.initial_state = new_initial_state
+      else
+        @state_machine.initial_state
+      end
     end
 
     # define a state
     def state(name, options={})
-      # @clazz.aasm_state(name, options)
       @state_machine.add_state(name, @clazz, options)
       @state_machine.initial_state = name if options[:initial] || !@state_machine.initial_state
 
diff --git a/lib/aasm/instance_base.rb b/lib/aasm/instance_base.rb
index 6cad4f1..52de15e 100644
--- a/lib/aasm/instance_base.rb
+++ b/lib/aasm/instance_base.rb
@@ -15,7 +15,7 @@ module AASM
     end
 
     def enter_initial_state
-      state_name = determine_state_name(@instance.class.aasm_initial_state)
+      state_name = determine_state_name(@instance.class.aasm.initial_state)
       state_object = state_object_for_name(state_name)
 
       state_object.fire_callbacks(:before_enter, @instance)
diff --git a/lib/aasm/persistence/base.rb b/lib/aasm/persistence/base.rb
index 81aaebd..fdd886f 100644
--- a/lib/aasm/persistence/base.rb
+++ b/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
diff --git a/spec/models/persistence.rb b/spec/models/persistence.rb
index 2704eec..e585e21 100644
--- a/spec/models/persistence.rb
+++ b/spec/models/persistence.rb
@@ -62,10 +62,10 @@ class Thief < ActiveRecord::Base
     set_table_name "thieves"
   end
   include AASM
-  aasm_initial_state  Proc.new { |thief| thief.skilled ? :rich : :jailed }
   aasm do
     state :rich
     state :jailed
+    initial_state Proc.new {|thief| thief.skilled ? :rich : :jailed }
   end
   attr_accessor :skilled, :aasm_state
 end
diff --git a/spec/unit/initial_state_spec.rb b/spec/unit/initial_state_spec.rb
index 85c5da0..dcf7fb8 100644
--- a/spec/unit/initial_state_spec.rb
+++ b/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

From a35d7db34c1563647b24af0f4a363335ad3f7535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 22:49:39 +0100
Subject: [PATCH 16/21] deprecate usage of Event#all_transitions (getter
 method)

---
 lib/aasm/event.rb       | 30 +++++++++++++++---------------
 spec/unit/event_spec.rb |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/aasm/event.rb b/lib/aasm/event.rb
index b565267..89aac8f 100644
--- a/lib/aasm/event.rb
+++ b/lib/aasm/event.rb
@@ -36,9 +36,9 @@ module AASM
       @transitions.select { |t| t.to == state }
     end
 
-    # deprecated
+    # TODO remove this method in v4.0.0
     def all_transitions
-      # warn "Event#all_transitions is deprecated and will be removed in version 3.2.0; please use Event#transitions instead!"
+      warn "Event#all_transitions is deprecated and will be removed in version 4.0.0; please use Event#transitions instead!"
       transitions
     end
 
@@ -54,6 +54,19 @@ module AASM
       end
     end
 
+    ## DSL interface
+    def transitions(definitions=nil)
+      if definitions # define new transitions
+        # Create a separate transition for each from state to the given state
+        Array(definitions[:from]).each do |s|
+          @transitions << AASM::Transition.new(definitions.merge({:from => s.to_sym}))
+        end
+        # Create a transition if to is specified without from (transitions from ANY state)
+        @transitions << AASM::Transition.new(definitions) if @transitions.empty? && definitions[:to]
+      end
+      @transitions
+    end
+
   private
 
     def update(options = {}, &block)
@@ -106,19 +119,6 @@ module AASM
       end
     end
 
-    ## DSL interface
-    def transitions(trans_opts=nil)
-      if trans_opts # define new transitions
-        # Create a separate transition for each from state to the given state
-        Array(trans_opts[:from]).each do |s|
-          @transitions << AASM::Transition.new(trans_opts.merge({:from => s.to_sym}))
-        end
-        # Create a transition if to is specified without from (transitions from ANY state)
-        @transitions << AASM::Transition.new(trans_opts) if @transitions.empty? && trans_opts[:to]
-      end
-      @transitions
-    end
-
     [:after, :before, :error, :success].each do |callback_name|
       define_method callback_name do |*args, &block|
         options[callback_name] = Array(options[callback_name])
diff --git a/spec/unit/event_spec.rb b/spec/unit/event_spec.rb
index f459e24..39fdcd9 100644
--- a/spec/unit/event_spec.rb
+++ b/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

From 9445629caeda72a89e1899ad4c1424fca552d352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sat, 30 Nov 2013 22:53:18 +0100
Subject: [PATCH 17/21] updated changelog for deprecations

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de4337..6ef4ece 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.1.0 (not yet released)
+
+ * deprecated old aasm_* class methods (old-style DSL), in preparation for AASM v4.0.0
+
 ## 3.0.24
 
  * added support for event blocks (thanks to [@Intrepidd](https://github.com/Intrepidd))

From a7842dc289c683b9736d6126725e8b5d81227bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sun, 1 Dec 2013 00:08:50 +0100
Subject: [PATCH 18/21] still supporting Ruby 1.8.7

---
 spec/unit/event_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/unit/event_spec.rb b/spec/unit/event_spec.rb
index 39fdcd9..bc78164 100644
--- a/spec/unit/event_spec.rb
+++ b/spec/unit/event_spec.rb
@@ -60,7 +60,7 @@ end
 
 describe 'firing an event' do
   it 'should return nil if the transitions are empty' do
-    obj = double('object', aasm: double('aasm', current_state: 'open'))
+    obj = double('object', :aasm => double('aasm', :current_state => 'open'))
 
     event = AASM::Event.new(:event)
     event.fire(obj).should be_nil
@@ -71,7 +71,7 @@ describe 'firing an event' do
       transitions :to => :closed, :from => [:open, :received]
     end
 
-    obj = double('object', aasm: double('aasm', current_state: :open))
+    obj = double('object', :aasm => double('aasm', :current_state => :open))
 
     event.fire(obj).should == :closed
   end
@@ -81,7 +81,7 @@ describe 'firing an event' do
       transitions :to => :closed, :from => [:open, :received], :guard => :guard_fn
     end
 
-    obj = double('object', aasm: double('aasm', current_state: :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

From 08d0511c90938f6a2b1e04db317646b8b663d100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sun, 1 Dec 2013 00:23:34 +0100
Subject: [PATCH 19/21] still supporting Ruby 1.8.7

---
 spec/models/mongoid/no_scope_mongoid.rb       | 2 +-
 spec/models/mongoid/simple_mongoid.rb         | 2 +-
 spec/models/mongoid/simple_new_dsl_mongoid.rb | 2 +-
 spec/unit/localizer_spec.rb                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/models/mongoid/no_scope_mongoid.rb b/spec/models/mongoid/no_scope_mongoid.rb
index bf8c495..b022f6f 100644
--- a/spec/models/mongoid/no_scope_mongoid.rb
+++ b/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
diff --git a/spec/models/mongoid/simple_mongoid.rb b/spec/models/mongoid/simple_mongoid.rb
index 9c16435..dc8c557 100644
--- a/spec/models/mongoid/simple_mongoid.rb
+++ b/spec/models/mongoid/simple_mongoid.rb
@@ -2,7 +2,7 @@ class SimpleMongoid
   include Mongoid::Document
   include AASM
 
-  field :status, type: String
+  field :status, :type => String
 
   aasm column: :status do
     state :unknown_scope
diff --git a/spec/models/mongoid/simple_new_dsl_mongoid.rb b/spec/models/mongoid/simple_new_dsl_mongoid.rb
index e0406c0..93ec5a5 100644
--- a/spec/models/mongoid/simple_new_dsl_mongoid.rb
+++ b/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
diff --git a/spec/unit/localizer_spec.rb b/spec/unit/localizer_spec.rb
index 95dc4f5..a1a4f71 100644
--- a/spec/unit/localizer_spec.rb
+++ b/spec/unit/localizer_spec.rb
@@ -11,7 +11,7 @@ class LocalizerTestModel < ActiveRecord::Base
   attr_accessor :aasm_state
 
   aasm do
-    state :opened, initial: true
+    state :opened, :initial => true
     state :closed
     event :close
     event :open

From 0e07cdf6c10718fa967520a707473775a119480e Mon Sep 17 00:00:00 2001
From: Lasse Skindstad Ebert <lasseebert@gmail.com>
Date: Mon, 2 Dec 2013 12:19:42 +0100
Subject: [PATCH 20/21] Updated readme for Mongoid

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3adc168..e568554 100644
--- a/README.md
+++ b/README.md
@@ -257,6 +257,7 @@ to include Mongoid::Document before you include AASM.
 class Job
   include Mongoid::Document
   include AASM
+  field :aasm_state
   aasm do
     ...
   end

From 3013c130d5998ee343218d8a85062622bb924c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Sun, 1 Dec 2013 00:35:45 +0100
Subject: [PATCH 21/21] updated Copyright dates and maintainers

---
 LICENSE   |  2 +-
 README.md | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/LICENSE b/LICENSE
index ac1ca3a..6135c51 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Scott Barron
+Copyright (c) 2006-2014 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index f4eda23..c8e216f 100644
--- a/README.md
+++ b/README.md
@@ -418,7 +418,7 @@ gem 'aasm'
 
 ## Latest changes ##
 
-Look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details.
+Take a look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details about recent changes to the current version.
 
 ## Questions? ##
 
@@ -428,11 +428,11 @@ Feel free to
 * [ask a question on StackOverflow](http://stackoverflow.com) (tag with `aasm`)
 * send us a tweet [@aasm](http://twitter.com/aasm)
 
-## Authors ##
+## Maintainers ##
 
-* [Scott Barron](https://github.com/rubyist)
-* [Travis Tilley](https://github.com/ttilley)
-* [Thorsten Böttger](http://github.com/alto)
+* [Scott Barron](https://github.com/rubyist) (2006–2009, original author)
+* [Travis Tilley](https://github.com/ttilley) (2009–2011)
+* [Thorsten Böttger](http://github.com/alto) (since 2011)
 
 
 ## Warranty ##
@@ -444,7 +444,7 @@ purpose.
 
 ## License ##
 
-Copyright (c) 2006-2012 Scott Barron
+Copyright (c) 2006-2014 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the