dbhijacker 0.7.2 → 0.8.0

data/Gemfile

@@ -1,3 +1,2 @@
 source "https://rubygems.org"
 gemspec
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.7.1)
+    dbhijacker (0.7.3)
       rails (>= 2.3.14)
 
 GEM
@@ -17,12 +17,9 @@ GEM
     activeresource (2.3.18)
       activesupport (= 2.3.18)
     activesupport (2.3.18)
-    columnize (0.3.6)
-    diff-lcs (1.1.3)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    rack (1.1.3)
-    rack-test (0.6.1)
+    diff-lcs (1.2.3)
+    rack (1.1.6)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (2.3.18)
       actionmailer (= 2.3.18)
@@ -31,31 +28,25 @@ GEM
       activeresource (= 2.3.18)
       activesupport (= 2.3.18)
       rake (>= 0.8.3)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sqlite3 (1.3.5)
+    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)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sqlite3 (1.3.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 1.3)
   dbhijacker!
   rack (~> 1.1.0)
   rack-test (~> 0.6.1)
   rake (~> 0.9.2)
-  rspec (~> 2.8.0)
-  ruby-debug (~> 0.10.4)
+  rspec (~> 2.8)
   sqlite3 (~> 1.3.5)

data/{hijacker.gemspec → dbhijacker.gemspec}

@@ -3,34 +3,34 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
-  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_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.0")
-  s.add_development_dependency("sqlite3", "~>1.3.5")
-  s.add_development_dependency("ruby-debug", "~>0.10.4")
+
+  s.add_development_dependency "bundler",   "~> 1.3"
+  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.extra_rdoc_files = [
     "README.rdoc"
   ]
+
   s.files = %w{
     Gemfile
     Gemfile.lock
     MIT-LICENSE
     README.rdoc
     Rakefile
-    VERSION
     example_root_schema.rb
-    hijacker.gemspec
-    init.rb
-    install.rb
+    dbhijacker.gemspec
     lib/dbhijacker.rb
     lib/hijacker.rb
     lib/hijacker/active_record_ext.rb
@@ -46,11 +46,9 @@ Gem::Specification.new do |s|
     spec/hijacker_spec.rb
     spec/spec_helper.rb
     tasks/hijacker_tasks.rake
-    uninstall.rb
   }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.8.15}
   s.summary = %q{One application, multiple client databases}
   s.test_files = %w{
     spec/hijacker/alias_spec.rb
@@ -60,10 +58,4 @@ Gem::Specification.new do |s|
     spec/hijacker_spec.rb
     spec/spec_helper.rb
   }
-
-  if s.respond_to?(:specification_version)
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-  end
 end
-

data/example_root_schema.rb

@@ -17,5 +17,6 @@ ActiveRecord::Schema.define(:version => 2) do
 
   create_table "hosts", :force => true do |t|
     t.string "hostname"
+    t.integer "port", :default => 3306
   end
 end

data/lib/hijacker/database.rb

@@ -56,10 +56,10 @@ class Hijacker::Database < ActiveRecord::Base
   def self.find_master_for(client)
     @masters ||= {}
     @masters[client] ||= self.connection.select_values(
-        "SELECT master.database 
-        FROM `databases` AS master, `databases` AS sister
-        WHERE sister.database = #{ActiveRecord::Base.connection.quote(client)}
-        AND sister.master_id = master.id"
+        "SELECT master.database "\
+        "FROM `databases` AS master, `databases` AS sister "\
+        "WHERE sister.database = #{ActiveRecord::Base.connection.quote(client)} "\
+        "AND sister.master_id = master.id"
       ).first
   end
 
@@ -68,7 +68,7 @@ class Hijacker::Database < ActiveRecord::Base
     master = self.find_master_for(client)
     sister = master.nil? ? nil : client
     master ||= client
-    
+
     return master, sister
   end
 

data/lib/hijacker.rb

@@ -230,8 +230,11 @@ private
   end
 
   def self.connection_config(database)
+    hostname = database.host.hostname
+    port = database.host.port || root_config['port']
     root_config.merge('database' => database.name,
-                      'host' => database.host.hostname)
+                      'host' => hostname,
+                      'port' => port)
   end
 end
 

data/spec/hijacker/middleware_spec.rb

@@ -10,7 +10,7 @@ module Hijacker
     def app
       Rack::Builder.new do
         use Hijacker::Middleware
-        run lambda { |env| [200, { 'blah' => 'blah' }, "success"] }
+        run lambda { |env| [200, { 'blah' => 'blah' }, ["success"]] }
       end
     end
 

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'active_support'
 require 'active_support/test_case'
-require 'ruby-debug'
-
 require 'active_record'
 
-RAILS_ENV="test"
+RAILS_ENV = "test"
 ENV['RAILS_ENV'] = 'test'
+
 $:.unshift '../lib'
+
 ActiveRecord::Base.configurations = {
   "root" => {
     :adapter => 'sqlite3',

metadata

@@ -1,155 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbhijacker
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
-authors: 
+authors:
 - Michael Xavier
 - Donald Plummer
 - Woody Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rails
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 3
-        - 14
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.14
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
+- !ruby/object:Gem::Dependency
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  prerelease: false
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: rack-test
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  prerelease: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  prerelease: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  prerelease: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 3
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.3.5
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 10
-        - 4
-        version: 0.10.4
-  type: :development
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 description: Allows a single Rails appliation to access many different databases
 email: developers@crystalcommerce.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - example_root_schema.rb
-- hijacker.gemspec
-- init.rb
-- install.rb
+- dbhijacker.gemspec
 - lib/dbhijacker.rb
 - lib/hijacker.rb
 - lib/hijacker/active_record_ext.rb
@@ -165,41 +154,32 @@ files:
 - spec/hijacker_spec.rb
 - spec/spec_helper.rb
 - tasks/hijacker_tasks.rake
-- uninstall.rb
 homepage: https://github.com/crystalcommerce/hijacker
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: One application, multiple client databases
-test_files: 
+test_files:
 - spec/hijacker/alias_spec.rb
 - spec/hijacker/database_spec.rb
 - spec/hijacker/host_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/init.rb

@@ -1,2 +0,0 @@
-# Include hook code here
-require 'hijacker'

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here