active_tenant 0.0.2 → 0.0.3

data/lib/active_tenant/base.rb

@@ -1,41 +1,41 @@
-module ActiveTenant
-  class Base
-    ADAPTERS = {
-        sqlite3: SQLiteAdapter,
-        postgresql: PostgresAdapter
-    }
-
-    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
-        end
-      end
-    end
-
-    def migrate_all(version=nil)
-      all.each do |tenant|
-        migrate tenant, version
-      end
-    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?
-        end
-      end
-    end
-
-    private
-
-    def adapter
-      @adapter ||= ADAPTERS[::ActiveRecord::Base.connection_config[:adapter].to_sym].new
-    end
-
-  end
+module ActiveTenant
+  class Base
+    ADAPTERS = {
+        sqlite3: SQLiteAdapter,
+        postgresql: PostgresAdapter
+    }
+
+    delegate :all, :create, :remove, :with, :connection_settings, :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
+        end
+      end
+    end
+
+    def migrate_all(version=nil)
+      all.each do |tenant|
+        migrate tenant, version
+      end
+    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?
+        end
+      end
+    end
+
+    private
+
+    def adapter
+      @adapter ||= ADAPTERS[::ActiveRecord::Base.connection_config[:adapter].to_sym].new
+    end
+
+  end
 end

data/lib/active_tenant/configuration.rb

@@ -1,5 +1,5 @@
-module ActiveTenant
-  class Configuration
-    attr_accessor :global
-  end
+module ActiveTenant
+  class Configuration
+    attr_accessor :global
+  end
 end

data/lib/active_tenant/engine.rb

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

data/lib/active_tenant/version.rb

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

data/lib/active_tenant.rb

@@ -1,29 +1,29 @@
-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'
-require 'active_tenant/active_record_extensions'
-require 'active_tenant/configuration'
-
-module ActiveTenant
-
-  def self.configuration
-    @@configuration ||= Configuration.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-  def self.current
-    ActiveTenant::Base.new
-  end
-
-end
-
-ActiveRecord::Base.send :extend, ActiveTenant::ActiveRecord::Base
-ActiveRecord::Migration.send :extend, ActiveTenant::ActiveRecord::Migration
+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'
+require 'active_tenant/active_record_extensions'
+require 'active_tenant/configuration'
+
+module ActiveTenant
+
+  def self.configuration
+    @@configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  def self.current
+    ActiveTenant::Base.new
+  end
+
+end
+
+ActiveRecord::Base.send :extend, ActiveTenant::ActiveRecord::Base
+ActiveRecord::Migration.send :extend, ActiveTenant::ActiveRecord::Migration

data/lib/tasks/migration.rake

@@ -1,21 +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
+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