multidb 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b318704dc25c750faff4197c282bfc34ce3b44
-  data.tar.gz: a6245b07384d189337568ef08fd5fe0467f92926
+  metadata.gz: b0e97b0db4c85a383ec514d3d514e807048163d8
+  data.tar.gz: a5f83d23bd77c3e4d30a0421231c7413f4bc7eed
 SHA512:
-  metadata.gz: 2a5928902bb85f89d26b096a663a7269dd2de47412bb2c9e61c952fe4bfce5732c83ecd37d1eb938e5169d164e3828b8a5f36af3e8adffbd1ca212324596db3f
-  data.tar.gz: abe71fcb71c0d8e70b8ec41fbb0611b5921d3449c3e7f9e22a79dbd2e58ce58d7afe4c6b9b329cdd66a7faa221455ebe40fa195c4e959bda63fb78a883808517
+  metadata.gz: a978b553a48398e2970bfff3fd69bf207670131e1974ee3fcae38efc5345a3f4810e6a9bec07fa45d590395780c6a8ed69d9f616c5e78cb850824ce3e4f51ef2
+  data.tar.gz: 76506cbfaa83016d6b82c8a8903580d617af5716a9402c3c04742f2d33d9f1db9c34688c8a2198d979e1b116d50db7cd2e4d20ead37918be24eba9d6c2696e14

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1.0

data/README.md

@@ -1,4 +1,4 @@
-#About MultiDB
+# About MultiDB
 
 MultiDB is a multitenant extension for Rails (or just ActiveRecord) that allows you to isolate each tenant into its own individual database without requiring major changes to your application code.
 
@@ -10,12 +10,16 @@ Internally, MultiDB refers to tenants as organizations. In addition to the organ
 
 MultiDB, when used with Rails (ActionController), determines which database to connect to at the beginning of each request by checking for `request.host`, `params[:org_code]`, then `session[:org_code]`. In a test environment, it can will also check the environment variable `RAILS_ORG`. If no organization code is found in any of those places, the sessions database is used (which is one reason it is important that no actual data be stored there).
 
