dbhijacker 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90889f2261a0bc334b4f397386a14f0830f8072
-  data.tar.gz: c568919019f38132fe1e1bff68c3f48d1aecd8d9
+  metadata.gz: 534c79458c53e9f6cd0a858a830ca956aa4589de
+  data.tar.gz: 1a99b7b0f639f24b99a834b390031ee15c3d2508
 SHA512:
-  metadata.gz: 3f6808340f674aaa39808b9daa78709a0f9e818dfde021013d94809a6c5a192fb1680ecb46016896cae8c5e2d36b9a150f69f7d8ef6fa36a9f28d4d81b37ae69
-  data.tar.gz: e880f040e50e4c0791055df860034070a0920dc65724f7eb904db4a877bcb8934eb7e5a7bda03594847bcd7e0203bda8747ee6b74324b529b449de2e77b7fdce
+  metadata.gz: 9185d392c8d2d3451fa3a693cac9e44a53dbffbecf67b2b57cba763f5894c6ab68463cc87a04a15120f339dc4d41b04610d95dd4c0725d8c0dff70876b592ce5
+  data.tar.gz: 2e4e921fdcd69cf7d058664b0cf553138e6557a409c3619e234c0c58045d1278b111f5f94827383368ec6638332ea5eb5e99ce21520869a5e226b209d02aca72

data/Gemfile.lock

