culturecode_stagehand 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1ca6b2ede30dbeed3da3f4800d413bcf60034f
-  data.tar.gz: ef9a06e54ec5318e811818b3243d52da2af98b09
+  metadata.gz: 764024a2751221f034e59dd01d47ba537c18231c
+  data.tar.gz: 306cb8e2ab525a4b85c13bcc7cb818572158127d
 SHA512:
-  metadata.gz: 2e42ce38a3a24048d9574aed6c3318668fe7809518669cfa0f34e23d4c91e3ca5199be9b11772cfb58283dd4098f3e0d6c0e2023d0fe6f400b76d7ebab6f12b0
-  data.tar.gz: c147dd44ef36edd4f8b28e8711e27a97233614586bbec766a2508ede2c3a7c3618e8e6ee256e8b6612bca8f88320da1691d613d8a6321a7c8bbf595a4b1c8d82
+  metadata.gz: 310328eb8b60bbadd3a58bfdfae0565b7bb51170d3cc3bb06fa6050962d23efc03a6365f49bf8713b173df2fcf707e9de2fa07b3865357b00d02bbfc00c1d314
+  data.tar.gz: 85b5fb29cae9d1e3d1c81fd847b6caf35b864bd9dca1fcc87f7003446bccc98b605070a31b205333190b2af5e13d10ec867d0948119a3779a16fc28d9ba3f9c5

data/lib/stagehand/schema.rb

@@ -20,11 +20,7 @@ module Stagehand
         add_index :stagehand_commit_entries, [:record_id, :table_name] # Used for 'matching' scope
         add_index :stagehand_commit_entries, [:operation, :commit_id] # Used for looking up start entries, and 'not_in_progress' scope
 
