dbhijacker 0.6.1 → 0.7.1

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.6.1)
-      rails (~> 2.3.14)
+    dbhijacker (0.7.1)
+      rails (>= 2.3.14)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
       rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     linecache (0.46)
@@ -24,12 +24,12 @@ GEM
     rack (1.1.3)
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
       rake (>= 0.8.3)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)

data/hijacker.gemspec

@@ -3,14 +3,14 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.6.1"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Xavier", "Donald Plummer", "Woody Peterson"]
   s.date = %q{2012-03-21}
   s.description = %q{Allows a single Rails appliation to access many different databases}
   s.email = %q{developers@crystalcommerce.com}
-  s.add_dependency("rails", "~>2.3.14")
+  s.add_dependency("rails", ">= 2.3.14")
   s.add_development_dependency("rake", "~>0.9.2")
   s.add_development_dependency("rack-test", "~>0.6.1")
   s.add_development_dependency("rack", "~>1.1.0")

data/lib/hijacker.rb

@@ -90,7 +90,8 @@ module Hijacker
     aliases = Hijacker::Alias.all(:select => :name).map(&:name)
 
     existing_dbs = Host.all.inject(Set.new(aliases)) do |acc, host|
-      @host_connections[host.hostname] ||= Mysql2::Client.new(root_config.merge('host' => host.hostname))
+      @host_connections[host.hostname] ||= Mysql2::Client.new(root_config.merge('host' => host.hostname,
+                                                                                'database' => nil))
       @host_connections[host.hostname].query("SHOW DATABASES").each do |row|
         acc << row['Database']
       end
@@ -165,23 +166,27 @@ module Hijacker
   end
 
   def self.root_config
-    ActiveRecord::Base.configurations['root'].with_indifferent_access
+    database_configurations.fetch('root').with_indifferent_access
   end
-  
+
+  def self.database_configurations
+    ActiveRecord::Base.configurations
+  end
+
   # this should establish a connection to a database containing the bare minimum
   # for loading the app, usually a sessions table if using sql-based sessions.
   def self.establish_root_connection
     ActiveRecord::Base.establish_connection('root')
   end
-  
+
   def self.processing_sister_site?
     !sister.nil?
   end
-  
+
   def self.master
-    @master || ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || RAILS_ENV]['database']
+    @master || database_configurations.fetch(ENV['RAILS_ENV'] || RAILS_ENV)['database']
   end
-  
+
   def self.current_client
     sister || master
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbhijacker
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 1
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Michael Xavier
@@ -25,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: