multidb 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871069e0b89ed728780ae50f13950dc1e8e1c6db
-  data.tar.gz: 56645bb4e9fd29f8f696e6e2534f963ce414dc62
+  metadata.gz: c2b318704dc25c750faff4197c282bfc34ce3b44
+  data.tar.gz: a6245b07384d189337568ef08fd5fe0467f92926
 SHA512:
-  metadata.gz: 67773f48625923f72efa87033d8e988ef36679c58d7ad928c1b79abd13722c54b14590c390c6e1d0c4542cb420199d8a709776ebdfbe2f0ef564086157909b74
-  data.tar.gz: 8ca58cc43cc994807fb72979866defbaf325f861f77b5ab2809c55a08c10b17673b1bead7a26e4482e0aaf85bff395cb5dd64093e9241e7800144670bda76dd2
+  metadata.gz: 2a5928902bb85f89d26b096a663a7269dd2de47412bb2c9e61c952fe4bfce5732c83ecd37d1eb938e5169d164e3828b8a5f36af3e8adffbd1ca212324596db3f
+  data.tar.gz: abe71fcb71c0d8e70b8ec41fbb0611b5921d3449c3e7f9e22a79dbd2e58ce58d7afe4c6b9b329cdd66a7faa221455ebe40fa195c4e959bda63fb78a883808517

data/.ruby-version

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

data/README.md

@@ -2,7 +2,7 @@
 
 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.
 
-MultiDB is _not_ meant for systems that may have large numbers of tenants; you wouldn't want to have that many databases. It was designed for a system with 100-200 tenants, with the option to go to 1,000, and an absolute upper limit of 10,000. If you anticipate having more, MultiDB may not be an appropriate solution. (MySQL itself does not specify an upper limit on the number of databases, but it will be constrained by open file limits and, in some cases, directory entry limits.)
+MultiDB is _not_ meant for systems that may have large numbers of tenants; you wouldn't want to have that many databases. It was designed for a system with 200-500 tenants, with the option to go to 10,000, and an absolute upper limit of 25,000. If you anticipate having more, MultiDB may not be an appropriate solution. (MySQL itself does not specify an upper limit on the number of databases, but it will be constrained by open file limits and, in some cases, directory entry limits.)
 
 To minimize API changes for you, MultiDB patches ActiveRecord, ActionController and their associated rake tasks as needed to enable database switching at appropriate times and add support for three sets of schemas and migrations. ActiveRecord::SessionStore::Session has also been patched.
 
@@ -11,7 +11,8 @@ 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).
 
 
-## Compatibility
+## 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.
@@ -24,15 +25,15 @@ Warning: MultiDB works only with mysql2 at present. If you are handy with Ruby,
 MultiDB is known to work with [Makara](https://github.com/taskrabbit/makara) in a production environment.
 
 
-##Get Started With MultiDB
+## Get Started
 
-Install the gem:
+Add it to your Gemfile:
 
-    gem install multidb
+    gem 'multidb', '~> 3.2.0'  # note: MultiDB 3.2 works with Rails 3.2
 
-Or add it to your Gemfile:
+Or install by hand:
 
-    gem 'multidb'
+    gem install multidb
 
 Then have your Organization class inherit from MultiDB::Organization. This gets you:
 

data/lib/multi_db/action_controller_patches.rb

@@ -7,9 +7,10 @@ class ActionController::Base
     
     # request is first priority
     if params[:org_code]
-      if session[:org_code] && session[:org_code] != params[:org_code]
-        reset_session
-      end
+      # AKN: we should let the gem user decide whether to do this
+      # if session[:org_code] && session[:org_code] != params[:org_code]
+      #   reset_session
+      # end
       @org = MultiDB::Organization.active.where(:code => params[:org_code]).first
     end
     
@@ -28,18 +29,12 @@ class ActionController::Base
     
     if session[:org_code]
       @org ||= MultiDB::Organization.active.where(:code => session[:org_code]).first
-      if @org
-        ActiveRecord::Base.connect_to_organization(session[:org_code], true)
-        return @org
-      end
+      return @org if @org && @org.connect(true)
     end
     
     if Rails.env.test? && ENV['RAILS_ORG']
       @org ||= MultiDB::Organization.active.where(:code => ENV['RAILS_ORG']).first
-      if @org
-        ActiveRecord::Base.connect_to_organization(session[:org_code], true)
-        return @org
-      end
+      return @org if @org && @org.connect(true)
     end
     
     # if we don't issue an establish_connection by now, connect to default db (sessions)

data/lib/multi_db/multidb.rake

@@ -231,7 +231,7 @@ db_namespace = namespace :db do
       require 'active_record/schema_dumper'
       
       databases_to_dump = 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 ]

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.0'
+  s.version     = '3.2.1'
   s.platform    = Gem::Platform::RUBY
   s.author      = "Aaron Namba"
   s.email       = "aaron@biggerbird.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multidb
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: MultiDB for ActiveRecord