dm-transactions 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-transactions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-transactions}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirkjan Bussink (dbussink)", "Dan Kubb (dkubb)"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{Makes transaction support available for adapters that support them}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-transactions}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Adds transaction support to datamapper}
   s.test_files = [
     "spec/isolated/require_after_setup_spec.rb",
@@ -59,18 +59,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/spec/public/dm-transactions_spec.rb

@@ -102,6 +102,40 @@ describe DataMapper::Resource, 'Transactions' do
       end
     end
 
+    supported_by :postgres, :mysql do
+      before do
+        @user_model.destroy!
+      end
+
+      it 'should support nested transactions' do
+        # can't assume dm-aggregates
+        begin
+          @user_model.all.length.should == 0
+
+          @user_model.transaction do # txn 1
+            @user_model.create(:name => 'jpr5')
+
+            @user_model.all.length.should == 1
+
+            begin
+              @user_model.transaction do # savepoint 1
+                @user_model.create(:name => 'dkubb')
+                @user_model.all.length.should == 2
+
+                raise
+              end
+            rescue => e
+              @user_model.all.length.should == 1
+            end
+
+            raise
+          end
+        rescue => e
+          @user_model.all.length.should == 0
+        end
+      end
+    end
+
     supported_by :postgres, :mysql, :sqlite, :oracle, :sqlserver do
       before do
         @user_model.destroy!
@@ -127,7 +161,7 @@ describe DataMapper::Resource, 'Transactions' do
         end
       end
 
-      it 'should rollback when an error is thrown in a transaction' do
+      it 'should rollback when an error is raised in a transaction' do
         @user_model.all.size.should == 0
         lambda {
           @user_model.transaction do

metadata

@@ -2,7 +2,7 @@
 name: dm-transactions
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Dirkjan Bussink (dbussink)
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Adds transaction support to datamapper