@@ -1,52 +1,181 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.9.2)
-      rails (>= 2.3.14)
+    dbhijacker (0.10.0)
+      rails (>= 2.3.14, < 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (2.3.18)
-      actionpack (= 2.3.18)
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activeresource (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    diff-lcs (1.2.3)
-    rack (1.1.6)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
+      mail (~> 2.5.4)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.6)
+    arel (3.0.3)
+    builder (3.0.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    git (1.2.7)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-bundler (2.0.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+    guard-rspec (4.2.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hashie (3.0.0)
+    highline (1.6.21)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    journey (1.0.4)
+    json (1.8.1)
+    jwt (1.0.0)
+    listen (2.7.8)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.6)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    polyglot (0.3.5)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    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.6)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
+      bundler (~> 1.0)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.0)
+    rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sqlite3 (1.3.7)
+    rspec-mocks (2.99.1)
+    slop (3.5.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timers (1.1.0)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.3)
+  bundler
   dbhijacker!
+  guard
+  guard-bundler
+  guard-rspec
+  jeweler
   rack (>= 1.1.0)
   rack-test (>= 0.6.1)
   rake (>= 0.9.2)
-  rspec (>= 2.8)
-  sqlite3 (>= 1.3.5)
+  rspec (~> 2.8)
+  sqlite3 (~> 1.3.5)

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 
 desc 'Generate documentation for the hijacker plugin.'

data/dbhijacker.gemspec

@@ -3,23 +3,27 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.9.2"
+  s.version = "0.10.0"
 
   s.license = "MIT"
 
   s.authors = ["Michael Xavier", "Donald Plummer", "Woody Peterson"]
-  s.date = %q{2012-03-21}
+  s.date = %q{2014-06-18}
   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", "< 4.0")
 
-  s.add_development_dependency "bundler",   ">= 1.3"
+  s.add_development_dependency "jeweler"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "guard-bundler"
   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"
-  s.add_development_dependency "rspec",     ">= 2.8"
-  s.add_development_dependency "sqlite3",   ">= 1.3.5"
+  s.add_development_dependency "rspec",     "~> 2.8"
+  s.add_development_dependency "sqlite3",   "~> 1.3.5"
 
   s.extra_rdoc_files = [
     "README.rdoc"

data/example_root_schema.rb

@@ -5,7 +5,7 @@ ActiveRecord::Schema.define(:version => 2) do
     t.integer "host_id"
   end
 
-  add_index "databases", "database"
+  add_index "databases", "database", :unique => true
   add_index "databases", "master_id"
 
   create_table "aliases", :force => true do |t|
@@ -13,7 +13,7 @@ ActiveRecord::Schema.define(:version => 2) do
     t.string "name"
   end
 
-  add_index "aliases", "name"
+  add_index "aliases", "name", :unique => true
 
   create_table "hosts", :force => true do |t|
     t.string "hostname"

data/lib/hijacker.rb

@@ -1,11 +1,18 @@
 require 'hijacker/active_record_ext'
+require 'hijacker/request_parser'
 require 'active_record'
 require 'action_controller'
 require 'set'
 
 module Hijacker
   class UnparseableURL < StandardError;end
-  class InvalidDatabase < StandardError;end
+  class InvalidDatabase < StandardError
+    attr_reader :database
+    def initialize(database, message = "Database #{database} not found")
+      @database = database
+      super(message)
+    end
+  end
 
   class << self
     attr_accessor :config, :master, :sister
@@ -21,21 +28,21 @@ module Hijacker
   end
 
   # Manually establishes a new connection to the database.
-  # 
+  #
   # 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 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).
-  # 
+  #
   # 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 = {})
     original_database = Hijacker::Database.current
 
     begin
-      raise InvalidDatabase, 'master cannot be nil' if target_name.nil?
+      raise InvalidDatabase.new(nil, 'master cannot be nil') if target_name.nil?
 
       target_name = target_name.downcase
       sister_name = sister_name.downcase unless sister_name.nil?
@@ -102,7 +109,7 @@ module Hijacker
           klass.connection
         rescue
           klass.establish_connection(root_config)
-          raise Hijacker::InvalidDatabase, database.name
+          raise Hijacker::InvalidDatabase.new(database.name)
         end
         master_db_connection_pool = klass.connection_pool
       else
@@ -123,9 +130,7 @@ module Hijacker
 
     result
   end
-  
-  # 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 root database is that reusing the same connection greatly reduces
@@ -133,7 +138,7 @@ module Hijacker
   # 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
   # pages).
-  # 
+  #
   # Note: does not hijack, just returns the root connection (i.e. AR::Base will
   # maintain its connection)
   def self.root_connection
@@ -180,7 +185,7 @@ module Hijacker
 
   # 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 
+  # this, and throw an error if the connection's invalid. It is important
   # to catch the error and reconnect to a known valid database or rails
   # will get stuck. This is because once we establish a connection to an
   # invalid database, the next request will do a courteousy touch to the
@@ -200,14 +205,14 @@ private
   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?
+      raise(Hijacker::InvalidDatabase.new(sister_name)) if database.nil?
       database
     elsif valid_routes[target_name]
       valid_routes[target_name] # cached valid database
     else
       database = Hijacker::Alias.find_by_name(target_name).try(:database) ||
                  Hijacker::Database.find_by_name(target_name)
-      raise(Hijacker::InvalidDatabase, target_name) if database.nil?
+      raise(Hijacker::InvalidDatabase.new(target_name)) if database.nil?
       database
     end
   end

data/lib/hijacker/controller_methods.rb

@@ -1,16 +1,15 @@
+# DEPRECATED: use middleware instead
 module Hijacker::ControllerMethods
   module Instance
     def hijack_connection
-      host = request.host
-  
-      master, sister = determine_databases(host)
+      master, sister = determine_databases
 
       Hijacker.connect(master, sister)
-      
+
       return true
     rescue Hijacker::InvalidDatabase => e
       render_invalid_db
-  
+
       # If we've encountered a bad database connection, we don't want
       # to continue rendering the rest of the before_filters on this, which it will
       # try to do even when just rendering the bit of text above. If any filters
@@ -20,19 +19,8 @@ module Hijacker::ControllerMethods
 
     # Returns 2-member array of the main database to connect to, and the sister
     # (sister will be nil if no master is found, which means we are on the master).
-    def determine_databases(host)
-      if Hijacker.do_hijacking?
-        Hijacker.config[:domain_patterns].find {|pattern| host =~ pattern}
-        client = $1
-      else # development, test, etc
-        client = ActiveRecord::Base.configurations[Rails.env]['database']
-      end
-
-      raise Hijacker::UnparseableURL, "cannot parse '#{host}'" if client.nil?
-
-      master, sister = Hijacker::Database.find_master_and_sister_for(client)
-
-      return [master, sister]
+    def determine_databases
+      Hijacker::RequestParser.new(request.env).determine_databases
     end
 
     def render_invalid_db

data/lib/hijacker/database.rb

@@ -51,7 +51,7 @@ class Hijacker::Database < ActiveRecord::Base
   def self.current
     find(:first, :conditions => {:database => Hijacker.current_client})
   end
-  
+
   # returns a string or nil
   def self.find_master_for(client)
     @masters ||= {}
@@ -85,7 +85,7 @@ class Hijacker::Database < ActiveRecord::Base
     sites.delete(Hijacker.current_client)
     connect_each(sites, &block)
   end
-  
+
   def self.find_shared_sites_for(client)
     @shared_sites ||= {}
     return @shared_sites[client] if @shared_sites[client].present?

data/lib/hijacker/middleware.rb

@@ -1,18 +1,46 @@
 module Hijacker
   class Middleware
-    def initialize(app)
+    HEADER_KEY = "HTTP_X_HIJACKER_DB".freeze
+    DEFAULT_NOT_FOUND = ->(database, env) {
+      [404, {}, ["Database #{database} not found"]]
+    }
+    DEFAULT_BAD_URL = ->(message, env) {
+      [404, {}, [message]]
+    }
+
+    attr_reader :not_found, :bad_url
+
+    def initialize(app, options = {})
+      options = options.dup
       @app = app
+      @not_found = options.delete(:not_found) || DEFAULT_NOT_FOUND
+      @bad_url   = options.delete(:bad_url)   || DEFAULT_BAD_URL
+
+      unless options.blank?
+        raise "Unknown Hijacker::Middleware options #{options.keys.join(",")}"
+      end
     end
 
     def call(env)
-      if env['HTTP_X_HIJACKER_DB'].present?
-        begin
-          Hijacker.connect(env['HTTP_X_HIJACKER_DB'])
-        rescue Hijacker::InvalidDatabase => e
-          return [404, {}, ""]
-        end
+      begin
+        Hijacker.connect(*determine_databases(env))
+      rescue Hijacker::InvalidDatabase => e
+        return not_found.call(e.database, env)
+      rescue Hijacker::UnparseableURL => e
+        return bad_url.call(e.message, env)
       end
+
       @app.call(env)
     end
+
+  private
+
+    def determine_databases(env)
+      if client = env[HEADER_KEY]
+        Hijacker::Database.find_master_and_sister_for(client)
+      else
+        RequestParser.new(env).determine_databases
+      end
+    end
   end
 end

data/spec/hijacker/database_spec.rb

@@ -18,7 +18,7 @@ module Hijacker
     it "requires a host" do
       subject.host = nil
       subject.should_not be_valid
-      subject.errors.on(:host_id).should == "can't be blank"
+      subject.errors[:host_id].should == ["can't be blank"]
 
       subject.host = host
       subject.should be_valid
@@ -38,12 +38,12 @@ module Hijacker
 
     describe "#connect_each" do
       def db(name)
-        mock("#{name}_db", :database => name)
+        double("#{name}_db", :database => name)
       end
 
       before (:each) do
-        Database.stub!(:all).and_return([ db("one"), db("two"), db("three") ])
-        Hijacker.stub!(:connect)
+        Database.stub(:all).and_return([ db("one"), db("two"), db("three") ])
+        Hijacker.stub(:connect)
       end
 
       it "Calls the block once for each database" do
@@ -71,10 +71,10 @@ module Hijacker
       end
 
       it "eats invalid database errors" do
-        Hijacker.stub(:connect).and_raise(Hijacker::InvalidDatabase)
+        Hijacker.stub(:connect).and_raise(Hijacker::InvalidDatabase.new("doesntmatter"))
         expect { Database.connect_each {|db| } }.not_to raise_error
       end
-      
+
       it "eats mysql-specific errors for missing databases" do
         [Mysql::Error, Mysql2::Error].each do |klass|
           exception = klass.new("Unknown database 'fake'")

data/spec/hijacker/host_spec.rb

@@ -4,11 +4,11 @@ describe Hijacker::Host do
   it "validates the format of the hostname" do
     subject.hostname = "lol nope"
     subject.should_not be_valid
-    subject.errors.on(:hostname).should == "is invalid"
+    subject.errors[:hostname].should == ["is invalid"]
 
     subject.hostname = nil
     subject.should_not be_valid
-    subject.errors.on(:hostname).should == "is invalid"
+    subject.errors[:hostname].should == ["is invalid"]
 
     subject.hostname = "db-01.example.com"
     subject.should be_valid

data/spec/hijacker/middleware_spec.rb

@@ -14,18 +14,130 @@ module Hijacker
       end
     end
 
+    let!(:host) { Hijacker::Host.create!(:hostname => "localhost") }
+    let!(:master) { Hijacker::Database.create!(:database => "sample-db", :host => host) }
+    let!(:foo) { Hijacker::Database.create!(:database => "foo", :host => host) }
+
+    before(:each) do
+      Hijacker.config = {
+       :hosted_environments => %w[test],
+       :domain_patterns => [
+         /^(.+)-admin\.crystalcommerce\.com/
+       ],
+       :sister_site_models => []
+      }
+
+      ActiveRecord::Base.stub(:establish_connection)
+    end
+
     describe "#call" do
+      let(:request_env) {{ 'HTTP_X_HIJACKER_DB' => 'sample-db' }}
+
+      def make_request
+        get '/', {}, request_env
+      end
+
       context "When the 'X-Hijacker-DB' header is set" do
         it "connects to the database from the header" do
-          Hijacker.should_receive(:connect).with("sample-db")
-          get '/',{}, 'HTTP_X_HIJACKER_DB' => 'sample-db'
+          make_request
+          expect(Hijacker.current_client).to eq('sample-db')
+        end
+
+        it "passes through" do
+          resp = make_request
+          expect(resp.status).to eq(200)
+          expect(resp.headers['blah']).to eq("blah")
+          expect(resp.body).to eq("success")
         end
       end
 
       context "When the 'X-Hijacker-DB' header is not set" do
-        it "doesn't connect to any database" do
-          Hijacker.should_not_receive(:connect)
-          get '/',{}, "x-not-db-header" => "something"
+        let(:request_env) do
+          {
+           "HTTP_HOST" => "foo-admin.crystalcommerce.com"
+          }
+        end
+
+        it "parses the host from the request and connects" do
+          make_request
+          expect(Hijacker.current_client).to eq("foo")
+        end
+
+        it "passes through" do
+          resp = make_request
+          expect(resp.status).to eq(200)
+          expect(resp.headers['blah']).to eq("blah")
+          expect(resp.body).to eq("success")
+        end
+
+
+        context "databases could not be determined" do
+          let(:request_env) do
+            {
+             "HTTP_HOST" => "bogus-admin.crystalcommerce.com"
+            }
+          end
+
+          it "returns a 404" do
+            resp = make_request
+            expect(resp.status).to eq(404)
+            expect(resp.body).to eq("Database bogus not found")
+          end
+        end
+      end
+
+      context "unparseable URL" do
+        let(:request_env) do
+          {
+           "HTTP_HOST" => "(>'-'>)"
+          }
+        end
+
+        it "returns a 404" do
+          resp = make_request
+          expect(resp.status).to eq(404)
+          expect(resp.body).to eq("cannot parse '(>'-'>)'")
+        end
+
+        context "custom bad url handler" do
+          def app
+            Rack::Builder.new do
+              use Hijacker::Middleware, :bad_url => ->(message, env) { [404, {}, "You done goofed, #{message}"]}
+              run lambda { |env| [200, { 'blah' => 'blah' }, ["success"]] }
+            end
+          end
+
+          it "uses the custom not found handler" do
+            resp = make_request
+            expect(resp.status).to eq(404)
+            expect(resp.body).to eq("You done goofed, cannot parse '(>'-'>)'")
+          end
+        end
+      end
+
+      context "database not found" do
+        let(:request_env) {{ 'HTTP_X_HIJACKER_DB' => 'bogus' }}
+
+        it "returns a 404" do
+          resp = make_request
+          expect(resp.status).to eq(404)
+          expect(resp.body).to eq("Database bogus not found")
+        end
+
+
+        context "custom missing database handler" do
+          def app
+            Rack::Builder.new do
+              use Hijacker::Middleware, :not_found => ->(database, env) { [404, {}, "You done goofed, #{database}"]}
+              run lambda { |env| [200, { 'blah' => 'blah' }, ["success"]] }
+            end
+          end
+
+          it "uses the custom not found handler" do
+            resp = make_request
+            expect(resp.status).to eq(404)
+            expect(resp.body).to eq("You done goofed, bogus")
+          end
         end
       end
     end

data/spec/hijacker_spec.rb

@@ -6,7 +6,7 @@ describe Hijacker do
   before(:each) do
     Hijacker.config = {
       :hosted_environments => hosted_environments
-    } 
+    }
   end
 
   let!(:host) { Hijacker::Host.create!(:hostname => "localhost") }
@@ -32,7 +32,7 @@ describe Hijacker do
     end
   end
 
-  describe "class methods" do 
+  describe "class methods" do
     subject { Hijacker }
 
     describe ".connect" do
@@ -43,7 +43,7 @@ describe Hijacker do
         subject.sister = nil
         subject.valid_routes = {}
         ActiveRecord::Base.stub(:establish_connection)
-        subject.stub(:root_connection).and_return(stub(:config => {}))
+        subject.stub(:root_connection).and_return(double(:config => {}))
         subject.stub(:connect_sister_site_models)
         Hijacker.stub(:do_hijacking?).and_return(true)
         ::ActionController::Base.stub(:perform_caching).
@@ -149,7 +149,7 @@ describe Hijacker do
 
         it "enables the query cache on ActiveRecord::Base" do
           subject.connect('master_db')
-          ::ActiveRecord::Base.connection.query_cache_enabled.should be_true
+          ::ActiveRecord::Base.connection.query_cache_enabled.should eq(true)
         end
 
         it "calls cache on the connection" do
@@ -159,7 +159,7 @@ describe Hijacker do
       end
 
       context "after_hijack call specified" do
-        let(:spy) { stub.as_null_object }
+        let(:spy) { double.as_null_object }
         before(:each) do
           Hijacker.config.merge!(:after_hijack => spy)
         end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ ActiveRecord::Base.configurations = {
   }
 }
 
-ActiveRecord::Base.establish_connection
+ActiveRecord::Base.establish_connection(:test)
 require File.dirname(__FILE__) + "/../example_root_schema"
 
 require 'hijacker'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbhijacker
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Michael Xavier
@@ -10,104 +10,166 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.5
 description: Allows a single Rails appliation to access many different databases
@@ -122,8 +184,8 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- example_root_schema.rb
 - dbhijacker.gemspec
+- example_root_schema.rb
 - lib/dbhijacker.rb
 - lib/hijacker.rb
 - lib/hijacker/active_record_ext.rb
@@ -145,22 +207,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: One application, multiple client databases