aasm 3.0.20 → 3.0.21

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 3.0.21
+
+ * support nested ActiveRecord transactions ([@ozeias](https://github.com/ozeias))
+ * allow overwriting of events, can be very useful with inheritance ([@Intrepidd](https://github.com/Intrepidd))
+
 ## 3.0.20
 
  * added configuration option to disable automatic scope creation

data/README.md

@@ -1,4 +1,6 @@
-# AASM - Ruby state machines [![Build Status](https://secure.travis-ci.org/aasm/aasm.png)](http://travis-ci.org/aasm/aasm) [![Code Climate](https://codeclimate.com/github/aasm/aasm.png)](https://codeclimate.com/github/aasm/aasm) [![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
+# AASM - Ruby state machines
+
+[![Build Status](https://secure.travis-ci.org/aasm/aasm.png?branch=master)](http://travis-ci.org/aasm/aasm) [![Code Climate](https://codeclimate.com/github/aasm/aasm.png)](https://codeclimate.com/github/aasm/aasm) [![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 

data/lib/aasm/base.rb

@@ -48,9 +48,7 @@ module AASM
     def event(name, options={}, &block)
       # @clazz.aasm_event(name, options, &block)
 
-      unless @state_machine.events.has_key?(name)
-        @state_machine.events[name] = AASM::Event.new(name, options, &block)
-      end
+      @state_machine.events[name] = AASM::Event.new(name, options, &block)
 
       # an addition over standard aasm so that, before firing an event, you can ask
       # may_event? and get back a boolean that tells you whether the guard method

data/lib/aasm/persistence/active_record_persistence.rb

@@ -132,7 +132,7 @@ module AASM
         end
 
         def aasm_fire_event(name, options, *args)
-          transaction do
+          transaction(:requires_new => true) do
             super
           end
         end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.20"
+  VERSION = "3.0.21"
 end

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -179,9 +179,10 @@ describe 'transitions with persistence' do
   end
 
   describe 'transactions' do
+    let(:worker) { Worker.create!(:name => 'worker', :status => 'sleeping') }
+    let(:transactor) { Transactor.create!(:name => 'transactor', :worker => worker) }
+
     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'
 
@@ -189,6 +190,17 @@ describe 'transitions with persistence' do
       transactor.should be_running
       worker.reload.status.should == 'sleeping'
     end
-  end
 
+    it "should rollback all changes in nested transaction" do
+      transactor.should be_sleeping
+      worker.status.should == 'sleeping'
+
+      Worker.transaction do
+        lambda { transactor.run! }.should raise_error(StandardError, 'failed on purpose')
+      end
+
+      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.20
+  version: 3.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -12,27 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071498180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.12
+  version_requirements: *70183071498180
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071497520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,15 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071497520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071497060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,15 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071497060
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071496640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,15 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071496640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071496140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,15 +68,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70183071496140
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071495720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,15 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071495720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071495260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,15 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071495260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071494840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -136,15 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071494840
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071494420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -152,15 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071494420
 - !ruby/object:Gem::Dependency
   name: coveralls
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70183071494000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -168,12 +123,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70183071494000
 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
@@ -273,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: State machine mixin for Ruby objects