dbhijacker 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18973a9ed00b466a40b0e395681ec42969ef9eb8
-  data.tar.gz: 4fb1e3627227267b236e3ec240f1ef580b8375e9
+  metadata.gz: b61c5d24b9229df100c3d14ad23097384b30723f
+  data.tar.gz: 2734c133056b45ca581fa4af0103894789bd3c51
 SHA512:
-  metadata.gz: 6869a27406d577b763c99f7e927ec56f2cdfdedcbd0348be729e90d46fb7545cb5077fffddf6beec15eae9e346bd0ec7dc4ce01c237ad5703e07ffe44df88514
-  data.tar.gz: 7819f37c2a3d7b0132827fb88c915ba338bb3fa3c16a12638b9b108cd02a74de2c8744ef96d04c14996926ca8663ec20fb0eaeca6d2d61967c90a37dfbeacd74
+  metadata.gz: 29602211b164b17dd2b715287763f3c5d9b3e412baac6813d7b1c7d39fcc5107caebfe8f7b5502df0c13bbca01e0b779b2fe72ec9b3b1a488321b8052023fc91
+  data.tar.gz: 5afbcc9eee78995a502ebe41235a7a3db9c266f29d6144c5021037cc6179cf5ac5ebbd61f3a2de4fc3a4487050e409c0100b045c8cb48edc4a72d35e7908464a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.10.0)
+    dbhijacker (0.10.3)
       rails (>= 2.3.14, < 4.0)
 
 GEM
@@ -34,29 +34,15 @@ GEM
     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)
@@ -69,22 +55,10 @@ GEM
     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)
@@ -95,18 +69,7 @@ GEM
       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)
@@ -156,7 +119,6 @@ GEM
       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)
@@ -173,7 +135,6 @@ DEPENDENCIES
   guard
   guard-bundler
   guard-rspec
-  jeweler
   rack (>= 1.1.0)
   rack-test (>= 0.6.1)
   rake (>= 0.9.2)

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rdoc/task'
-
+require 'rubygems/package_task'
 
 desc 'Generate documentation for the hijacker plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -11,15 +11,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "hijacker"
-    gemspec.summary = "One application, multiple client databases"
-    gemspec.description = "Allows a single Rails appliation to access many different databases"
-    gemspec.email = "woody@crystalcommerce.com"
-    gemspec.authors = ["Woody Peterson"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+spec = Gem::Specification.load("dbhijacker.gemspec")
+Gem::PackageTask.new(spec) {}
+
+desc "Push latest gem version"
+task :release => :gem do
+  sh "gem push pkg/#{spec.name}-#{spec.version}.gem"
 end

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.10.2"
+  s.version = "0.10.3"
 
   s.license = "MIT"
 
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("rails", ">= 2.3.14", "< 4.0")
 
-  s.add_development_dependency "jeweler"
   s.add_development_dependency "bundler"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
@@ -41,6 +40,7 @@ Gem::Specification.new do |s|
     lib/hijacker.rb
     lib/hijacker/active_record_ext.rb
     lib/hijacker/alias.rb
+    lib/hijacker/base_model.rb
     lib/hijacker/controller_methods.rb
     lib/hijacker/database.rb
     lib/hijacker/host.rb

data/lib/hijacker.rb

@@ -252,6 +252,7 @@ private
   end
 end
 
+require_relative './hijacker/base_model'
 require_relative './hijacker/database'
 require_relative './hijacker/alias'
 require_relative './hijacker/host'

data/lib/hijacker/alias.rb

@@ -1,7 +1,5 @@
 module Hijacker
-  class Alias < ActiveRecord::Base
-    establish_connection(Hijacker.root_config)
-
+  class Alias < BaseModel
     belongs_to :database, :class_name => "Hijacker::Database"
   end
 end

data/lib/hijacker/base_model.rb

@@ -0,0 +1,7 @@
+module Hijacker
+  class BaseModel < ActiveRecord::Base
+    establish_connection('root')
+
+    self.abstract_class = true
+  end
+end

data/lib/hijacker/database.rb

@@ -15,7 +15,7 @@ if !defined?(Mysql)
   end
 end
 
-class Hijacker::Database < ActiveRecord::Base
+class Hijacker::Database < Hijacker::BaseModel
   module MissingDatabaseError
     MYSQL_UNKNOWN_DB_ERRNO = 1049
 
@@ -26,8 +26,6 @@ class Hijacker::Database < ActiveRecord::Base
     end
   end
 
-  establish_connection(Hijacker.root_config)
-
   has_many :aliases, :class_name => "Hijacker::Alias"
   belongs_to :master, :foreign_key => 'master_id', :class_name => 'Hijacker::Database'
   has_many :sisters, :foreign_key => 'master_id', :class_name => 'Hijacker::Database'

data/lib/hijacker/host.rb

@@ -1,5 +1,3 @@
-class Hijacker::Host < ActiveRecord::Base
-  establish_connection(Hijacker.root_config)
-
+class Hijacker::Host < Hijacker::BaseModel
   validates_format_of :hostname, :with => /^(#{URI::REGEXP::PATTERN::HOST}|#{URI::REGEXP::PATTERN::IPV6ADDR})$/
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbhijacker
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Michael Xavier
@@ -32,20 +32,6 @@ dependencies:
     - - "<"
       - !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
@@ -190,6 +176,7 @@ files:
 - lib/hijacker.rb
 - lib/hijacker/active_record_ext.rb
 - lib/hijacker/alias.rb
+- lib/hijacker/base_model.rb
 - lib/hijacker/controller_methods.rb
 - lib/hijacker/database.rb
 - lib/hijacker/host.rb
@@ -234,4 +221,3 @@ test_files:
 - spec/hijacker/middleware_spec.rb
 - spec/hijacker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: