aasm 3.0.12 → 3.0.13

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.13
+
+ * supporting ActiveRecord transactions when firing an event
+
 ## 3.0.12
 
  * aasm_from_states_for_state now supports to filter for specific transition

data/README.md

@@ -5,7 +5,13 @@ This package contains AASM, a library for adding finite state machines to Ruby c
 AASM started as the acts_as_state_machine plugin but has evolved into a more generic library
 that no longer targets only ActiveRecord models. It currently provides adapters for
 [ActiveRecord](http://api.rubyonrails.org/classes/ActiveRecord/Base.html) and
-[Mongoid](http://mongoid.org/).
+[Mongoid](http://mongoid.org/), but it can be used for any Ruby class, no matter its
+parent class.
+
+### Transaction support
+
+Since version 3.0.13 AASM supports ActiveRecord transactions. So whenever a transition
+callback fails, all changes to any database record are rolled back.
 
 ## Features ##
 

data/lib/aasm/aasm.rb

@@ -7,7 +7,7 @@ module AASM
       AASM::StateMachine[base] = AASM::StateMachine.new('')
     end
     AASM::Persistence.set_persistence(base)
-   super
+    super
   end
 
   module ClassMethods
@@ -72,7 +72,7 @@ module AASM
     def aasm_human_event_name(event)
       AASM::SupportingClasses::Localizer.new.human_event_name(self, event)
     end
-  end
+  end # ClassMethods
 
   # this method does what? does it deliver the current state?
   def aasm_current_state

data/lib/aasm/persistence/active_record_persistence.rb

@@ -42,7 +42,7 @@ module AASM
           base.before_validation(:aasm_ensure_initial_state, :on => :create)
         else
           base.before_validation_on_create(:aasm_ensure_initial_state)
-        end        
+        end
       end
 
       module ClassMethods
@@ -149,6 +149,12 @@ module AASM
           aasm_enter_initial_state if send(self.class.aasm_column).blank?
         end
 
+        def aasm_fire_event(name, options, *args)
+          transaction do
+            super
+          end
+        end
+
       end
 
       module WriteStateWithoutPersistence

data/lib/aasm/version.rb

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

data/spec/models/transactor.rb

@@ -0,0 +1,26 @@
+require 'active_record'
+class Transactor < ActiveRecord::Base
+
+  belongs_to :worker
+
+  include AASM
+  aasm :column => :status do
+    state :sleeping, :initial => true
+    state :running, :before_enter => :start_worker, :after_enter => :fail
+
+    event :run do
+      transitions :to => :running, :from => :sleeping
+    end
+  end
+
+private
+
+  def start_worker
+    worker.update_attribute(:status, 'running')
+  end
+
+  def fail
+    raise StandardError.new('failed on purpose')
+  end
+
+end

data/spec/models/worker.rb

@@ -0,0 +1,2 @@
+class Worker < ActiveRecord::Base
+end

data/spec/schema.rb

@@ -11,6 +11,17 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string "status"
   end
 
+  create_table "transactors", :force => true do |t|
+    t.string "name"
+    t.string "status"
+    t.integer "worker_id"
+  end
+
+  create_table "workers", :force => true do |t|
+    t.string "name"
+    t.string "status"
+  end
+
   create_table "invalid_persistors", :force => true do |t|
     t.string "name"
     t.string "status"

data/spec/unit/active_record_persistence_spec.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'active_record'
 require 'logger'
+require 'spec_helper'
 
 load_schema
 
@@ -317,4 +318,17 @@ describe 'transitions with persistence' do
     persistor.should_not be_sleeping
   end
 
+  describe 'transactions' do
+    it 'should rollback all changes' do
+      worker = Worker.create!(:name => 'worker', :status => 'sleeping')
+      transactor = Transactor.create!(:name => 'transactor', :worker => worker)
+      transactor.should be_sleeping
+      worker.status.should == 'sleeping'
+
+      lambda {transactor.run!}.should raise_error(StandardError, 'failed on purpose')
+      transactor.should be_running
+      worker.reload.status.should == 'sleeping'
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70194149278160 !ruby/object:Gem::Requirement
+  requirement: &70225605361380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149278160
+  version_requirements: *70225605361380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70194149277740 !ruby/object:Gem::Requirement
+  requirement: &70225605360580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149277740
+  version_requirements: *70225605360580
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70194149277320 !ruby/object:Gem::Requirement
+  requirement: &70225605359780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149277320
+  version_requirements: *70225605359780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70194149276820 !ruby/object:Gem::Requirement
+  requirement: &70225605358760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70194149276820
+  version_requirements: *70225605358760
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70194149276400 !ruby/object:Gem::Requirement
+  requirement: &70225605358000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149276400
+  version_requirements: *70225605358000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70194149275940 !ruby/object:Gem::Requirement
+  requirement: &70225605357260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149275940
+  version_requirements: *70225605357260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70194149275520 !ruby/object:Gem::Requirement
+  requirement: &70225605356360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149275520
+  version_requirements: *70225605356360
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70194149275100 !ruby/object:Gem::Requirement
+  requirement: &70225605355320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149275100
+  version_requirements: *70225605355320
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70194149306160 !ruby/object:Gem::Requirement
+  requirement: &70225605367020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194149306160
+  version_requirements: *70225605367020
 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
@@ -152,7 +152,9 @@ files:
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
 - spec/models/sub_classing.rb
+- spec/models/transactor.rb
 - spec/models/validator.rb
+- spec/models/worker.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: State machine mixin for Ruby objects
@@ -202,7 +204,9 @@ test_files:
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
 - spec/models/sub_classing.rb
+- spec/models/transactor.rb
 - spec/models/validator.rb
+- spec/models/worker.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/models_spec_helper.rb