-        # Create trigger to initialize session using a function
-        ActiveRecord::Base.connection.execute("DROP TRIGGER IF EXISTS stagehand_session_trigger;")
-        ActiveRecord::Base.connection.execute("
-        CREATE TRIGGER stagehand_session_trigger BEFORE INSERT ON stagehand_commit_entries
-        FOR EACH ROW SET NEW.session = CONNECTION_ID();")
+        Stagehand::Schema.send :create_session_trigger
       end
 
       add_stagehand!(options)
@@ -38,9 +34,9 @@ module Stagehand
         table_names &= Array(options[:only]).collect(&:to_s) if options[:only].present?
 
         table_names.each do |table_name|
-          Stagehand::Schema.send :create_trigger, table_name, 'insert', 'NEW'
-          Stagehand::Schema.send :create_trigger, table_name, 'update', 'NEW'
-          Stagehand::Schema.send :create_trigger, table_name, 'delete', 'OLD'
+          Stagehand::Schema.send :create_operation_trigger, table_name, 'insert', 'NEW'
+          Stagehand::Schema.send :create_operation_trigger, table_name, 'update', 'NEW'
+          Stagehand::Schema.send :create_operation_trigger, table_name, 'delete', 'OLD'
         end
       end
     end
@@ -61,7 +57,9 @@ module Stagehand
     end
 
     def has_stagehand?(table_name = nil)
-      if table_name
+      if UNTRACKED_TABLES.include?(table_name.to_s)
+        return false
+      elsif table_name
         trigger_exists?(table_name, 'insert')
       else
         ActiveRecord::Base.Connection.table_exists?(Stagehand::Staging::CommitEntry.table_name)
@@ -70,29 +68,42 @@ module Stagehand
 
     private
 
-    def create_trigger(table_name, trigger_action, record)
-      return if trigger_exists?(table_name, trigger_action)
+    # Create trigger to initialize session using a function
+    def create_session_trigger
+      drop_trigger(:stagehand_commit_entries, :insert)
+      create_trigger(:stagehand_commit_entries, :insert, :before, <<-SQL)
+        SET NEW.session = CONNECTION_ID();
+      SQL
+    end
+
+    def create_operation_trigger(table_name, trigger_event, record)
+      return if trigger_exists?(table_name, trigger_event)
 
-      ActiveRecord::Base.connection.execute("
-        CREATE TRIGGER #{trigger_name(table_name, trigger_action)} AFTER #{trigger_action.upcase} ON #{table_name}
-        FOR EACH ROW
+      create_trigger(table_name, trigger_event, :after, <<-SQL)
         BEGIN
           INSERT INTO stagehand_commit_entries (record_id, table_name, operation)
-          VALUES (#{record}.id, '#{table_name}', '#{trigger_action}');
+          VALUES (#{record}.id, '#{table_name}', '#{trigger_event}');
         END;
-      ")
+      SQL
+    end
+
+    def create_trigger(table_name, trigger_event, trigger_time, row_action)
+      ActiveRecord::Base.connection.execute <<-SQL
+        CREATE TRIGGER #{trigger_name(table_name, trigger_event)} #{trigger_time} #{trigger_event}
+        ON #{table_name} FOR EACH ROW #{row_action}
+      SQL
     end
 
-    def drop_trigger(table_name, trigger_action)
-      ActiveRecord::Base.connection.execute("DROP TRIGGER IF EXISTS #{trigger_name(table_name, trigger_action)};")
+    def drop_trigger(table_name, trigger_event)
+      ActiveRecord::Base.connection.execute("DROP TRIGGER IF EXISTS #{trigger_name(table_name, trigger_event)};")
     end
 
-    def trigger_exists?(table_name, trigger_action)
-      ActiveRecord::Base.connection.select_one("SHOW TRIGGERS where `trigger` = '#{trigger_name(table_name, trigger_action)}'").present?
+    def trigger_exists?(table_name, trigger_event)
+      ActiveRecord::Base.connection.select_one("SHOW TRIGGERS where `trigger` = '#{trigger_name(table_name, trigger_event)}'").present?
     end
 
-    def trigger_name(table_name, trigger_action)
-      "stagehand_#{trigger_action}_trigger_#{table_name}".downcase
+    def trigger_name(table_name, trigger_event)
+      "stagehand_#{trigger_event}_trigger_#{table_name}".downcase
     end
   end
 end

data/lib/stagehand/schema/statements.rb

@@ -5,9 +5,10 @@ module Stagehand
       def create_table(table_name, options = {})
         super
 
+        return if Database.connected_to_production? && !Stagehand::Configuration.single_connection?
+        Schema.send(:create_session_trigger) if table_name == Staging::CommitEntry.table_name
         return if options.symbolize_keys[:stagehand] == false
         return if UNTRACKED_TABLES.include?(table_name)
-        return if Database.connected_to_production? && !Stagehand::Configuration.single_connection?
 
         Schema.add_stagehand! :only => table_name
       end

data/lib/stagehand/staging/commit.rb

@@ -7,6 +7,7 @@ module Stagehand
 
       def self.capture(subject_record = nil, &block)
         start_operation = start_commit(subject_record)
+        init_session!(start_operation)
         block.call(start_operation)
         return end_commit(start_operation)
       rescue => e
@@ -39,7 +40,7 @@ module Stagehand
 
         start_operation.subject = subject_record
 
-        return start_operation.reload # Reload to ensure session is set
+        return start_operation
       end
 
       # Sets the commit_id on all the entries between the start and end op.
@@ -55,6 +56,12 @@ module Stagehand
         return new(start_operation.id)
       end
 
+      # Reload to ensure session set by the database is read by ActiveRecord
+      def self.init_session!(entry)
+        entry.reload
+        raise BlankCommitEntrySession unless entry.session.present?
+      end
+
       public
 
       def initialize(start_id)
@@ -100,4 +107,5 @@ module Stagehand
 
   # EXCEPTIONS
   class CommitNotFound < StandardError; end
+  class BlankCommitEntrySession < StandardError; end
 end

data/lib/stagehand/staging/model.rb

@@ -5,12 +5,12 @@ module Stagehand
 
       class_methods do
         def connection
-          return super if Configuration.ghost_mode?
-
-          if Stagehand::Database.connected_to_production?
-            Stagehand::Database::StagingProbe.connection
-          else
+          if Configuration.ghost_mode?
+            super
+          elsif Stagehand::Database.connected_to_staging?
             ActiveRecord::Base.connection
+          else
+            Stagehand::Database::StagingProbe.connection
           end
         end
       end

data/lib/stagehand/staging/synchronizer.rb

@@ -9,11 +9,11 @@ module Stagehand
 
       # Immediately attempt to sync the changes from the block if possible
       # The block is wrapped in a transaction to prevent changes to records while being synced
-      def sync_now(&block)
+      def sync_now(subject_record = nil, &block)
         raise SyncBlockRequired unless block_given?
 
         Database.transaction do
-          checklist = Checklist.new(Commit.capture(&block).entries, :preconfirm_subject => false)
+          checklist = Checklist.new(Commit.capture(subject_record, &block).entries, :preconfirm_subject => false)
           sync_checklist(checklist) unless checklist.requires_confirmation?
         end
       end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

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