Update syntax of aasm config

The latest version mentions that the old syntax will soon be deprecated.

Author: reidab

app/models/open_conference_ware/proposal.rb

@@ -60,65 +60,64 @@ class Proposal < OpenConferenceWare::Base
     # Acts As State Machine
     include AASM
 
-    aasm_column :status
-
-    aasm_initial_state :proposed
-
-    aasm_state :proposed
-    aasm_state :accepted
-    aasm_state :waitlisted
-    aasm_state :rejected
-    aasm_state :confirmed
-    aasm_state :declined
-    aasm_state :junk
-    aasm_state :cancelled
-
-    aasm_event :accept do
-      transitions from: :proposed, to: :accepted
-      transitions from: :rejected, to: :accepted
-      transitions from: :waitlisted, to: :accepted
-    end
+    aasm(column: :status) do
+
+      state :proposed, initial: true
+      state :accepted
+      state :waitlisted
+      state :rejected
+      state :confirmed
+      state :declined
+      state :junk
+      state :cancelled
+
+      event :accept do
+        transitions from: :proposed, to: :accepted
+        transitions from: :rejected, to: :accepted
+        transitions from: :waitlisted, to: :accepted
+      end
 
-    aasm_event :reject do
-      transitions from: :proposed, to: :rejected
-      transitions from: :accepted, to: :rejected
-      transitions from: :waitlisted, to: :rejected
-    end
+      event :reject do
+        transitions from: :proposed, to: :rejected
+        transitions from: :accepted, to: :rejected
+        transitions from: :waitlisted, to: :rejected
+      end
 
-    aasm_event :waitlist do
-      transitions from: :proposed, to: :waitlisted
-      transitions from: :accepted, to: :waitlisted
-      transitions from: :rejected, to: :waitlisted
-    end
+      event :waitlist do
+        transitions from: :proposed, to: :waitlisted
+        transitions from: :accepted, to: :waitlisted
+        transitions from: :rejected, to: :waitlisted
+      end
 
-    aasm_event :confirm do
-      transitions from: :accepted, to: :confirmed
-    end
+      event :confirm do
+        transitions from: :accepted, to: :confirmed
+      end
 
-    aasm_event :decline do
-      transitions from: :accepted, to: :declined
-    end
+      event :decline do
+        transitions from: :accepted, to: :declined
+      end
 
-    aasm_event :accept_and_confirm do
-      transitions from: :proposed, to: :confirmed
-      transitions from: :waitlisted, to: :confirmed
-    end
+      event :accept_and_confirm do
+        transitions from: :proposed, to: :confirmed
+        transitions from: :waitlisted, to: :confirmed
+      end
 
-    aasm_event :accept_and_decline do
-      transitions from: :proposed, to: :declined
-      transitions from: :waitlisted, to: :declined
-    end
+      event :accept_and_decline do
+        transitions from: :proposed, to: :declined
+        transitions from: :waitlisted, to: :declined
+      end
 
-    aasm_event :mark_as_junk do
-      transitions from: :proposed, to: :junk
-    end
+      event :mark_as_junk do
+        transitions from: :proposed, to: :junk
+      end
 
-    aasm_event :reset_status do
-      transitions from: %w(accepted rejected waitlisted confirmed declined junk cancelled), to: :proposed
-    end
+      event :reset_status do
+        transitions from: %w(accepted rejected waitlisted confirmed declined junk cancelled), to: :proposed
+      end
 
-    aasm_event :cancel  do
-      transitions from: :confirmed, to: :cancelled
+      event :cancel  do
+        transitions from: :confirmed, to: :cancelled
+      end
     end
 
     # Associations
@@ -262,15 +261,15 @@ def end_time
     # representing optional states. Of each pair, the first element is the title,
     # the second is the status.
     def titles_and_statuses
-      result = [["(currently '#{self.aasm_current_state.to_s.titleize}')", nil]]
-      result += self.aasm_events_for_current_state.map{|s|[s.to_s.titleize, s.to_s]}.sort_by{|title, state| title}
+      result = [["(currently '#{self.aasm.current_state.to_s.titleize}')", nil]]
+      result += self.aasm.events(aasm.current_state).map{|s|[s.to_s.titleize, s.to_s]}.sort_by{|title, state| title}
       return result
     end
 
     # allows an interface to state machine through update_attributes transition key
     attr_accessor :transition
     def transition=(event)
-      send("#{event}!") if !event.blank? && aasm_events_for_current_state.include?(event.to_sym)
+      send("#{event}!") if !event.blank? && aasm.events(aasm.current_state).include?(event.to_sym)
     end
 
     # Is this +user+ allowed to alter this proposal?

app/views/open_conference_ware/proposals/_transition_control.html.erb

@@ -8,8 +8,8 @@ proposal ||= @proposal
 %>
 
 <div id="proposal_transition_control_container_<%= proposal.id %>" class="proposal_transition_control_container proposal_control_container">
-  <% if proposal.aasm_events_for_current_state.empty? %>
-    No valid transitions available from status <%= proposal.aasm_current_state %>
+  <% if proposal.aasm.events(proposal.aasm.current_state).empty? %>
+    No valid transitions available from status <%= proposal.aasm.current_state %>
   <% else %>
     <%= select('proposal', 'transition', proposal.titles_and_statuses[1 .. proposal.titles_and_statuses.length], {:include_blank => proposal.titles_and_statuses[0][0]}, {:class => 'proposal_transition_control proposal_control', :x_proposal_id => proposal.id}) %>
   <% end %>

spec/views/open_conference_ware/proposals/_transition_control.html.erb_spec.rb

@@ -2,7 +2,8 @@
 
 describe "open_conference_ware/proposals/_transition_control.html.erb" do
   it "should render a state changing select menu with valid events and destination label" do
-    proposal = stub_model(Proposal, aasm_events_for_current_state: [:accept, :reject])
+    aasm = double("aasm", events: [:accept, :reject], current_state: :proposed)
+    proposal = stub_model(Proposal, aasm: aasm)
     assign(:proposal, proposal)
     render
     rendered.should have_selector("select[name='proposal[transition]']") do |node|