culturecode_stagehand 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38286b5f9333c0db58872b75ebb6bbded9cfa4da
-  data.tar.gz: 26f901f9f273e6622a866f92da44c7a8f65e8b9d
+  metadata.gz: 48752d8e1806f8baad891a8ce01dd27dd7dff724
+  data.tar.gz: ddae11cbab908b9068ee3ab8c4b3f1c77b069bd9
 SHA512:
-  metadata.gz: dd4a38e8b374c151d42818b77b7403f96917c1730330dd94b767fea1e38aa3d8ff74d1804fbe84c22e5d87cd9eafc0fd65a3e337d19de325cb0fb8a8664c3789
-  data.tar.gz: 100c6686c5cdac790b96c60c13f1c56db9814a839f39bc196b5d3da3a53887caff9f559b2f5ca2db054e4031a0fdfdbe433f56e99664c6c7d887b3d03728115a
+  metadata.gz: 2261be0f7fad6f70c400861596e665a7a9fa671dbfa170843486c5ea6e810b571834bc927c8827773ea25a6536c3e59e8dd11e9188f4137552aba2a9234dec05
+  data.tar.gz: 7fb87381e3fba33f2b64e223177052c45960a0ed5031853197876593dd30373b5a79c8c83ff0b66465321767e71c2d035a318e067c015bcb147f8dc24acdff9c

data/lib/stagehand/database.rb

@@ -55,6 +55,19 @@ module Stagehand
       connect_to(current_connection_name) if different
     end
 
+    def transaction
+      success = false
+      output = nil
+      ActiveRecord::Base.transaction do
+        Production::Record.transaction do
+          output = yield
+          success = true
+        end
+        raise ActiveRecord::Rollback unless success
+      end
+      return output
+    end
+
     private
 
     def connect_to(connection_name)

data/lib/stagehand/staging/synchronizer.rb

@@ -11,7 +11,7 @@ module Stagehand
       def sync_now(&block)
         raise SyncBlockRequired unless block_given?
 
-        ActiveRecord::Base.transaction do
+        Database.transaction do
           checklist = Checklist.new(Commit.capture(&block).entries, :preconfirm_subject => false)
           sync_checklist(checklist) unless checklist.requires_confirmation?
         end
@@ -61,7 +61,7 @@ module Stagehand
       end
 
       def sync_checklist(checklist)
-        ActiveRecord::Base.transaction do
+        Database.transaction do
           sync_entries(checklist.syncing_entries)
           CommitEntry.delete(checklist.affected_entries)
         end
@@ -87,9 +87,8 @@ module Stagehand
       # This confirmation is used to guard against writes to the record that occur after loading an initial list of
       # entries that are autosyncable, but before the record is actually synced. To prevent this, a lock on the record
       # is acquired and then the record's autosync eligibility is rechecked before calling the block.
-      # NOTE: This method must be called from within a transaction
       def with_confirmed_autosyncability(entry, &block)
-        ActiveRecord::Base.transaction do
+        Database.transaction do
           CommitEntry.connection.execute("SELECT 1 FROM #{entry.table_name} WHERE id = #{entry.record_id}")
           block.call(entry) if autosyncable_entries(:record_id => entry.record_id, :table_name => entry.table_name).exists?
         end
@@ -112,9 +111,9 @@ module Stagehand
             if Configuration.single_connection?
               next # Avoid deadlocking if the databases are the same
             elsif entry.delete_operation?
-              Stagehand::Production.delete(entry)
+              Production.delete(entry)
             elsif entry.save_operation?
-              Stagehand::Production.save(entry)
+              Production.save(entry)
             end
           end
         end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.7.16"
+  VERSION = "0.7.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - Nicholas Jakobsen