culturecode_stagehand 1.1.2 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5e551f7e747ad8fb67d445f787bd47df6059fbe939f65088901445e4ccc5db
-  data.tar.gz: d7d1a28bdac8a210119431075d48fa5cfafaadf311958926e13e10ac5c5dda9c
+  metadata.gz: b9684506c931ca15ad9c467e5d96fb359ede46c3d41624331b72b7efe0b7b850
+  data.tar.gz: 43f4509740eb53ace3293ad6bdbd718562e165adf282e1ca2114c5daebd5ee15
 SHA512:
-  metadata.gz: d73461a90dceed0855d2779925174f1ced0b4ba9a2a9b47c0948fa1faef6666eb5ee83af52481114033a99367747baf82b1161617ff73c30721c19dfedf5e28e
-  data.tar.gz: 3a2443903c414b6f87ccb312d77b165428e036ae80bc04a103234a7efc373d5068f9f329d8c87c987a9e1605929237053e5b276de1dedd79860028e3fb9bc5a4
+  metadata.gz: 5cca6f14c6f8c9194d400a5c21bb49f90758e2160a9ebac99b72621f8b64410f91429a5b6f3ba62db4faf92d7d50caf1caee66a4d5631ccf4ac196206677130c
+  data.tar.gz: 28f4439a34ed046edff565df691fd4d1fada3e227a52a9fc3d60fec9b245db8d0a0c4e50629ab86febc7e5d0171c270b7257ee4121b0b5517296f6fb152b4eb6

data/lib/stagehand/auditor/checklist_visualizer.rb

@@ -6,7 +6,7 @@ module Stagehand
       def initialize(checklist, show_all_commits: false)
         entries = checklist.affected_entries.select(&:commit_id)
 
-        @graph = GraphViz.new( :G, :type => :graph );
+        @graph = GraphViz.new( :G, :type => :graph )
         @commits = Hash.new {|hash, commit_id| hash[commit_id] = Stagehand::Staging::CommitEntry.find(commit_id) }
         nodes = Hash.new
         edges = []
@@ -24,16 +24,22 @@ module Stagehand
 
         # Create Subgraph nodes for commits with connections to other subjects
         entries = edges.flatten.uniq unless show_all_commits
-        entries.group_by {|entry| commit_subject(entry) }.each do |subject, entries|
-          subgraph = create_subgraph(subject, @graph)
+        entries.group_by {|entry| commit_subject(entry) || entry.commit_id }.each do |group, entries|
+          subject = commit_subject(entries.first)
+          subgraph = create_subgraph(subject, @graph, id: group)
           entries.each do |entry|
             nodes[entry] = create_node(entry, subgraph)
           end
         end
 
+        # Create deduplicate edge data in case multiple entries for the same record were part of a single commit
+        edges = edges.map do |entry_a, entry_b|
+          [[nodes[entry_a], nodes[entry_b]], label: edge_label(entry_a, entry_b)]
+        end
+
         # Create edges
-        edges.each do |entry_a, entry_b|
-          create_edge(nodes[entry_a], nodes[entry_b], :label => edge_label(entry_a, entry_b))
+        edges.uniq.each do |(node_a, node_b), options|
+          create_edge(node_a, node_b, options)
         end
       end
 
@@ -44,8 +50,8 @@ module Stagehand
 
       private
 
-      def create_subgraph(subject, graph)
-        graph.add_graph("cluster_#{subject}", :label => subject, :style => :filled, :color => :lightgrey)
+      def create_subgraph(subject, graph, id: subject)
+        graph.add_graph("cluster_#{id}", :label => subject, :style => :filled, :color => :lightgrey)
       end
 
       def create_edge(node_a, node_b, options = {})
@@ -65,7 +71,7 @@ module Stagehand
       end
 
       def same_subject?(entry_a, entry_b)
-        commit_subject(entry_a) == commit_subject(entry_b)
+        commit_subject(entry_a) == commit_subject(entry_b) && commit_subject(entry_a)
       end
 
       def commit_subject(entry)
@@ -77,7 +83,7 @@ module Stagehand
       end
 
       def pretty_key(entry)
-        "#{entry.table_name.classify} #{entry.record_id}"
+        "#{entry.table_name.classify} #{entry.record_id}" if entry.record_id && entry.table_name
       end
     end
   end

data/lib/stagehand/configuration.rb

@@ -9,7 +9,8 @@ module Stagehand
   module Configuration
     extend self
 
-    mattr_accessor :checklist_confirmation_filter, :checklist_association_filter, :checklist_relation_filter
+    mattr_accessor :checklist_confirmation_filter, :checklist_association_filter, :checklist_relation_filter, :ignored_columns
+    self.ignored_columns = HashWithIndifferentAccess.new
 
     def staging_connection_name
       Rails.env.to_sym
@@ -33,5 +34,11 @@ module Stagehand
     def single_connection?
       staging_connection_name == production_connection_name
     end
+
+    # Columns not to copy to the production database
+    # e.g. table_name => [column, column, ...]
+    def self.ignored_columns=(hash)
+      super HashWithIndifferentAccess.new(hash)
+    end
   end
 end

