culturecode_stagehand 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e400bbb51d81d1313e506d663ff54a9ef3541ff
-  data.tar.gz: 0260e41d89133b7f318aa736218990be033410fc
+  metadata.gz: 4a6d79d7749da33008302addc5f4ab7b6ef3f53a
+  data.tar.gz: b939f07f252406b5ce2c06eba0cbc968d79836d8
 SHA512:
-  metadata.gz: 64cccc44d8497b8485e4694b0c8779cb03adc305a3261f34849bf3a7b0ffd8d4597ea757f49bbc2654eeb389578696a7dd75e93d6cc4356fdf812cef73c6995b
-  data.tar.gz: 36b308306ab666f9f19f46848506794762a7e1a15d0e08df2be24ab98e6dd11ffd739b18bd05cf2f272444a581744d44b13e2d4f22eb655babb5d3d6b50c8d43
+  metadata.gz: 9bb90a7ba80ea273602a4d56e8d0d8b22495ed253e9c94444c14d8101c4e2dabbb65e144766decd57a5247ed53b0a7ba8f6b0e3a9c1b67706eed3b45cfce1f2f
+  data.tar.gz: 65a6462d3e10ff7ccbb18feb8d437cd409da00eba68901c3522c0149586b53da089e762c510cb712639e66265ad61ee2ca8317bf29653fdc9df21bf39c44fa88

data/lib/stagehand/database.rb

@@ -4,6 +4,11 @@ module Stagehand
 
     @@connection_name_stack = [Rails.env.to_sym]
 
+    def each(&block)
+      with_connection(Configuration.staging_connection_name, &block)
+      with_connection(Configuration.production_connection_name, &block) unless Configuration.single_connection?
+    end
+
     def connected_to_production?
       current_connection_name == Configuration.production_connection_name
     end
@@ -43,21 +48,17 @@ module Stagehand
       Rails.logger.debug "Connecting to #{current_connection_name}"
       connect_to(current_connection_name) if different
 
-      yield
+      yield connection_name
     ensure
       @@connection_name_stack.pop
       Rails.logger.debug "Restoring connection to #{current_connection_name}"
       connect_to(current_connection_name) if different
     end
 
-    def set_connection_for_model(model, connection_name)
-      connect_to(connection_name, model) unless Configuration.ghost_mode?
-    end
-
     private
 
-    def connect_to(connection_name, model = ActiveRecord::Base)
-      model.establish_connection(connection_name)
+    def connect_to(connection_name)
+      ActiveRecord::Base.establish_connection(connection_name)
     end
 
     def current_connection_name

data/lib/stagehand/staging/model.rb

@@ -3,8 +3,16 @@ module Stagehand
     module Model
       extend ActiveSupport::Concern
 
-      included do
-        Stagehand::Database.set_connection_for_model(self, Configuration.staging_connection_name)
+      class_methods do
+        def connection
+          return super if Configuration.ghost_mode?
+
+          if Stagehand::Database.connected_to_production?
+            Stagehand::Database::StagingProbe.connection
+          else
+            ActiveRecord::Base.connection
+          end
+        end
       end
     end
   end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.7.12"
+  VERSION = "0.7.13"
 end

data/lib/tasks/stagehand_tasks.rake

@@ -15,33 +15,21 @@ namespace :stagehand do
     Stagehand::Staging::Synchronizer.sync_all
   end
 
-  desc "Migrate both databases used by stagehand"
-  task :migrate => :environment do
-    run_on_both_databases do
-      Rake::Task['db:migrate'].reenable
-      Rake::Task['db:migrate'].invoke
+  # Enhance the regular tasks to run on both staging and production databases
+  def rake_both_databases(task, stagehand_task = task.gsub(':','_'))
+    task(stagehand_task => :environment) do
+      Stagehand::Database.each do |connection_name|
+        puts "#{connection_name}"
+        Rake::Task[task].reenable
+        Rake::Task[task].invoke
+      end
+      Rake::Task[task].clear
     end
-    Rake::Task['db:migrate'].clear
-  end
 
-  desc "Rollback both databases used by stagehand"
-  task :rollback => :environment do
-    run_on_both_databases do
-      Rake::Task['db:rollback'].reenable
-      Rake::Task['db:rollback'].invoke
-    end
-    Rake::Task['db:rollback'].clear
+    # Enhance the original task to run the stagehand_task as a prerequisite
+    Rake::Task[task].enhance(["stagehand:#{stagehand_task}"])
   end
-end
 
-def run_on_both_databases(&block)
-  connections = [Stagehand.configuration.staging_connection_name, Stagehand.configuration.production_connection_name]
-  connections.compact.uniq.each do |connection_name|
-    puts "#{connection_name}"
-    Stagehand::Database.with_connection(connection_name, &block)
-  end
+  rake_both_databases('db:migrate')
+  rake_both_databases('db:rollback')
 end
-
-# Enhance the regular db:migrate/db:rollback tasks to run the stagehand migration/rollback tasks so both stagehand databases are migrated
-Rake::Task['db:migrate'].enhance(['stagehand:migrate'])
-Rake::Task['db:rollback'].enhance(['stagehand:rollback'])

metadata

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