prefactory 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b705b09aea1ed091cbd6a46aabd4df33438cb214
-  data.tar.gz: 7f82cb399ee76a7d2aea8ceed15dc6d57b849b7b
+  metadata.gz: c1abdafe59af749590d226bcdb0b63c04f365832
+  data.tar.gz: 8553ebbca23fce19f82b16a8d89928165fafdfd2
 SHA512:
-  metadata.gz: c3e66b35c17a5cccda2760a423962ba89f04d9882aa6d7dbdebd006915ae1a706534bd5162ebaef35e04af29203024e86f11e726fc61dbf7b0c294e907049924
-  data.tar.gz: 6324783baa9b74fe4870ff811f21866b091aa4f89ca4ddc6eefde4359a6ac0a17e023335a63ab01d7903c11cb814ccdea80838c25daa6386fdb7a3bae08be434
+  metadata.gz: a224b382181a1d36f12adef59627e7f75f82ff11f1d530ce2fb201c6ffa9d759587a9a657b6e6ec2a6260f095870a5cd0296a0c35fad6e2f414a5286b881de2d
+  data.tar.gz: 8b14d70581d33d8993ea9e306573d77d2726e17fab359b8642b216a4743ee998d24cf3a79a79f998df85bdf6a7c70dcaff72532159661d3f9eac09b7cb6f40e2

data/.travis.yml

@@ -8,3 +8,4 @@ env:
   - ACTIVE_RECORD_VERSION=4.0.0
   - ACTIVE_RECORD_VERSION=4.1.0 RSPEC_VERSION=2.99
   - ACTIVE_RECORD_VERSION=4.1.0
+  - ACTIVE_RECORD_VERSION=4.2.0.beta3

data/lib/prefactory/active_record_integration.rb

@@ -67,23 +67,47 @@ module ActiveRecord
       # If the savepoint was already released, we have an exception in an after-commit callback.
       # That means *this* transaction cannot and should not be rolled back, unlike the parent
       # transactions, which will roll back as the exception bubbles upwards.
-      def perform_rollback
-        unless @savepoint_already_released
-          connection.rollback_to_savepoint
-          rollback_records
+
+      if ActiveRecord.version.to_s.start_with?('4.2')
+        def rollback
+          unless @savepoint_already_released
+            connection.rollback_to_savepoint(savepoint_name)
+            super
+            rollback_records
+          end
         end
-      end
 
-      def perform_commit
-        connection.release_savepoint
-        if @fake_commit
-          @savepoint_already_released = true
-          commit_records
-        else
-          records.each { |r| parent.add_record(r) }
+        def commit
+          connection.release_savepoint(savepoint_name)
+          super
+          if @fake_commit
+            @savepoint_already_released = true
+            commit_records
+          else
+            parent = connection.transaction_manager.current_transaction
+            records.each { |r| parent.add_record(r) }
+          end
         end
-      end
 
+      else
+
+        def perform_rollback
+          unless @savepoint_already_released
+            connection.rollback_to_savepoint
+            rollback_records
+          end
+        end
+
+        def perform_commit
+          connection.release_savepoint
+          if @fake_commit
+            @savepoint_already_released = true
+            commit_records
+          else
+            records.each { |r| parent.add_record(r) }
+          end
+        end
+      end
     end
   end
 end

data/lib/prefactory/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module Prefactory
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/prefactory.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rspec_around_all', '~> 0'
   spec.add_dependency('rspec', rspec_version) if rspec_version
   spec.add_dependency 'activerecord', active_record_version
+  spec.add_dependency 'railties', active_record_version
   spec.add_dependency 'factory_girl_rails', '~> 4'
 
   spec.add_development_dependency 'mysql2', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefactory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - developers@socialcast.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_around_all
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement