culturecode_stagehand 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2a6a3a01c856120842f041db2e36a5193513d4
-  data.tar.gz: f805ae100d46bd539e53bb2b611cb2a8c520b343
+  metadata.gz: ebe04760e55e6d7992dc33a533344a37d1a60bf9
+  data.tar.gz: 65d6cc9f67b085aa2dcc2ffc84ace152dbe738a9
 SHA512:
-  metadata.gz: 48fc4eeb89f87e4be85eca8da20829ce088b6684094b633d5b2f6751b3a0725ad3edb93db1b0eb7335eeef99993a0f11040cc374fcbd3a31dea98f0426f0cfe8
-  data.tar.gz: 6688e3bcfa1776c98280f6ac4a33898f99365c50d2763683eb7cf0e36773dc65c5a4088ed6f218a69a1ee542004ee0055dc4e45d87a1c7ee6ec2b50ec1a5affd
+  metadata.gz: 8d458df495b75a654cecd2a26f021416ea3034e33a8f36e139862417cdbaae3d023f7c9770f5028237e59e828389547c4bcd13c49bd618cf1050e76a1e1358a9
+  data.tar.gz: 8aadc05d246c120cfc960020aa6bbfee8fc8472a435793231227bc3196def7ff526f4fb6841d55407dc9cd6349a3520a75842892029f383c353600497c6d6331

data/lib/stagehand/database.rb

@@ -9,12 +9,12 @@ module Stagehand
       with_staging_connection(&block)
     end
 
-    def connected_to_production?
-      current_connection_name == Configuration.production_connection_name
+    def connected_to_production?(klass = ActiveRecord::Base)
+      klass.connection.current_database == production_database_name
     end
 
-    def connected_to_staging?
-      current_connection_name == Configuration.staging_connection_name
+    def connected_to_staging?(klass = ActiveRecord::Base)
+      klass.connection.current_database == staging_database_name
     end
 
     def production_connection

data/lib/stagehand/staging/commit_entry.rb

@@ -15,25 +15,29 @@ module Stagehand
       CONTENT_OPERATIONS = [INSERT_OPERATION, UPDATE_OPERATION, DELETE_OPERATION]
       SAVE_OPERATIONS = [INSERT_OPERATION, UPDATE_OPERATION]
 
-      scope :start_operations,   lambda { where(:operation => START_OPERATION) }
-      scope :end_operations,     lambda { where(:operation => END_OPERATION) }
-      scope :control_operations, lambda { where(:operation => CONTROL_OPERATIONS) }
-      scope :content_operations, lambda { where(:operation => CONTENT_OPERATIONS) }
-      scope :save_operations,    lambda { where(:operation => SAVE_OPERATIONS) }
-      scope :delete_operations,  lambda { where(:operation => DELETE_OPERATION) }
-      scope :with_record,        lambda { where.not(:record_id => nil) }
-      scope :uncontained,        lambda { where(:commit_id => nil) }
-      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 = #{table_name}.session AND active_starts.start_id <= #{table_name}.id")
-       .where("active_starts.start_id IS NULL") }
-      scope :with_uncontained_keys, lambda {
-        uncontained
-        .joins("LEFT OUTER JOIN (#{ unscoped.contained.select('record_id, table_name').distinct.to_sql}) AS contained
+      scope :start_operations,      lambda { where(:operation => START_OPERATION) }
+      scope :end_operations,        lambda { where(:operation => END_OPERATION) }
+      scope :control_operations,    lambda { where(:operation => CONTROL_OPERATIONS) }
+      scope :content_operations,    lambda { where(:operation => CONTENT_OPERATIONS) }
+      scope :save_operations,       lambda { where(:operation => SAVE_OPERATIONS) }
+      scope :delete_operations,     lambda { where(:operation => DELETE_OPERATION) }
+      scope :with_record,           lambda { where.not(:record_id => nil) }
+      scope :uncontained,           lambda { where(:commit_id => nil) }
+      scope :contained,             lambda { where.not(:commit_id => nil) }
+      scope :no_newer_than,         lambda {|entry| where("id <= ?", entry) }
+      scope :in_progress,           lambda { joins_active_commits }
+      scope :not_in_progress,       lambda { joins_active_commits("LEFT OUTER").where("active_commits.commit_id IS NULL") }
+      scope :with_uncontained_keys, lambda { uncontained.joins_contained("LEFT OUTER").where("contained.record_id IS NULL") }
+
+      def self.joins_active_commits(type = "INNER")
+        joins("#{type} JOIN (#{ unscoped.select('session, MAX(id) AS commit_id').uncontained.start_operations.group('session').to_sql }) AS active_commits
+               ON active_commits.session = #{table_name}.session AND active_commits.commit_id <= #{table_name}.id")
+      end
+
+      def self.joins_contained(type = "INNER")
+        joins("#{type} JOIN (#{ unscoped.contained.select('record_id, table_name').distinct.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")
-      }
+      end
 
       def self.matching(object)
         keys = Array.wrap(object).collect {|entry| Stagehand::Key.generate(entry) }.compact

data/lib/stagehand/staging/synchronizer.rb

@@ -30,12 +30,15 @@ module Stagehand
       def sync(limit = nil)
         synced_count = 0
         deleted_count = 0
+        in_progress = nil
 
         Rails.logger.info "Syncing"
+
         iterate_autosyncable_entries do |entry|
           sync_entry(entry, :callbacks => :sync)
           synced_count += 1
-          deleted_count += CommitEntry.matching(entry).delete_all
+          in_progress ||= CommitEntry.in_progress.pluck(:id)
+          deleted_count += CommitEntry.matching(entry).no_newer_than(entry).where.not(:id => in_progress).delete_all
           break if synced_count == limit
         end
 

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

metadata

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