dbhijacker 0.4.0 → 0.4.2

data/Gemfile.lock

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

data/Rakefile

@@ -1,14 +1,6 @@
 require 'rake'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
 
-desc 'Default: run unit tests.'
-task :default => :spec
-
-desc 'Test the hijacker plugin.'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
 
 desc 'Generate documentation for the hijacker plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

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.0"
+  s.version = "0.4.2"
 
   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/database.rb

@@ -12,6 +12,10 @@ class Hijacker::Database < ActiveRecord::Base
 
   alias_attribute :name, :database
 
+  def sister?
+    master_id.present?
+  end
+
   def self.find_by_name(name)
     find_by_database(name)
   end
@@ -73,7 +77,11 @@ class Hijacker::Database < ActiveRecord::Base
     original_database = Hijacker.current_client
     begin
       sites.each do |db|
-        Hijacker.connect_to_master(db)
+        begin
+          Hijacker.connect_to_master(db)
+        rescue Hijacker::InvalidDatabase
+          next
+        end
         yield db
       end
     ensure

data/lib/hijacker.rb

@@ -36,7 +36,10 @@ module Hijacker
     target_name = target_name.downcase
     sister_name = sister_name.downcase unless sister_name.nil?
 
-    return if already_connected?(target_name, sister_name) || test?
+    if already_connected?(target_name, sister_name)
+      return "Already connected to #{target_name}"
+    end
+    puts "CONNECTING TO (#{target_name}, #{sister_name})"
 
     verify = options.fetch(:verify, Hijacker.do_hijacking?)
 
@@ -46,8 +49,13 @@ module Hijacker
 
     check_connection
 
-    self.master = database.name
-    self.sister = sister_name
+    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
@@ -165,10 +173,6 @@ module Hijacker
     ::ActiveRecord::Base.connection
   end
 
-  def self.test?
-    ['test', 'cucumber'].include?(RAILS_ENV)
-  end
-
 private
 
   def self.already_connected?(new_master, new_sister)

data/spec/hijacker/database_spec.rb

@@ -71,6 +71,11 @@ module Hijacker
 
         Hijacker::Database.current.should == original_db
       end
+
+      it "eats invalid database errors" do
+        Hijacker.stub!(:connect).and_raise(Hijacker::InvalidDatabase)
+        expect { Database.connect_each {|db| } }.not_to raise_error
+      end
     end
   end
 end

data/spec/hijacker_spec.rb

@@ -42,7 +42,6 @@ describe Hijacker do
         subject.master = nil
         subject.sister = nil
         subject.valid_routes = {}
-        subject.stub(:test?).and_return(false)
         ActiveRecord::Base.stub(:establish_connection)
         subject.stub(:root_connection).and_return(stub(:config => {}))
         subject.stub(:connect_sister_site_models)

metadata

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