active_tenant 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_tenant.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_tenant.gemspec
+gemspec

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 gabriel
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2012 gabriel
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,2 +1,2 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/active_tenant.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '>= 3.0.0'
+  s.add_dependency 'rails', '>= 3.2.0'
 
   s.add_development_dependency 'pg'
   s.add_development_dependency 'sqlite3'

data/lib/active_tenant.rb

@@ -1,6 +1,8 @@
+require 'rails'
 require 'active_record'
 
 require 'active_tenant/version'
+require 'active_tenant/engine'
 require 'active_tenant/adapters/sqlite_adapter'
 require 'active_tenant/adapters/postgres_adapter'
 require 'active_tenant/base'

data/lib/active_tenant/active_record_extensions.rb

@@ -18,8 +18,12 @@ module ActiveTenant
         ActiveTenant.current.with(name) { yield }
       end
 
+      def tenant?
+        !ActiveTenant.current.global?
+      end
+
       def tenant_name
-        ActiveTenant.current.name
+        ActiveTenant.current.name if tenant?
       end
 
     end

data/lib/active_tenant/adapters/postgres_adapter.rb

@@ -47,6 +47,10 @@ module ActiveTenant
       @global || 'public'
     end
 
+    def global?
+      global == name
+    end
+
     private
 
     def global=(name)

data/lib/active_tenant/adapters/sqlite_adapter.rb

@@ -50,6 +50,10 @@ module ActiveTenant
       @global
     end
 
+    def global?
+      global == name
+    end
+
     private
 
     def global=(name)

data/lib/active_tenant/base.rb

@@ -5,9 +5,10 @@ module ActiveTenant
         postgresql: PostgresAdapter
     }
 
-    delegate :all, :create, :remove, :with, :name, :global, to: :adapter
+    delegate :all, :create, :remove, :with, :name, :global, :global?, to: :adapter
 
     def migrate(name, version=nil)
+      ::ActiveRecord::Base.logger.info "[ActiveTenant] Migrating tenant: #{name}"
       with name do
         ::ActiveRecord::Migrator.migrate(::ActiveRecord::Migrator.migrations_path, version) do |migration_proxy|
           [:all, ::ActiveRecord::Base.tenant_name.to_sym].include? migration_proxy.send(:migration).class.tenant
@@ -22,6 +23,7 @@ module ActiveTenant
     end
 
     def migrate_global(version=nil)
+      ::ActiveRecord::Base.logger.info '[ActiveTenant] Migrating global db'
       with global do
         ::ActiveRecord::Migrator.migrate(::ActiveRecord::Migrator.migrations_path, version) do |migration_proxy|
           migration_proxy.send(:migration).class.tenant.nil?

data/lib/active_tenant/engine.rb

@@ -0,0 +1,4 @@
+module ActiveTenant
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/active_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActiveTenant
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/tasks/migration.rake

@@ -0,0 +1,21 @@
+namespace :db do
+  namespace :migrate do
+
+    desc 'Migrate global db and all tenants'
+    task :all => :environment do
+      ActiveTenant.current.migrate_global
+      ActiveTenant.current.migrate_all
+    end
+
+    desc 'Migrate only global db'
+    task :global => :environment do
+      ActiveTenant.current.migrate_global
+    end
+
+    desc 'Migrate all tenants excluding global db'
+    task :tenants => :environment do
+      ActiveTenant.current.migrate_all
+    end
+
+  end
+end

data/spec/adapters_spec.rb

@@ -95,9 +95,9 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
         ActiveTenant.current.migrate_global
 
         ActiveRecord::Base.connection.table_exists?('globals').should be_true
-        ActiveRecord::Base.connection.table_exists?('tenants').should_not be_true
-        ActiveRecord::Base.connection.table_exists?('other_tenants').should_not be_true
-        ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+        ActiveRecord::Base.connection.table_exists?('tenants').should be_false
+        ActiveRecord::Base.connection.table_exists?('other_tenants').should be_false
+        ActiveRecord::Base.connection.table_exists?('customs').should be_false
 
         ActiveTenant.current.remove 'dummy'
       end
@@ -109,17 +109,17 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
         ActiveTenant.current.migrate 'dummy_1'
 
         ActiveTenant.current.with 'dummy_1' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('other_tenants').should be_true
-          ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('customs').should be_false
         end
 
         ActiveTenant.current.with 'dummy_2' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
-          ActiveRecord::Base.connection.table_exists?('tenants').should_not be_true
-          ActiveRecord::Base.connection.table_exists?('other_tenants').should_not be_true
-          ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
+          ActiveRecord::Base.connection.table_exists?('tenants').should be_false
+          ActiveRecord::Base.connection.table_exists?('other_tenants').should be_false
+          ActiveRecord::Base.connection.table_exists?('customs').should be_false
         end
 
         ActiveTenant.current.remove 'dummy_1'
@@ -133,17 +133,17 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
         ActiveTenant.current.migrate_all
 
         ActiveTenant.current.with 'dummy_1' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('other_tenants').should be_true
-          ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('customs').should be_false
         end
 
         ActiveTenant.current.with 'dummy_2' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('other_tenants').should be_true
-          ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('customs').should be_false
         end
 
         ActiveTenant.current.remove 'dummy_1'
@@ -156,7 +156,7 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
         ActiveTenant.current.migrate 'custom'
 
         ActiveTenant.current.with 'custom' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('other_tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('customs').should be_true
@@ -172,7 +172,7 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
 
         ActiveTenant.current.with 'dummy' do
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
-          ActiveRecord::Base.connection.table_exists?('other_tenants').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('other_tenants').should be_false
         end
 
         ActiveTenant.current.remove 'dummy'
@@ -183,23 +183,32 @@ ActiveTenant::Base::ADAPTERS.keys.each do |adapter_name|
     context 'ActiveRecord extensions' do
 
       it 'Create, migrate and remove' do
+        ActiveRecord::Base.tenant?.should be_false
+        ActiveRecord::Base.tenant_name.should be_nil
+
         ActiveRecord::Base.create_tenant 'dummy'
 
         ActiveRecord::Migration.migrate_all
 
         ActiveRecord::Base.connection.table_exists?('globals').should be_true
-        ActiveRecord::Base.connection.table_exists?('tenants').should_not be_true
-        ActiveRecord::Base.connection.table_exists?('other_tenants').should_not be_true
-        ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+        ActiveRecord::Base.connection.table_exists?('tenants').should be_false
+        ActiveRecord::Base.connection.table_exists?('other_tenants').should be_false
+        ActiveRecord::Base.connection.table_exists?('customs').should be_false
 
         ActiveRecord::Base.with_tenant 'dummy' do
-          ActiveRecord::Base.connection.table_exists?('globals').should_not be_true
+          ActiveRecord::Base.tenant?.should be_true
+          ActiveRecord::Base.tenant_name.should eq 'dummy'
+
+          ActiveRecord::Base.connection.table_exists?('globals').should be_false
           ActiveRecord::Base.connection.table_exists?('tenants').should be_true
           ActiveRecord::Base.connection.table_exists?('other_tenants').should be_true
-          ActiveRecord::Base.connection.table_exists?('customs').should_not be_true
+          ActiveRecord::Base.connection.table_exists?('customs').should be_false
         end
 
         ActiveRecord::Base.remove_tenant 'dummy'
+
+        ActiveRecord::Base.tenant?.should be_false
+        ActiveRecord::Base.tenant_name.should be_nil
       end
 
     end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 TEMP_PATH = ENV['TMP'].gsub("\\", '/')
 
+ActiveRecord::Base.logger = Logger.new($stdout)
 ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_tenant
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &25487856 !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &27972744 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *25487856
+  version_requirements: *27972744
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &25463208 !ruby/object:Gem::Requirement
+  requirement: &27972492 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25463208
+  version_requirements: *27972492
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &25414248 !ruby/object:Gem::Requirement
+  requirement: &27972216 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25414248
+  version_requirements: *27972216
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25336344 !ruby/object:Gem::Requirement
+  requirement: &27971964 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25336344
+  version_requirements: *27971964
 description: ActiveRecord extensions for multi tenant applications
 email:
 - gabynaiman@gmail.com
@@ -74,7 +74,9 @@ files:
 - lib/active_tenant/adapters/sqlite_adapter.rb
 - lib/active_tenant/base.rb
 - lib/active_tenant/configuration.rb
+- lib/active_tenant/engine.rb
 - lib/active_tenant/version.rb
+- lib/tasks/migration.rake
 - spec/adapters_spec.rb
 - spec/migrations/20120823132512_create_globals.rb
 - spec/migrations/20120823132854_create_tenants.rb