culturecode_stagehand 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057a8710cbdfb48d9e7214e04f9dd9b506d18caf
-  data.tar.gz: 300b3dd8173a519ad7f8c492c1362bf0e939b8e9
+  metadata.gz: e0691ceae72d5001db6bd38f259157f4a82dff1e
+  data.tar.gz: 09816a1e820606659d76695e32854109979e024a
 SHA512:
-  metadata.gz: 2030b34bb3b871e5498bc1b9a4be1e757d07978f34c9106f2456fffdd7e0677f96eb526a72dc5fe2cf42bb8d3e97f6f0aae857cd4dd65e97cbe2f30e5bc03f56
-  data.tar.gz: d796af03288f26476ef2d8bac65ead9996ca22a94627eabab589e34eeb19fdc2552ce2fd27388eb7f6c02aa08b5745384bee276c021e06d897c94d706de5a662
+  metadata.gz: dbe697859ad03c61ece9f6f0e986933dcb6266f86eeecc6d3a13c3775ae1d8063c5721888637055f8bf93ef5099d384d2ea6ee0e5d937001f4cc87f2da2f2100
+  data.tar.gz: 68dbd5120d87b68da524d3de44d77368ce810ca1a205ab6cc73d0ac5b5ae0702f89750f58068a215642aa871ad4796dde4701bfa0484159fbbd0a1240acd0976

data/lib/stagehand/staging/synchronizer.rb

@@ -102,8 +102,8 @@ module Stagehand
         return unless entries.present?
 
         Database.transaction do
-          # Lock the records so nothing can update them
-          CommitEntry.connection.execute(CommitEntry.where(:id => entries).lock.to_sql)
+          # Lock the records so nothing can update them after we confirm autosyncability
+          acquire_record_locks(entries)
 
           # Execute the block for each entry we've confirm autosyncability
           confirmed_ids = Set.new(autosyncable_entries.where(:id => entries).pluck(:id))
@@ -114,6 +114,12 @@ module Stagehand
         end
       end
 
+      # Does not actually acquire a lock, instead it triggers a 'first read' so the transaction will ensure subsequent
+      # reads of the locked rows return the same value, even if modified outside of the transaction
+      def acquire_record_locks(entries)
+        entries.each(&:record)
+      end
+
       def autosyncable_entries(scope = nil)
         entries = CommitEntry.content_operations.not_in_progress.where(scope)
         entries = entries.with_uncontained_keys unless Configuration.ghost_mode?
@@ -143,7 +149,7 @@ module Stagehand
 
       def run_sync_callbacks(entry, callbacks, &block)
         callbacks = Array.wrap(callbacks).dup
-        return block.call unless entry.record && callbacks.present?
+        return block.call unless callbacks.present? && entry.record
 
         entry.record.run_callbacks(callbacks.shift) do
           run_sync_callbacks(entry, callbacks, &block)

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.14.3"
+  VERSION = "0.14.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails