dbhijacker 0.4.6 → 0.4.7

data/hijacker.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Xavier", "Donald Plummer", "Woody Peterson"]

data/lib/hijacker.rb

@@ -31,42 +31,50 @@ module Hijacker
   # Note that you can manually call this from script/console (or wherever)
   # to connect to the database you want, ex Hijacker.connect("database")
   def self.connect(target_name, sister_name = nil, options = {})
-    raise InvalidDatabase, 'master cannot be nil' if target_name.nil?
+    original_database = Hijacker::Database.current
 
-    target_name = target_name.downcase
-    sister_name = sister_name.downcase unless sister_name.nil?
+    begin
+      raise InvalidDatabase, 'master cannot be nil' if target_name.nil?
 
-    if already_connected?(target_name, sister_name)
-      return "Already connected to #{target_name}"
-    end
+      target_name = target_name.downcase
+      sister_name = sister_name.downcase unless sister_name.nil?
 
-    verify = options.fetch(:verify, Hijacker.do_hijacking?)
+      if already_connected?(target_name, sister_name)
+        return "Already connected to #{target_name}"
+      end
 
-    database = determine_database(target_name, sister_name, verify)
+      verify = options.fetch(:verify, Hijacker.do_hijacking?)
 
-    establish_connection_to_database(database)
+      database = determine_database(target_name, sister_name, verify)
 
-    check_connection
+      establish_connection_to_database(database)
 
-    if database.sister?
-      self.master = database.master.name
-      self.sister = database.name
-    else
-      self.master = database.name
-      self.sister = nil
-    end
+      check_connection
+
+      if database.sister?
+        self.master = database.master.name
+        self.sister = database.name
+      else
+        self.master = database.name
+        self.sister = nil
+      end
 
-    # don't cache sister site
-    cache_database_route(target_name, database) unless sister_name
-
-    connect_sister_site_models(target_name)
-    
-    reenable_query_caching
-    
-    self.config[:after_hijack].call if self.config[:after_hijack]
-  rescue
-    self.establish_root_connection
-    raise
+      # don't cache sister site
+      cache_database_route(target_name, database) unless sister_name
+
+      connect_sister_site_models(target_name)
+
+      reenable_query_caching
+
+      self.config[:after_hijack].call if self.config[:after_hijack]
+    rescue
+      if original_database.present?
+        establish_connection_to_database(original_database)
+      else
+        self.establish_root_connection
+      end
+      raise
+    end
   end
 
   # very small chance this will raise, but if it does, we will still handle it the

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbhijacker
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Michael Xavier
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: One application, multiple client databases