dbhijacker 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.4.3)
+    dbhijacker (0.4.4)
       rails (~> 2.3.14)
 
 GEM

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.3"
+  s.version = "0.4.4"
 
   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

@@ -77,17 +77,18 @@ module Hijacker
   # we're not in a sister-site situation
   def self.connect_sister_site_models(db)
     return if db.nil?
-    
+    database = Hijacker::Database.find_by_database(db)
+
     sister_db_connection_pool = self.processing_sister_site? ? nil : ActiveRecord::Base.connection_pool
     self.config[:sister_site_models].each do |model_name|
       ar_model = model_name.constantize
-      
+
       if !sister_db_connection_pool
-        ar_model.establish_connection(self.root_connection.config.merge(:database => db))
+        ar_model.establish_connection(connection_config(database))
         begin
           ar_model.connection
         rescue
-          ar_model.establish_connection(self.root_connection.config)
+          ar_model.establish_connection(root_config)
           raise Hijacker::InvalidDatabase, db
         end
         sister_db_connection_pool = ar_model.connection_pool
@@ -131,9 +132,9 @@ module Hijacker
 
     return $hijacker_root_connection
   end
-  
+
   def self.root_config
-    ActiveRecord::Base.configurations['root']
+    ActiveRecord::Base.configurations['root'].with_indifferent_access
   end
   
   # this should establish a connection to a database containing the bare minimum
@@ -198,9 +199,7 @@ private
   end
 
   def self.establish_connection_to_database(database)
-    hijacked_config = self.root_connection.config.dup
-    ::ActiveRecord::Base.establish_connection(hijacked_config.merge(:database => database.name,
-                                                                    :host => database.host.hostname))
+    ::ActiveRecord::Base.establish_connection(connection_config(database))
   end
 
   # This is a hack to get query caching back on. For some reason when we
@@ -216,6 +215,11 @@ private
       ::ActiveRecord::Base.connection.cache do;end
     end
   end
+
+  def self.connection_config(database)
+    root_config.merge('database' => database.name,
+                      'host' => database.host.hostname)
+  end
 end
 
 require 'hijacker/database'

data/spec/hijacker_spec.rb

@@ -57,7 +57,7 @@ describe Hijacker do
       it "establishes a connection merging in the db name and the hostname"  do
         Hijacker::Database.create!(:database => 'elsewhere', :host => host)
         ActiveRecord::Base.should_receive(:establish_connection).
-          with({:database => 'elsewhere', :host => "localhost"})
+          with(hash_including("database" => 'elsewhere', "host" => "localhost"))
         subject.connect('elsewhere')
       end
 
@@ -81,7 +81,8 @@ describe Hijacker do
 
         it "connects with the alias to the master and the host" do
           ActiveRecord::Base.should_receive(:establish_connection).
-            with({:database => 'master_db', :host => "localhost"})
+            with(hash_including('database' => 'master_db',
+                                'host' => "localhost"))
           subject.connect('alias_db')
         end
 

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ RAILS_ENV="test"
 ENV['RAILS_ENV'] = 'test'
 $:.unshift '../lib'
 ActiveRecord::Base.configurations = {
+  "root" => {
+    :adapter => 'sqlite3',
+    :database => File.dirname(__FILE__) + "/test_database.sqlite3"
+  },
   "test" => {
     :adapter => 'sqlite3',
     :database => File.dirname(__FILE__) + "/test_database.sqlite3"

metadata

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