dm-transactions 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 DO_VERSION = '~> 0.10.3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 snusnu
+Copyright (c) 2010 snusnu
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,27 +2,27 @@ require 'rubygems'
 require 'rake'
 
 begin
-
+  gem 'jeweler', '~> 1.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
-    gem.name        = "dm-transactions"
-    gem.summary     = %Q{Adds transaction support to datamapper}
-    gem.description = %Q{Makes transaction support available for adapters that support them}
-    gem.email       = "gamsnjaga@gmail.com"
-    gem.homepage    = "http://github.com/datamapper/dm-transactions"
-    gem.authors     = ["Dirkjan Bussink (dbussink)", "Dan Kubb (dkubb)"]
+    gem.name        = 'dm-transactions'
+    gem.summary     = 'Adds transaction support to datamapper'
+    gem.description = 'Makes transaction support available for adapters that support them'
+    gem.email       = 'gamsnjaga@gmail.com'
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
+    gem.authors     = [ 'Dirkjan Bussink (dbussink)', 'Dan Kubb (dkubb)' ]
 
-    gem.add_dependency 'dm-core', '~> 1.0.0.rc2'
+    gem.rubyforge_project = 'datamapper'
 
-    gem.add_development_dependency 'rspec',   '~> 1.3'
+    gem.add_dependency 'dm-core', '~> 1.0.0.rc3'
 
