culturecode_stagehand 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32aa6c36c7e088a7ced2a1ba65eb7bebf49403b0
-  data.tar.gz: c57ef59b9cd02ca2576e7360a57dd50285e24ec2
+  metadata.gz: 52ea6afe3b8d21f4df0bdea2a78b92d9c013151a
+  data.tar.gz: 87c189ec7bde9cd9a09c55e338b1179d6fd56a00
 SHA512:
-  metadata.gz: fc7407c7a397721ffbf567d24a4917958b1a97ef6acbdb7d9a1828f875ca043cf5081fbb45b5190a5d2906d3f3ffc2bbc66fe6bc8b136e04798f0aa500067bd5
-  data.tar.gz: cc5115eb348fa1a58ab94835dfba2752d6f906fbe6b394f1a70a19963ee91bb33d183d440c74b31ded684589dd4e953ff1f2c02ad7a9b4996450353876a6b2d3
+  metadata.gz: 6860268a6a3eb5983622b2ddb0020ce472ad7ae73fbe96f3b043370162fd76054c6fe06366b2160b06ecc95c22d149bd065d627f630ab81d7e3140c95b36d10e
+  data.tar.gz: f18cfc88589e4f566b68a50806a53f87c32ecade90a04fd3c490e74336a253d856fa82aea6314f5e6fd0fb66297cd6a393eec2cc47383580b19afa5c0d035d60

data/lib/stagehand/controller_extensions.rb

@@ -17,11 +17,19 @@ module Stagehand
     private
 
     def use_staging_database(&block)
-      Database.with_connection(Configuration.staging_connection_name, &block)
+      use_database(Configuration.staging_connection_name, &block)
     end
 
     def use_production_database(&block)
-      Database.with_connection(Configuration.production_connection_name, &block)
+      use_database(Configuration.production_connection_name, &block)
+    end
+
+    def use_database(connection_name, &block)
+      if Configuration.ghost_mode?
+        block.call
+      else
+        Database.with_connection(connection_name, &block)
+      end
     end
   end
 end

data/lib/stagehand/database.rb

@@ -29,7 +29,7 @@ module Stagehand
     end
 
     def with_connection(connection_name)
-      different = !Configuration.ghost_mode? && current_connection_name != connection_name.to_sym
+      different = current_connection_name != connection_name.to_sym
 
       @@connection_name_stack.push(connection_name.to_sym)
       Rails.logger.debug "Connecting to #{current_connection_name}"

data/lib/stagehand/version.rb

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

data/lib/tasks/stagehand_tasks.rake

@@ -18,10 +18,11 @@ namespace :stagehand do
   desc "Migrate both databases used by stagehand"
   task :migrate => :environment do
     [Rails.configuration.x.stagehand.staging_connection_name,
-     Rails.configuration.x.stagehand.production_connection_name].each do |config_key|
-      puts "Migrating #{config_key}"
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[config_key.to_s])
-      ActiveRecord::Migrator.migrate('db/migrate')
+     Rails.configuration.x.stagehand.production_connection_name].each do |connection_name|
+      puts "Migrating #{connection_name}"
+      Stagehand::Database.with_connection(connection_name) do
+        ActiveRecord::Migrator.migrate('db/migrate')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails