after_commit 1.0.3 → 1.0.4

data/README.textile

@@ -43,9 +43,9 @@ This version (maintained by Pat Allan) includes the following patches:
 
 * Callbacks for specific types of actions (create, update, destroy) ("DeLynn Berry":http://delynnberry.com/)
 * Fixes to extra callbacks ("Xavier Shay":http://rhnh.net/)
-* Gemspec and extended tests ("David Yip":http://github.com/yipdw)
 * Thread-safety ("Dmitry Galinsky":http://dima-exe.ru/)
 * after_rollback callback ("Justin Balthrop":http://github.com/ninjudd)
 * Test environment fix ("Pivotal Labs":http://pivotalblabs.com/)
 * Scoping callbacks to specific connections ("Mat Brown":http://outofti.me/)
 * before_* callbacks ("Trotter Cashion":http://trottercashion.com/)
+* Gemspec and extended tests, works as a plugin, doesn't load ActiveRecord hooks twice, doesn't add Test environment hook automatically. ("David Yip":http://github.com/yipdw)

data/lib/after_commit.rb

@@ -67,11 +67,4 @@ require 'after_commit/connection_adapters'
 require 'after_commit/test_bypass'
 
 ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
-
-Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each do |klass|
-  klass.send(:include, AfterCommit::ConnectionAdapters)
-end
-
-if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
-  JdbcSpec::MySQL.send :include, AfterCommit::ConnectionAdapters
-end
+ActiveRecord::Base.include_after_commit_extensions

data/lib/after_commit/active_record.rb

@@ -2,6 +2,34 @@ module AfterCommit
   module ActiveRecord
     def self.included(base)
       base.class_eval do
+        class << self
+          def establish_connection_with_after_commit(spec = nil)
+            establish_connection_without_after_commit spec
+            include_after_commit_extensions
+          end
+          alias_method_chain :establish_connection, :after_commit
+          
+          def include_after_commit_extensions
+            base = ::ActiveRecord::ConnectionAdapters::AbstractAdapter
+            Object.subclasses_of(base).each do |klass|
+              include_after_commit_extension klass
+            end
+            
+            if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
+              include_after_commit_extension JdbcSpec::MySQL
+            end
+          end
+          
+          private
+          
+          def include_after_commit_extension(adapter)
+            additions = AfterCommit::ConnectionAdapters
+            unless adapter.included_modules.include?(additions)
+              adapter.send :include, additions
+            end
+          end
+        end
+        
         # The define_callbacks method was added post Rails 2.0.2 - if it
         # doesn't exist, we define the callback manually
         if respond_to?(:define_callbacks)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: after_commit
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 +11:00
+date: 2009-11-25 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,6 @@ files:
 - lib/after_commit/active_record.rb
 - lib/after_commit/connection_adapters.rb
 - lib/after_commit/test_bypass.rb
-- rails/init.rb
 - README.textile
 has_rdoc: true
 homepage: http://github.com/freelancing-god/after_commit

data/rails/init.rb

@@ -1,6 +0,0 @@
-require 'after_commit'
-
-ActiveRecord::Base.class_eval do 
-  include AfterCommit::ActiveRecord
-  include AfterCommit::TestBypass if RAILS_ENV == 'test'
-end