culturecode_stagehand 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d275b336114ac293617e2cf4466dc2d7ce98c3e
-  data.tar.gz: 7846cb496845f2e46cc79a52e9f123f824e52089
+  metadata.gz: 32aa6c36c7e088a7ced2a1ba65eb7bebf49403b0
+  data.tar.gz: c57ef59b9cd02ca2576e7360a57dd50285e24ec2
 SHA512:
-  metadata.gz: 1968350dfdabf2ef4fbdb3fd2f42d7d98b4e6f86bdb68a07b066850dc1a67d7de00d07c7c867a00b8ad801c6170d8879e386fbb71dd4d4b9f82d7fd71f1c57a3
-  data.tar.gz: 123c82e038abf8453a4a802ae125ee88fdec7d1fd180241b068161a243f86fd8156cc93c05948b0f7874093ec79f5269884ff28e3e47a37ee1cb76b00c5d40c1
+  metadata.gz: fc7407c7a397721ffbf567d24a4917958b1a97ef6acbdb7d9a1828f875ca043cf5081fbb45b5190a5d2906d3f3ffc2bbc66fe6bc8b136e04798f0aa500067bd5
+  data.tar.gz: cc5115eb348fa1a58ab94835dfba2752d6f906fbe6b394f1a70a19963ee91bb33d183d440c74b31ded684589dd4e953ff1f2c02ad7a9b4996450353876a6b2d3

data/lib/stagehand/schema.rb

@@ -16,9 +16,10 @@ module Stagehand
           t.string :session
         end
 
-        add_index :stagehand_commit_entries, :commit_id
-        add_index :stagehand_commit_entries, :operation
-        add_index :stagehand_commit_entries, [:record_id, :table_name]
+        add_index :stagehand_commit_entries, :commit_id # Used for looking up all entries within a commit
+        add_index :stagehand_commit_entries, :operation # Mostly used for looking up start entries
+        add_index :stagehand_commit_entries, [:record_id, :table_name] # Used for 'matching' scope
+        add_index :stagehand_commit_entries, [:operation, :commit_id] # Used for 'not_in_progress' scope
 
         # Create trigger to initialize session using a function
         ActiveRecord::Base.connection.execute("DROP TRIGGER IF EXISTS stagehand_session_trigger;")

data/lib/stagehand/staging/commit_entry.rb

@@ -26,8 +26,13 @@ module Stagehand
       scope :contained,          lambda { where.not(:commit_id => nil) }
       scope :not_in_progress,    lambda {
         joins("LEFT OUTER JOIN (#{ unscoped.select('session, MAX(id) AS start_id').uncontained.start_operations.group('session').to_sql }) AS active_starts
-               ON active_starts.session = stagehand_commit_entries.session AND active_starts.start_id <= stagehand_commit_entries.id")
+               ON active_starts.session = #{table_name}.session AND active_starts.start_id <= #{table_name}.id")
        .where("active_starts.start_id IS NULL") }
+      scope :with_uncontained_keys, lambda {
+        joins("LEFT OUTER JOIN (#{ unscoped.contained.select('record_id, table_name').to_sql}) AS contained
+               ON contained.record_id = #{table_name}.record_id AND contained.table_name = #{table_name}.table_name")
+        .where("contained.record_id IS NULL")
+      }
 
       def self.matching(object)
         keys = Array.wrap(object).collect {|entry| Stagehand::Key.generate(entry) }.compact

data/lib/stagehand/staging/synchronizer.rb

@@ -69,7 +69,7 @@ module Stagehand
         offset = 0
 
         while sessions.present?
-          autosyncable_entries(:session => sessions.shift(30)).offset(offset).limit(BATCH_SIZE).each do |entry|
+          autosyncable_entries(:session => sessions.shift(30)).offset(offset).limit(BATCH_SIZE).uniq(&:id).each do |entry|
             with_confirmed_autosyncability(entry, &block)
           end
           offset += BATCH_SIZE
@@ -88,16 +88,10 @@ module Stagehand
         end
       end
 
-      # Returns commit entries in ID descending order
       def autosyncable_entries(scope = nil)
-        entries = CommitEntry.content_operations.not_in_progress
-
-        unless Configuration.ghost_mode?
-          subquery = CommitEntry.group('record_id, table_name').having('count(commit_id) = 0').where(scope)
-          entries = entries.joins("JOIN (#{subquery.select('MAX(id) AS max_id').to_sql}) subquery ON id = max_id")
-        end
-
-        return entries.order(:id => :desc)
+        entries = CommitEntry.content_operations.not_in_progress.where(scope).order(:id => :desc)
+        entries = entries.with_uncontained_keys unless Configuration.ghost_mode?
+        return entries
       end
 
       def sync_checklist(checklist)

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/tasks/stagehand_tasks.rake

@@ -6,7 +6,8 @@ namespace :stagehand do
 
   desc "Syncs records that don't need confirmation to production"
   task :sync, [:limit] => :environment do |t, args|
-    Stagehand::Staging::Synchronizer.sync(args[:limit])
+    limit = args[:limit].present? ? args[:limit].to_i : nil
+    Stagehand::Staging::Synchronizer.sync(limit)
   end
 
   desc "Syncs all records to production, including those that require confirmation"

metadata

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