+    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
-
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-transactions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-transactions}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.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{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{Makes transaction support available for adapters that support them}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-transactions}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Adds transaction support to datamapper}
   s.test_files = [
@@ -64,14 +65,14 @@ 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.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-transactions/adapters/dm-do-adapter.rb

@@ -75,7 +75,8 @@ module DataMapper
 
       # @api private
       def transactions
-        Thread.current[:dm_transactions] ||= []
+        Thread.current[:dm_transactions]            ||= {}
+        Thread.current[:dm_transactions][object_id] ||= []
       end
 
       # Retrieve the current connection for this Adapter.

data/lib/dm-transactions.rb

@@ -390,10 +390,10 @@ module DataMapper
 
     def self.include_transaction_api
       [ :Repository, :Model, :Resource ].each do |name|
-        DataMapper.const_get(name).send(:include, Transaction.const_get(name))
+        DataMapper.const_get(name).send(:include, const_get(name))
       end
-      DataMapper::Repository.adapters.values.each do |adapter|
-        Adapters.include_transaction_api(ActiveSupport::Inflector.demodulize(adapter.class.name))
+      Adapters::AbstractAdapter.descendants.each do |adapter_class|
+        Adapters.include_transaction_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
       end
     end
 
@@ -401,23 +401,22 @@ module DataMapper
 
   module Adapters
 
-    class << self
-
-      def include_transaction_api(const_name)
-        require transaction_extensions(const_name)
+    def self.include_transaction_api(const_name)
+      require transaction_extensions(const_name)
+      if Transaction.const_defined?(const_name)
         adapter = const_get(const_name)
-        if DataMapper::Transaction.const_defined?(const_name)
-          adapter.send(:include, transaction_module(const_name))
-        end
-      rescue LoadError
-        # Silently ignore the fact that no adapter extensions could be required
-        # This means that the adapter in use doesn't support transactions
+        adapter.send(:include, transaction_module(const_name))
       end
+    rescue LoadError
+      # Silently ignore the fact that no adapter extensions could be required
+      # This means that the adapter in use doesn't support transactions
+    end
 
-      def transaction_module(const_name)
-        DataMapper::Transaction.const_get(const_name)
-      end
+    def self.transaction_module(const_name)
+      Transaction.const_get(const_name)
+    end
 
+    class << self
     private
 
       # @api private

data/spec/isolated/require_after_setup_spec.rb

@@ -1,15 +1,13 @@
 require 'spec'
 require 'isolated/require_spec'
 require 'dm-core/spec/setup'
-require 'dm-core/spec/lib/adapter_helpers'
 
 # To really test this behavior, this spec needs to be run in isolation and not
 # as part of the typical rake spec run, which requires dm-transactions upfront
 
-if %w[postgres mysql sqlite oracle sqlserver].include?(ENV['ADAPTER'])
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
 
   describe "require 'dm-transactions after calling DataMapper.setup" do
-    extend DataMapper::Spec::Adapters::Helpers
 
     before(:all) do
       @adapter = DataMapper::Spec.adapter

data/spec/isolated/require_before_setup_spec.rb

@@ -1,15 +1,13 @@
 require 'spec'
 require 'isolated/require_spec'
 require 'dm-core/spec/setup'
-require 'dm-core/spec/lib/adapter_helpers'
 
 # To really test this behavior, this spec needs to be run in isolation and not
 # as part of the typical rake spec run, which requires dm-transactions upfront
 
-if %w[postgres mysql sqlite oracle sqlserver].include?(ENV['ADAPTER'])
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
 
   describe "require 'dm-transactions' before calling DataMapper.setup" do
-    extend DataMapper::Spec::Adapters::Helpers
 
     before(:all) do
       require 'dm-transactions'

data/spec/isolated/require_spec.rb

@@ -1,15 +1,15 @@
 shared_examples_for "require 'dm-transactions'" do
 
-  %w[Repository Model Resource].each do |name|
+  %w[ Repository Model Resource ].each do |name|
     it "should include the transaction api in DataMapper::#{name}" do
-      (DataMapper.const_get(name) < DataMapper::Transaction.const_get(name)).should be_true
+      (DataMapper.const_get(name) < DataMapper::Transaction.const_get(name)).should be(true)
     end
   end
 
   it "should include the transaction api into the adapter" do
-    @adapter.respond_to?(:push_transaction   ).should be_true
-    @adapter.respond_to?(:pop_transaction    ).should be_true
-    @adapter.respond_to?(:current_transaction).should be_true
+    @adapter.respond_to?(:push_transaction   ).should be(true)
+    @adapter.respond_to?(:pop_transaction    ).should be(true)
+    @adapter.respond_to?(:current_transaction).should be(true)
   end
 
 end

data/spec/public/dm-transactions_spec.rb

@@ -93,10 +93,18 @@ describe DataMapper::Resource, 'Transactions' do
     it_should_behave_like 'A Resource supporting Strategic Eager Loading'
   end
 
-  supported_by :postgres, :mysql, :sqlite3, :oracle, :sqlserver do
-    describe '#transaction' do
+  describe '#transaction' do
+    before :all do
+      class ::Author
+        include DataMapper::Resource
+
+        property :name, String, :key => true
+      end
+    end
+
+    supported_by :postgres, :mysql, :sqlite, :oracle, :sqlserver do
       before do
-        @user_model.all.destroy!
+        @user_model.destroy!
       end
 
       it 'should have access to resources presisted before the transaction' do
@@ -134,8 +142,8 @@ describe DataMapper::Resource, 'Transactions' do
         @txn = nil
 
         def doit
-          @user_model.transaction do
-            @txn = Thread.current[:dm_transactions].last
+          @user_model.transaction do |transaction|
+            @txn = transaction
             return
           end
         end
@@ -148,6 +156,33 @@ describe DataMapper::Resource, 'Transactions' do
       it 'should return the last statement in the transaction block' do
         @user_model.transaction { 1 }.should == 1
       end
+
+      with_alternate_adapter do
+        before :all do
+          class ::Article
+            include DataMapper::Resource
+
+            def self.default_repository_name
+              :alternate
+            end
+
+            property :title, String, :key => true
+          end
+
+          DataMapper.auto_migrate!(:alternate)
+        end
+
+        it 'should work with other repositories' do
+          expect {
+            DataMapper.repository.transaction.commit do
+              Author.create(:name => 'Dan Kubb')
+
+              # save a resource to another repository
+              Article.create(:title => 'DataMapper Rocks!')
+            end
+          }.should_not raise_error
+        end
+      end
     end
   end
 end

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-transactions
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Dirkjan Bussink (dbussink)
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,13 +28,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: datamapper
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3