data/lib/stagehand/connection_adapter_extensions.rb

@@ -1,15 +1,22 @@
 module Stagehand
   module Connection
-    def self.with_production_writes(model, &block)
-      model.connection.allow_writes(&block)
+    def self.with_production_writes(&block)
+      state = allow_unsynced_production_writes?
+      allow_unsynced_production_writes!(true)
+      return block.call
+    ensure
+      allow_unsynced_production_writes!(state)
     end
 
-    module AdapterExtensions
-      def self.prepended(base)
-        base.set_callback :checkout, :after, :update_readonly_state
-        base.set_callback :checkin, :before, :clear_readonly_state
-      end
+    def self.allow_unsynced_production_writes!(state = true)
+      Thread.current[:stagehand_allow_unsynced_production_writes] = state
+    end
 
+    def self.allow_unsynced_production_writes?
+      !!Thread.current[:stagehand_allow_unsynced_production_writes]
+    end
+
+    module AdapterExtensions
       def exec_insert(*)
         handle_readonly_writes!
         super
@@ -25,34 +32,14 @@ module Stagehand
         super
       end
 
-      def allow_writes(&block)
-        state = readonly?
-        readonly!(false)
-        return block.call
-      ensure
-        readonly!(state)
-      end
-
-      def readonly!(state = true)
-        @readonly = state
-      end
-
-      def readonly?
-        !!@readonly
-      end
-
       private
 
-      def update_readonly_state
-        readonly! unless Configuration.single_connection? || @config[:database] == Database.staging_database_name
-      end
-
-      def clear_readonly_state
-        readonly!(false)
+      def write_access?
+        Configuration.single_connection? || @config[:database] == Database.staging_database_name || Connection.allow_unsynced_production_writes?
       end
 
       def handle_readonly_writes!
-        if !readonly?
+        if write_access?
           return
         elsif Configuration.allow_unsynced_production_writes?
           Rails.logger.warn "Writing directly to #{@config[:database]} database using readonly connection"

data/lib/stagehand/production.rb

@@ -24,7 +24,7 @@ module Stagehand
     end
 
     def write(staging_record, attributes, table_name = nil)
-      Connection.with_production_writes(Record) do
+      Connection.with_production_writes do
         is_new = matching(staging_record, table_name).update_all(attributes).zero?
 
         # Ensure we always return a record, even when updating instead of creating
@@ -37,7 +37,7 @@ module Stagehand
     end
 
     def delete(staging_record, table_name = nil)
-      Connection.with_production_writes(Record) do
+      Connection.with_production_writes do
         matching(staging_record, table_name).delete_all
       end
     end
@@ -78,7 +78,12 @@ module Stagehand
 
     def staging_record_attributes(staging_record, table_name = nil)
       table_name, id = Stagehand::Key.generate(staging_record, :table_name => table_name)
-      Stagehand::Staging::CommitEntry.connection.select_one("SELECT * FROM #{table_name} WHERE id = #{id}")
+      hash = Stagehand::Staging::CommitEntry.connection.select_one("SELECT * FROM #{table_name} WHERE id = #{id}")
+      hash&.except(*ignored_columns(table_name))
+    end
+
+    def ignored_columns(table_name)
+      Array.wrap(Configuration.ignored_columns[table_name]).map(&:to_s)
     end
 
     # CLASSES

data/lib/stagehand/schema_extensions.rb

@@ -2,7 +2,7 @@ module Stagehand
   module SchemaExtensions
     def define(*)
       # Allow production writes during Schema.define to allow Rails to write to ar_internal_metadata table
-      Stagehand::Connection.with_production_writes(ActiveRecord::Base) { super }
+      Stagehand::Connection.with_production_writes { super }
     end
   end
 end

data/lib/stagehand/staging/checklist.rb

@@ -89,7 +89,20 @@ module Stagehand
       private
 
       def self.associated_associations(klass)
-        cache("#{klass.name}_associated_associations") { klass.reflect_on_all_associations(:belongs_to).collect(&:name) }
+        cache("#{klass.name}_associated_associations") do
+          reflections = klass.reflect_on_all_associations(:belongs_to)
+
+          reflections.select! do |reflection|
+            begin
+              reflection.check_preloadable!
+              next true
+            rescue ArgumentError
+              next false
+            end
+          end
+
+          reflections.collect(&:name)
+        end
       end
 
       def self.stagehand_class?(klass)

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "1.1.2"
+  VERSION = "1.1.5"
 end

data/lib/tasks/stagehand_tasks.rake

@@ -20,7 +20,7 @@ namespace :stagehand do
   def rake_both_databases(task, stagehand_task = task.gsub(':','_'))
     task(stagehand_task => :environment) do
       Stagehand::Database.each do |connection_name|
-        Stagehand::Connection.with_production_writes(ActiveRecord::Base) do
+        Stagehand::Connection.with_production_writes do
           puts "#{connection_name}"
           Rake::Task[task].reenable
           Rake::Task[task].invoke
@@ -35,4 +35,5 @@ namespace :stagehand do
 
   rake_both_databases('db:migrate')
   rake_both_databases('db:rollback')
+  rake_both_databases('db:test:load_structure')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.5
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails