active_tenant 0.0.2 → 0.0.3

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rspec spec

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/README.md

@@ -1,39 +1,41 @@
-# ActiveTenant
-
-ActiveRecord extensions for multi tenant applications
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'active_tenant'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install active_tenant
-
-## Usage
-
-    ActiveRecord::Base.create_tenant 'customer_name'
-
-    ActiveRecord::Migration.migrate_tenant 'customer_name'
-    # or
-    ActiveRecord::Migration.migrate_all_tenants
-
-    ActiveRecord::Base.with_tenant 'customer_name' do
-      Porduct.find(1234)
-    end
-
-    ActiveRecord::Base.remove_tenant 'customer_name'
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# ActiveTenant
+
+[![Build Status](https://travis-ci.org/gabynaiman/active_tenant.png?branch=master)](https://travis-ci.org/gabynaiman/active_tenant)
+
+ActiveRecord extensions for multi tenant applications
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'active_tenant'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install active_tenant
+
+## Usage
+
+    ActiveRecord::Base.create_tenant 'customer_name'
+
+    ActiveRecord::Migration.migrate_tenant 'customer_name'
+    # or
+    ActiveRecord::Migration.migrate_all_tenants
+
+    ActiveRecord::Base.with_tenant 'customer_name' do
+      Porduct.find(1234)
+    end
+
+    ActiveRecord::Base.remove_tenant 'customer_name'
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

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

@@ -1,23 +1,23 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/active_tenant/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name          = 'active_tenant'
-  s.version       = ActiveTenant::VERSION
-  s.authors       = ['Gabriel Naiman']
-  s.email         = ['gabynaiman@gmail.com']
-  s.description   = 'ActiveRecord extensions for multi tenant applications'
-  s.summary       = 'ActiveRecord extensions for multi tenant applications'
-  s.homepage      = 'https://github.com/gabynaiman/active_tenant'
-
-  s.files         = `git ls-files`.split($\)
-  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.add_dependency 'rails', '>= 3.2.0'
-
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec'
-end
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/active_tenant/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name          = 'active_tenant'
+  s.version       = ActiveTenant::VERSION
+  s.authors       = ['Gabriel Naiman']
+  s.email         = ['gabynaiman@gmail.com']
+  s.description   = 'ActiveRecord extensions for multi tenant applications'
+  s.summary       = 'ActiveRecord extensions for multi tenant applications'
+  s.homepage      = 'https://github.com/gabynaiman/active_tenant'
+
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'rails', '>= 3.2.0'
+
+  s.add_development_dependency 'pg'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rspec'
+end

data/lib/active_tenant/active_record_extensions.rb

@@ -1,56 +1,60 @@
-module ActiveTenant
-  module ActiveRecord
-    module Base
-
-      def all_tenants
-        ActiveTenant.current.all
-      end
-
-      def create_tenant(name)
-        ActiveTenant.current.create name
-      end
-
-      def remove_tenant(name)
-        ActiveTenant.current.remove name
-      end
-
-      def with_tenant(name)
-        ActiveTenant.current.with(name) { yield }
-      end
-
-      def tenant?
-        !ActiveTenant.current.global?
-      end
-
-      def tenant_name
-        ActiveTenant.current.name if tenant?
-      end
-
-    end
-
-    module Migration
-
-      def tenant(name=nil)
-        name ? @tenant_name = name : @tenant_name
-      end
-
-      def migrate_global(version=nil)
-        ActiveTenant.current.migrate_global version
-      end
-
-      def migrate_tenant(name, version=nil)
-        ActiveTenant.current.migrate name, version
-      end
-
-      def migrate_all_tenants(version=nil)
-        ActiveTenant.current.migrate_all version
-      end
-
-      def migrate_all(version=nil)
-        migrate_global version
-        migrate_all_tenants version
-      end
-
-    end
-  end
+module ActiveTenant
+  module ActiveRecord
+    module Base
+
+      def all_tenants
+        ActiveTenant.current.all
+      end
+
+      def create_tenant(name)
+        ActiveTenant.current.create name
+      end
+
+      def remove_tenant(name)
+        ActiveTenant.current.remove name
+      end
+
+      def with_tenant(name)
+        ActiveTenant.current.with(name) { yield }
+      end
+
+      def tenant?
+        !ActiveTenant.current.global?
+      end
+
+      def tenant_name
+        ActiveTenant.current.name if tenant?
+      end
+
+      def belongs_to_tenant_global
+        establish_connection ActiveTenant.current.connection_settings(ActiveTenant.current.global)
+      end
+
+    end
+
+    module Migration
+
+      def tenant(name=nil)
+        name ? @tenant_name = name : @tenant_name
+      end
+
+      def migrate_global(version=nil)
+        ActiveTenant.current.migrate_global version
+      end
+
+      def migrate_tenant(name, version=nil)
+        ActiveTenant.current.migrate name, version
+      end
+
+      def migrate_all_tenants(version=nil)
+        ActiveTenant.current.migrate_all version
+      end
+
+      def migrate_all(version=nil)
+        migrate_global version
+        migrate_all_tenants version
+      end
+
+    end
+  end
 end

data/lib/active_tenant/adapters/postgres_adapter.rb

@@ -1,70 +1,73 @@
-module ActiveTenant
-  class PostgresAdapter
-    delegate :connection_config, :establish_connection, :connection, to: ::ActiveRecord::Base
-
-    def initialize
-      self.global = ActiveTenant.configuration.global if ActiveTenant.configuration.global
-    end
-
-    def all
-      connection.select_values("SELECT nspname FROM pg_namespace WHERE nspname <> 'information_schema' AND nspname NOT LIKE 'pg%'") - [global]
-    end
-
-    def create(name)
-      unless all.include? name
-        connection.execute "CREATE SCHEMA \"#{name}\""
-      end
-    end
-
-    def remove(name)
-      if all.include? name
-        connection.execute "DROP SCHEMA \"#{name}\" CASCADE"
-      end
-    end
-
-    def with(name)
-      return yield if name == search_path
-
-      ex = nil
-      current_schema = search_path
-      search_path name
-      begin
-        result = yield
-      rescue => e
-        ex = e
-      ensure
-        search_path current_schema
-        raise ex unless ex.nil?
-        result
-      end
-    end
-
-    def name
-      search_path
-    end
-
-    def global
-      @global || 'public'
-    end
-
-    def global?
-      global == name
-    end
-
-    private
-
-    def global=(name)
-      @global = name
-    end
-
-    def search_path(name=nil)
-      if name
-        connection.execute("SET SEARCH_PATH TO \"#{name}\"")
-        establish_connection connection_config.merge(schema_search_path: name)
-      else
-        connection_config[:schema_search_path]
-      end
-    end
-
-  end
+module ActiveTenant
+  class PostgresAdapter
+    delegate :connection_config, :establish_connection, :connection, to: ::ActiveRecord::Base
+
+    def initialize
+      self.global = ActiveTenant.configuration.global if ActiveTenant.configuration.global
+    end
+
+    def all
+      connection.select_values("SELECT nspname FROM pg_namespace WHERE nspname <> 'information_schema' AND nspname NOT LIKE 'pg%'") - [global]
+    end
+
+    def create(name)
+      unless all.include? name
+        connection.execute "CREATE SCHEMA \"#{name}\""
+      end
+    end
+
+    def remove(name)
+      if all.include? name
+        connection.execute "DROP SCHEMA \"#{name}\" CASCADE"
+      end
+    end
+
+    def with(name)
+      return yield if name == search_path
+
+      ex = nil
+      current_schema = search_path
+      search_path name
+      begin
+        result = yield
+      rescue => e
+        ex = e
+      ensure
+        search_path current_schema
+        raise ex unless ex.nil?
+        result
+      end
+    end
+
+    def connection_settings(name)
+      connection_config.merge(schema_search_path: name)
+    end
+
+    def name
+      search_path
+    end
+
+    def global
+      @global || 'public'
+    end
+
+    def global?
+      global == name
+    end
+
+    private
+
+    def global=(name)
+      @global = name
+    end
+
+    def search_path(name=nil)
+      if name
+        establish_connection connection_settings(name)
+      else
+        connection_config[:schema_search_path]
+      end
+    end
+
+  end
 end

data/lib/active_tenant/adapters/sqlite_adapter.rb

@@ -1,72 +1,76 @@
-module ActiveTenant
-  class SQLiteAdapter
-    delegate :connection_config, :establish_connection, :connection, to: ::ActiveRecord::Base
-
-    def initialize
-      self.global = ActiveTenant.configuration.global if ActiveTenant.configuration.global
-    end
-
-    def all
-      path = database_path
-      Dir.glob("#{path}/*.sqlite3").map { |f| File.basename(f, '.sqlite3') } - [global]
-    end
-
-    def create(name)
-      unless all.include? name
-        current_config = connection_config
-        establish_connection current_config.merge(database: file_name(name))
-        connection
-        establish_connection current_config
-      end
-    end
-
-    def remove(name)
-      file = file_name name
-      FileUtils.rm(file) if File.exist?(file)
-    end
-
-    def with(name)
-      return yield if name == self.name
-
-      current_config = connection_config
-      ex = nil
-      begin
-        establish_connection current_config.merge(database: file_name(name))
-        result = yield
-      rescue => e
-        ex = e
-      ensure
-        establish_connection current_config
-        raise ex unless ex.nil?
-        result
-      end
-    end
-
-    def name
-      File.basename(connection_config[:database], '.sqlite3')
-    end
-
-    def global
-      @global
-    end
-
-    def global?
-      global == name
-    end
-
-    private
-
-    def global=(name)
-      @global = name
-    end
-
-    def database_path
-      File.dirname(connection_config[:database])
-    end
-
-    def file_name(name)
-      "#{database_path}/#{name}.sqlite3"
-    end
-
-  end
+module ActiveTenant
+  class SQLiteAdapter
+    delegate :connection_config, :establish_connection, :connection, to: ::ActiveRecord::Base
+
+    def initialize
+      self.global = ActiveTenant.configuration.global if ActiveTenant.configuration.global
+    end
+
+    def all
+      path = database_path
+      Dir.glob("#{path}/*.sqlite3").map { |f| File.basename(f, '.sqlite3') } - [global]
+    end
+
+    def create(name)
+      unless all.include? name
+        current_config = connection_config
+        establish_connection current_config.merge(database: file_name(name))
+        connection
+        establish_connection current_config
+      end
+    end
+
+    def remove(name)
+      file = file_name name
+      FileUtils.rm(file) if File.exist?(file)
+    end
+
+    def with(name)
+      return yield if name == self.name
+
+      current_config = connection_config
+      ex = nil
+      begin
+        establish_connection connection_settings(name)
+        result = yield
+      rescue => e
+        ex = e
+      ensure
+        establish_connection current_config
+        raise ex unless ex.nil?
+        result
+      end
+    end
+
+    def connection_settings(name)
+      connection_config.merge(database: file_name(name))
+    end
+
+    def name
+      File.basename(connection_config[:database], '.sqlite3')
+    end
+
+    def global
+      @global
+    end
+
+    def global?
+      global == name
+    end
+
+    private
+
+    def global=(name)
+      @global = name
+    end
+
+    def database_path
+      File.dirname(connection_config[:database])
+    end
+
+    def file_name(name)
+      "#{database_path}/#{name}.sqlite3"
+    end
+
+  end
 end