culturecode_stagehand 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e520882c8b93a387eaf5be62f54f978efef01ed
-  data.tar.gz: b3f249ffbcac57b013e587f93d915c6f75515710
+  metadata.gz: '091f0329dd66eeb808a7a8efc8ee5741adf0b784'
+  data.tar.gz: 1f1fb675ec96bde1b1eba99dee37e32589bf3833
 SHA512:
-  metadata.gz: 7d2555054b079e1278b584a9d5589f485041ac4125eaef11731461a7ec546c16468fef0ea23cdfd9993d55be8b8a19fb88f3e0dc3d1691ce58459b16b407cf50
-  data.tar.gz: 7206daab7937c07059e28226d88f582323dd171ac543ed4b739143a8439a7df2b9db8c9bfff9630a450441e47c54756d51fe8541075bc1209fec6355deb84d7f
+  metadata.gz: f887b8666704eea9831568b093dfbcdbe7a53662f735b97fd07370563e9885ddcddf46d2a7aa070930a628e032ead9b9c2f65256723773875421a24927f129af
+  data.tar.gz: b0697843d0c5f03a3400e34114aa55448ed36c8e19f9a7ede070e2b9aa0d072ea353574703a2eb4be422fcdc761980f14de1c2a1fbb0a25061d8e8a63b331269

data/lib/stagehand/active_record_extensions.rb

@@ -1,14 +1,6 @@
 ActiveRecord::Base.class_eval do
   # SYNC CALLBACKS
-  define_callbacks :sync
-
-  def self.before_sync(method, options = {})
-    set_callback :sync, :before, method, options
-  end
-
-  def self.after_sync(method, options = {})
-    set_callback :sync, :after, method, options
-  end
+  define_model_callbacks :sync, :sync_as_subject, :sync_as_affected
 
   # SYNC STATUS
   def self.inherited(subclass)

data/lib/stagehand/staging/checklist.rb

@@ -146,6 +146,10 @@ module Stagehand
         end
       end
 
+      def subject_entries
+        cache(:subject_entries) { CommitEntry.matching(@subject) }
+      end
+
       private
 
       def grouped_required_confirmation_entries

data/lib/stagehand/staging/synchronizer.rb

@@ -33,7 +33,7 @@ module Stagehand
 
         Rails.logger.info "Syncing"
         iterate_autosyncable_entries do |entry|
-          sync_entries(entry)
+          sync_entry(entry, :callbacks => :sync)
           synced_count += 1
           deleted_count += CommitEntry.matching(entry).delete_all
           break if synced_count == limit
@@ -51,7 +51,7 @@ module Stagehand
           break unless entries.present?
 
           latest_entries = entries.uniq(&:key)
-          sync_entries(latest_entries)
+          latest_entries.each {|entry| sync_entry(entry, :callbacks => :sync) }
           Rails.logger.info "Synced #{latest_entries.count} entries"
 
           deleted_count = CommitEntry.matching(latest_entries).delete_all
@@ -66,7 +66,14 @@ module Stagehand
 
       def sync_checklist(checklist)
         Database.transaction do
-          sync_entries(checklist.syncing_entries)
+          checklist.syncing_entries.each do |entry|
+            if checklist.subject_entries.include?(entry)
+              sync_entry(entry, :callbacks => [:sync, :sync_as_subject])
+            else
+              sync_entry(entry, :callbacks => [:sync, :sync_as_affected])
+            end
+          end
+
           CommitEntry.delete(checklist.affected_entries)
         end
       end
@@ -106,25 +113,19 @@ module Stagehand
         return entries
       end
 
-      def sync_entries(entries)
+      def sync_entry(entry, callbacks: [])
         raise SchemaMismatch unless schemas_match?
 
-        entries = Array.wrap(entries)
-
-        entries.each do |entry|
-          run_sync_callbacks(entry) do
-            Rails.logger.info "Synchronizing #{entry.table_name} #{entry.record_id}" if entry.content_operation?
-            if Configuration.single_connection?
-              next # Avoid deadlocking if the databases are the same
-            elsif entry.delete_operation?
-              Production.delete(entry)
-            elsif entry.save_operation?
-              Production.save(entry)
-            end
+        run_sync_callbacks(entry, callbacks) do
+          Rails.logger.info "Synchronizing #{entry.table_name} #{entry.record_id}" if entry.content_operation?
+          if Configuration.single_connection?
+            next # Avoid deadlocking if the databases are the same
+          elsif entry.delete_operation?
+            Production.delete(entry)
+          elsif entry.save_operation?
+            Production.save(entry)
           end
         end
-
-        return entries.length
       end
 
       def schemas_match?
@@ -133,8 +134,13 @@ module Stagehand
         return schemas_match
       end
 
-      def run_sync_callbacks(entry, &block)
-        entry.record.run_callbacks(:sync, &block) if entry.record
+      def run_sync_callbacks(entry, callbacks, &block)
+        callbacks = Array.wrap(callbacks).dup
+        return block.call unless entry.record && callbacks.present?
+
+        entry.record.run_callbacks(callbacks.shift) do
+          run_sync_callbacks(entry, callbacks, &block)
+        end
       end
     end
   end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

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