+## Current Status
+
+The present version of MultiDB is extracted from ClarityEHR, a product of [MedNexus](http://mednex.us/) scheduled for release in Fall 2014. An older version (identical concept, similar basic mechanism, but less elegant implementation) has been in production in other products since 2007.
+
 
 ## Versioning & Compatibility
 MultiDB follows semantic versioning, but because it is closely tied to Rails/ActiveRecord, it uses the same major/minor version numbers to make it easy to determine which version of MultiDB to use. Patch numbers may vary.
 
 ### Rails & ActiveRecord
-MultiDB 3.2 works with Rails 3.2. A new branch will be created to work with Rails 4.
+MultiDB 4.0 works with Rails 4.0, MultiDB 3.2 works with Rails 3.2.
 
 The concept should work with just ActiveRecord (no Rails), but this use case has not been tested. (Pull requests welcome.)
 
@@ -29,7 +33,7 @@ MultiDB is known to work with [Makara](https://github.com/taskrabbit/makara) in
 
 Add it to your Gemfile:
 
-    gem 'multidb', '~> 3.2.0'  # note: MultiDB 3.2 works with Rails 3.2
+    gem 'multidb', '~> 4.0.0'  # note: MultiDB 4.0 works with Rails 4.0
 
 Or install by hand:
 
@@ -63,4 +67,4 @@ Your table will need to have columns for `code` (string) and `active` (boolean),
 
 ## Contributing
 
-Pull requests welcome. Don't forget tests! When adding support for a new adapter, create a new Rails app for your adapter (e.g. `rails _3.2.16_ new testapp_postgresql`), customize database.yml and other files as needed, then add specs to that app.
+Pull requests welcome. Don't forget tests! When adding support for a new adapter, create a new Rails app for your adapter (e.g. `rails _4.0.2_ new testapp_postgresql`), customize database.yml and other files as needed, then add specs to that app.

data/lib/multi_db/action_controller_patches.rb

@@ -17,7 +17,7 @@ class ActionController::Base
     # try hostname if we don't already have a code in the session
     if !@org && !session[:org_code] && request && request.host
       @org ||= MultiDB::Organization.active.where(:code => $1.gsub('-', '_')).first if request.host =~ /^([-\w\d]+)/
-      @org ||= MultiDB::Organization.active.includes(:hosts).where('organization_hosts.host = ?', request.host).first
+      @org ||= MultiDB::Organization.active.includes(:hosts).where('organization_hosts.host = ?', request.host).references(:organization_hosts).first
     end
     
     if @org

data/lib/multi_db/active_record_patches.rb

@@ -90,5 +90,65 @@ module ActiveRecord
       end
       
     end
+    
+  end
+  
+  
+  module Tasks
+    
+    module DatabaseTasks
+      
+      alias :create_without_multidb :create
+      def create(*arguments)
+        create_or_drop(:create, arguments)
+      end
+      
+      alias :drop_without_multidb :drop
+      def drop(*arguments)
+        create_or_drop(:drop, arguments)
+      end
+      
+      def create_or_drop(*arguments)
+        create_or_drop = arguments[0]
+        arguments = arguments[1]
+        
+        _config = arguments.shift
+        config_name = ActiveRecord::Base.configurations.invert[_config]
+        is_test = (config_name == 'test')
+        config = _config.dup
+        
+        case ENV['RAILS_ORG']
+        when nil
+          # set default org database
+          raise "No database name specified in configuration \"#{config_name}\"" unless config['database']
+          config['database'] += '_org1'
+        when 'sessions'
+          # do nothing
+        when 'master'
+          config = ActiveRecord::Base.master_configuration(is_test ? 'test' : nil)
+        else
+          config['database'] += '_' + ENV['RAILS_ORG']
+        end
+        
+        arguments.unshift config
+        
+        case create_or_drop
+          when :create then create_without_multidb(*arguments)
+          when :drop then drop_without_multidb(*arguments)
+        end
+      end
+      
+    end
+    
+    class MySQLDatabaseTasks
+      
+      def purge
+        establish_connection configuration
+        connection.recreate_database configuration['database'], creation_options
+      end
+      
+    end
+    
   end
+  
 end

data/lib/multi_db/multidb.rake

@@ -1,6 +1,5 @@
 #
-# Based on activerecord-3.2.15/lib/active_record/railties/databases.rake
-# Last updated 2013-11-19 by Aaron Namba
+# Based on activerecord-4.0.2/lib/active_record/railties/databases.rake
 #
 # AKN: Warning! All code to support db engines other than mysql has been deleted,
 #      since I know it will never receive proper testing.
@@ -250,7 +249,7 @@ db_namespace = namespace :db do
     desc 'Load a schema.rb file into the database'
     task :load => [:environment, :load_config] do
       databases_to_load = case ENV['RAILS_ORG']
-        when nil then [ :sessions, :master, :organization ]
+        when nil then [ :sessions, :master ]
         when 'sessions' then [ :sessions ]
         when 'master' then [ :master ]
         else [ :organization ]
@@ -280,81 +279,8 @@ db_namespace = namespace :db do
     
     # desc "Empty the test databases"
     task :purge => [:environment, :load_config] do
-      abcs = ActiveRecord::Base.configurations
-      
-      # sessions
-      ActiveRecord::Base.connect_to_sessions
-      ActiveRecord::Base.connection.recreate_database(abcs['test']['database'], mysql_creation_options(abcs['test']))
-      
-      # master
-      ActiveRecord::Base.connect_to_master
-      ActiveRecord::Base.connection.recreate_database(ActiveRecord::Base.master_configuration('test')['database'], mysql_creation_options(abcs['test']))
-      
-      # org
-      ActiveRecord::Base.connect_to_organization
-      ActiveRecord::Base.connection.recreate_database(abcs['test']['database'] + '_org1', mysql_creation_options(abcs['test']))
-    end
-  end
-  
-  alias :create_database_without_multidb :create_database
-  def create_database(_config)
-    is_test = ActiveRecord::Base.configurations.invert[_config] == 'test'
-    config = _config.dup
-    
-    case ENV['RAILS_ORG']
-    when nil
-      # set default org database
-      config['database'] += '_org1'
-    when 'sessions'
-      # do nothing
-    when 'master'
-      config = ActiveRecord::Base.master_configuration(is_test ? 'test' : nil)
-    else
-      config['database'] += '_' + ENV['RAILS_ORG']
-    end
-    
-    create_database_without_multidb(config)
-  end
-end
-
-
-alias :drop_database_without_multidb :drop_database
-def drop_database(_config)
-  is_test = ActiveRecord::Base.configurations.invert[_config] == 'test'
-  config = _config.dup
-  
-  case ENV['RAILS_ORG']
-  when nil
-    # set default org database
-    config['database'] += '_org1'
-  when 'sessions'
-    # do nothing
-  when 'master'
-    config = ActiveRecord::Base.master_configuration(is_test ? 'test' : nil)
-  else
-    config['database'] += '_' + ENV['RAILS_ORG']
-  end
-  
-  drop_database_without_multidb(config)
-end
-
-# not sure yet why environment is not loaded before running create_database/drop_database
-# for now, copied this in from lib/multi_db/active_record_patches.rb
-module ActiveRecord
-  class Base
-    class << self
-      
-      def master_configuration(env = nil)
-        env ||= Rails.env
-        
-        # use master db configuration in config/database.yml if present
-        configurations["master_#{env}"] or Proc.new {
-          c = configurations[env].dup
-          c['database'] += '_master'
-          c
-        }.call
-      end
-      
+      ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations['test']
+      ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.master_configuration('test')
     end
   end
 end

data/multidb.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "multidb"
-  s.version     = '3.2.1'
+  s.version     = '4.0.0'
   s.platform    = Gem::Platform::RUBY
   s.author      = "Aaron Namba"
   s.email       = "aaron@biggerbird.com"
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency 'activerecord', '~> 3.2', '>= 3.2.16'
+  s.add_dependency 'activerecord', '~> 4.0', '>= 4.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multidb
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 4.0.2
 description: Enables multitenant setup with one database per tenant. See README for
   details.
 email: aaron@biggerbird.com
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: MultiDB for ActiveRecord