culturecode_stagehand 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3605105f16b08844ff35d898d5043a4fa7c733
-  data.tar.gz: 9cbedc3a329392ab269dc0cb8ffbe88a65182117
+  metadata.gz: eb03c8a33d965513648b4e8acaca9e956b4d4bdf
+  data.tar.gz: 19882d1cdeed12d6fda5e101676784829ed47a48
 SHA512:
-  metadata.gz: 7644db9843c467270b6afd416c00e1a110ad0098a848d8982082bd63dae120dd255c5866ba4073573ad1f4523b3211b8da71256da7b9fa6e7566fc9d8027d8ea
-  data.tar.gz: 83d51fba48b3190b20cf02df0876db946b87ea198911c0740d2016ae55cc1a4f650d0f502e463be9f8f55ba8137fe5b3bf98316c9460af965bc051b88f0f986a
+  metadata.gz: b6afe7cd3824becaeb9c718650155b5128676fcb78f13514ffc24b9fd3554fc9cc2ba60edd5ba63111276dd2df21786637f7a4587b8238d7786a18f0c015013d
+  data.tar.gz: 2af88daac9cc6828250b3f3429d0534c8c7a567d8ccc1b12f2ef8c3abe08e386d449ae0d705027a989282549758eeb96c624cec07fd90d371a351c1c7877c10f

data/lib/stagehand/database.rb

@@ -28,6 +28,14 @@ module Stagehand
       database_name(Configuration.staging_connection_name)
     end
 
+    def staging_database_versions
+      Stagehand::Database.staging_connection.select_values(versions_scope)
+    end
+
+    def production_database_versions
+      Stagehand::Database.production_connection.select_values(versions_scope)
+    end
+
     def with_connection(connection_name)
       different = current_connection_name != connection_name.to_sym
 
@@ -60,6 +68,10 @@ module Stagehand
       Rails.configuration.database_configuration[connection_name.to_s]['database']
     end
 
+    def versions_scope
+      ActiveRecord::SchemaMigration.order(:version)
+    end
+
     # CLASSES
 
     class StagingProbe < ActiveRecord::Base

data/lib/stagehand/staging/checklist.rb

@@ -129,7 +129,7 @@ module Stagehand
       end
 
       def affected_records
-        cache(:affected_records) { affected_entries.collect(&:record).uniq }
+        cache(:affected_records) { affected_entries.uniq(&:key).collect(&:record).compact }
       end
 
       def affected_entries

data/lib/stagehand/staging/synchronizer.rb

@@ -60,6 +60,13 @@ module Stagehand
         sync_checklist(Checklist.new(record))
       end
 
+      def sync_checklist(checklist)
+        ActiveRecord::Base.transaction do
+          sync_entries(checklist.syncing_entries)
+          CommitEntry.delete(checklist.affected_entries)
+        end
+      end
+
       private
 
       # Lazily iterate through millions of commit entries
@@ -94,13 +101,6 @@ module Stagehand
         return entries
       end
 
-      def sync_checklist(checklist)
-        ActiveRecord::Base.transaction do
-          sync_entries(checklist.syncing_entries)
-          CommitEntry.delete(checklist.affected_entries)
-        end
-      end
-
       def sync_entries(entries)
         raise SchemaMismatch unless schemas_match?
 
@@ -124,12 +124,7 @@ module Stagehand
 
       def schemas_match?
         return schemas_match unless schemas_match.nil?
-
-        versions_scope = ActiveRecord::SchemaMigration.order(:version)
-        staging_versions = Stagehand::Database.staging_connection.select_values(versions_scope)
-        production_versions = Stagehand::Database.production_connection.select_values(versions_scope)
-        self.schemas_match = staging_versions == production_versions
-
+        self.schemas_match = Database.staging_database_versions == Database.production_database_versions
         return schemas_match
       end
 

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.7.9"
+  VERSION = "0.7.10"
 end

data/lib/tasks/stagehand_tasks.rake

@@ -18,14 +18,14 @@ namespace :stagehand do
   desc "Migrate both databases used by stagehand"
   task :migrate => :environment do
     run_on_both_databases do
-      ActiveRecord::Migrator.migrate('db/migrate')
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
     end
   end
 
   desc "Rollback both databases used by stagehand"
   task :rollback => :environment do
     run_on_both_databases do
-      ActiveRecord::Migrator.rollback("db/migrate")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate")
     end
   end
 end

metadata

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