dbhijacker 0.8.3 → 0.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.7.3)
+    dbhijacker (0.9.0)
       rails (>= 2.3.14)
 
 GEM
@@ -43,10 +43,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (>= 1.3)
   dbhijacker!
-  rack (~> 1.1.0)
-  rack-test (~> 0.6.1)
-  rake (~> 0.9.2)
-  rspec (~> 2.8)
-  sqlite3 (~> 1.3.5)
+  rack (>= 1.1.0)
+  rack-test (>= 0.6.1)
+  rake (>= 0.9.2)
+  rspec (>= 2.8)
+  sqlite3 (>= 1.3.5)

data/dbhijacker.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.8.3"
+  s.version = "0.9.0"
 
   s.license = "MIT"
 

data/lib/hijacker.rb

@@ -24,7 +24,7 @@ module Hijacker
   # 
   # Background: every time rails gets information
   # from the database, it uses the last established connection. So,
-  # although we've already established a connection to a "dummy" db
+  # although we've already established a connection to a root db
   # ("crystal", in this case), if we establish a new connection, all
   # subsequent database calls will use these settings instead (well,
   # until it's called again when it gets another request).
@@ -44,9 +44,7 @@ module Hijacker
         return "Already connected to #{target_name}"
       end
 
-      verify = options.fetch(:verify, Hijacker.do_hijacking?)
-
-      database = determine_database(target_name, sister_name, verify)
+      database = determine_database(target_name, sister_name)
 
       establish_connection_to_database(database)
 
@@ -63,7 +61,8 @@ module Hijacker
       # don't cache sister site
       cache_database_route(target_name, database) unless sister_name
 
-      connect_sister_site_models(target_name)
+      # Do this even on a site without a master so we reconnect these models
+      connect_sister_site_models(database.master || database)
 
       reenable_query_caching
 
@@ -80,29 +79,33 @@ module Hijacker
 
   # very small chance this will raise, but if it does, we will still handle it the
   # same as +Hijacker.connect+ so we don't lock up the app.
-  # 
+  #
   # Also note that sister site models share a connection via minor management of
   # AR's connection_pool stuff, and will use ActiveRecord::Base.connection_pool if
   # 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)
+  def self.connect_sister_site_models(master_database)
+    master_db_connection_pool = if processing_sister_site?
+                                  nil
+                                else
+                                  ActiveRecord::Base.connection_pool
+                                end
+    master_config = connection_config(master_database)
+
+    config[:sister_site_models].each do |model_name|
+      klass = model_name.constantize
 
-    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
+      klass.establish_connection(master_config)
 
-      if !sister_db_connection_pool
-        ar_model.establish_connection(connection_config(database))
+      if !master_db_connection_pool
         begin
-          ar_model.connection
+          klass.connection
         rescue
-          ar_model.establish_connection(root_config)
-          raise Hijacker::InvalidDatabase, db
+          klass.establish_connection(root_config)
+          raise Hijacker::InvalidDatabase, database.name
         end
-        sister_db_connection_pool = ar_model.connection_pool
+        master_db_connection_pool = klass.connection_pool
       else
-        ActiveRecord::Base.connection_handler.connection_pools[model_name] = sister_db_connection_pool
+        ActiveRecord::Base.connection_handler.connection_pools[model_name] = master_db_connection_pool
       end
     end
   end
@@ -110,20 +113,21 @@ module Hijacker
   # connects the sister_site_models to +db+ while calling the block
   # if +db+ and self.master differ
   def self.temporary_sister_connect(db, &block)
-    processing_sister_site = (db != self.master && db != self.sister)
+    processing_sister_site = (db != master && db != sister)
     self.sister = db if processing_sister_site
     self.connect_sister_site_models(db) if processing_sister_site
     result = block.call
     self.connect_sister_site_models(self.master) if processing_sister_site
     self.sister = nil if processing_sister_site
-    return result
+
+    result
   end
   
-  # maintains and returns a connection to the "dummy" database.
+  # maintains and returns a connection to the root database.
   # 
   # The advantage of using this over just calling
   # ActiveRecord::Base.establish_connection (without arguments) to reconnect
-  # to the dummy database is that reusing the same connection greatly reduces
+  # to the root database is that reusing the same connection greatly reduces
   # context switching overhead etc involved with establishing a connection to
   # the database. It may seem trivial, but it actually seems to speed things
   # up by ~ 1/3 for already fast requests (probably less noticeable on slower
@@ -139,7 +143,7 @@ module Hijacker
       ActiveRecord::Base.establish_connection(current_config) # reconnect, we don't intend to hijack
     end
 
-    return $hijacker_root_connection
+    $hijacker_root_connection
   end
 
   def self.root_config
@@ -161,18 +165,13 @@ module Hijacker
   end
 
   def self.master
-    @master || database_configurations.fetch(ENV['RAILS_ENV'] || RAILS_ENV)['database']
+    @master || database_configurations.fetch(ENV['RAILS_ENV'] || Rails.env)['database']
   end
 
   def self.current_client
     sister || master
   end
 
-  def self.do_hijacking?
-    (Hijacker.config[:hosted_environments] || %w[staging production]).
-      include?(ENV['RAILS_ENV'])
-  end
-
   # just calling establish_connection doesn't actually check to see if
   # we've established a VALID connection. a call to connection will check
   # this, and throw an error if the connection's invalid. It is important 
@@ -192,7 +191,7 @@ private
     current_client == new_master && sister == new_sister
   end
 
-  def self.determine_database(target_name, sister_name, verify)
+  def self.determine_database(target_name, sister_name)
     if sister_name
       database = Hijacker::Database.find_by_name(sister_name)
       raise(Hijacker::InvalidDatabase, sister_name) if database.nil?

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dbhijacker
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Michael Xavier
@@ -15,99 +16,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
 description: Allows a single Rails appliation to access many different databases
@@ -142,27 +157,28 @@ files:
 homepage: https://github.com/crystalcommerce/hijacker
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: One application, multiple client databases
 test_files:
 - spec/hijacker/alias_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5e23b73c48be348d0c277a5f2753847a227e3a3e
-  data.tar.gz: 3685236e56248cb7d1a06069d890d8dcc8d0a9cd
-SHA512:
-  metadata.gz: 6c3624189638fab27821c39a4d6070c633cc952596c2177ee379882d8978580ec6cfea12a5a29282ce5a2bbf797ff529b55430e5da957db45af49659304436e5
-  data.tar.gz: 83522e3c058a48ec43d7681d2ff5c755a517b97fd73cbfbf8bc4ed2af79d760b4b9600b6f33b970db8bd425e60e6a7bbe024b43427c783d2b54f8ec4dc9c4602