multitenant-mysql 1.1.1 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,2 +1,6 @@
 1.1.1 (March 18, 2013)
   * fixed migration generation (https://github.com/eugenekorpan/multitenant-mysql/issues/20)
+
+1.2.0 (March 20, 2013)
+  * refactored some code
+  * changed config file structure little bit, for older versions just update the config file

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem 'rails'
 gem 'rspec'
 gem 'mysql2'
+gem 'coveralls', require: false

data/README.rdoc

@@ -16,7 +16,7 @@ The advantages of such approach:
 * {<img src="https://travis-ci.org/eugenekorpan/multitenant-mysql.png?branch=master"/>}[http://travis-ci.org/eugenekorpan/multitenant-mysql]
 * {<img src="https://gemnasium.com/eugenekorpan/multitenant-mysql.png" alt="Dependency Status" />}[https://gemnasium.com/eugenekorpan/multitenant-mysql]
 * {<img src="https://codeclimate.com/github/eugenekorpan/multitenant-mysql.png" />}[https://codeclimate.com/github/eugenekorpan/multitenant-mysql]
-
+* {<img src="https://coveralls.io/repos/eugenekorpan/multitenant-mysql/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/eugenekorpan/multitenant-mysql]
 
 == Installation
 
@@ -33,14 +33,14 @@ The advantages of such approach:
 1 run
   rails g multitenant:install
 
-this will create a sample of config file in "rails_root/config/multitenant_mysql_conf.rb"
-This is the place where you list all your tenant dependent models and the model which contains all the tenants.
-E.g:
+This will create a sample of config file in "rails_root/config/initializers/multitenant_mysql_conf.rb". Update it according to your needs. E.g:
 
-  Multitenant::Mysql.arc = {
-    models: ['Book', 'Task'],
-    tenant_model: { name: 'Subdomain' }
-  }
+  Multitenant::Mysql.configure do |conf|
+    conf.models = ['Book', 'Task']
+    conf.tenants_bucket 'Subdomain' do |tb|
+      tb.field = 'name'
+    end
+  end
 
 Important: Before moving on you have to update this file as all further steps use those configs.
 
@@ -88,6 +88,7 @@ if method used by `set_current_tenant` returns blank name then `root` account is
    multitenant:views:drop
    multitenant:views:refresh
    multitenant:views_and_triggers:create
+   multitenant:views_and_triggers:drop
    multitenant:views_and_triggers:refresh
 
 == How It Works

data/lib/generators/multitenant/install/install_generator.rb

@@ -7,7 +7,7 @@ module Multitenant
     CONFIG_FILE_NAME = 'multitenant_mysql_conf.rb'
 
     def copy_conf_file_into_app
-      dest = "config/#{CONFIG_FILE_NAME}"
+      dest = "config/initializers/#{CONFIG_FILE_NAME}"
       return if FileTest.exist?(dest) # to prevent overwritting of existing file
       src = File.expand_path(File.dirname(__FILE__)) + "/templates/#{CONFIG_FILE_NAME}"
       FileUtils.copy_file src, dest

data/lib/generators/multitenant/install/templates/multitenant_mysql_conf.rb

@@ -1,17 +1,18 @@
-# simple example
+# Usage example:
 #
-# Multitenant::Mysql.arc = {
-#   models: ['Book', 'Task'],
-#   tenant_model: { name: 'Subdomain', tenant_name_attr: name }
-# }
+#   Multitenant::Mysql.configure do |conf|
+#     conf.models = ['Book', 'Task', 'Post']
+#     conf.tenants_bucket 'Subdomain' do |tb|
+#       tb.field = 'name'
+#     end
+#   end
 #
 # where:
-# models - list of tenant related models
-# tenant_model - model where tenant info is stored
-#   name - model name
-#   tenant_name_attr - attribute used to fetch tenant name
+# models - list of tenant dependent models
+# tenants_bucket - model which stores all the tenants, as an argument recives the name of the model
+#    field - attribute used to fetch tenant name (not required, default values are: name, title)
 
-Multitenant::Mysql.arc = {
-  models: [],
-  tenant_model: { name: '' }
-}
+Multitenant::Mysql.configure do |conf|
+  conf.models = []
+  conf.tenants_bucket ''
+end

data/lib/generators/multitenant/migrations/migration_builder.rb

@@ -8,7 +8,7 @@ module Multitenant
       def run
         return if migration_exists?
 
-        actions = Multitenant::Mysql.models.map { |model_name| 
+        actions = Multitenant::Mysql.configs.models.map { |model_name|
           model = model_name.constantize
           "add_column :#{model.original_table_name}, :tenant, :string"
         }

data/lib/generators/multitenant/migrations/migrations_generator.rb

@@ -1,7 +1,6 @@
 require 'rails/generators'
 
 require_relative './migration_builder'
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
 
 module Multitenant
   class MigrationsGenerator < Rails::Generators::Base

data/lib/generators/multitenant/triggers/create_generator.rb

@@ -1,6 +1,5 @@
 require 'rails/generators'
 require_relative './sql/create'
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
 
 module Multitenant
   module Triggers

data/lib/generators/multitenant/triggers/refresh_generator.rb

@@ -1,7 +1,6 @@
 require 'rails/generators'
 require_relative './sql/drop'
 require_relative './sql/create'
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
 
 module Multitenant
   module Triggers

data/lib/generators/multitenant/triggers/sql/create.rb

@@ -7,7 +7,7 @@ module Multitenant
 
       class Create
         def self.run
-          Multitenant::Mysql.models.each do |model_name|
+          Multitenant::Mysql.configs.models.each do |model_name|
             model = model_name.constantize
             trigger_name = model.original_table_name + '_tenant_trigger'
 

data/lib/generators/multitenant/views/create_generator.rb

@@ -1,6 +1,5 @@
 require 'rails/generators'
 require_relative './sql/create'
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
 
 module Multitenant
   module Views

data/lib/generators/multitenant/views/refresh_generator.rb

@@ -1,7 +1,6 @@
 require 'rails/generators'
 require_relative './sql/drop'
 require_relative './sql/create'
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
 
 module Multitenant
   module Views

data/lib/generators/multitenant/views/sql/create.rb

@@ -7,7 +7,7 @@ module Multitenant
       class Create
 
         def self.run
-          Multitenant::Mysql.models.each do |model_name|
+          Multitenant::Mysql.configs.models.each do |model_name|
             model = model_name.constantize
             columns = model.column_names.join(', ')
             view_name = model_name.to_s.downcase.pluralize + "_view"

data/lib/generators/multitenant/views_and_triggers/create_generator.rb

@@ -3,8 +3,6 @@ require 'rails/generators'
 require_relative '../views/sql/create'
 require_relative '../triggers/sql/create'
 
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
-
 module Multitenant
   module ViewsAndTriggers
     class CreateGenerator < Rails::Generators::Base

data/lib/generators/multitenant/views_and_triggers/drop_generator.rb

@@ -0,0 +1,20 @@
+require 'rails/generators'
+
+require_relative '../views/sql/drop'
+require_relative '../triggers/sql/drop'
+
+module Multitenant
+  module ViewsAndTriggers
+    class DropGenerator < Rails::Generators::Base
+      desc "drops all views and triggers"
+
+      def generate_mysql_views
+        Multitenant::Views::SQL::Drop.run
+      end
+
+      def generate_mysql_triggers
+        Multitenant::Triggers::SQL::Drop.run
+      end
+    end
+  end
+end

data/lib/generators/multitenant/views_and_triggers/refresh_generator.rb

@@ -5,8 +5,6 @@ require_relative '../views/sql/drop'
 require_relative '../triggers/sql/create'
 require_relative '../triggers/sql/drop'
 
-require Rails.root.to_s + '/config/multitenant_mysql_conf'
-
 module Multitenant
   module ViewsAndTriggers
     class RefreshGenerator < Rails::Generators::Base

data/lib/multitenant-mysql.rb

@@ -1,6 +1,5 @@
 require 'multitenant-mysql/version'
+require 'multitenant-mysql/errors'
+require 'multitenant-mysql/configs'
 require 'multitenant-mysql/action_controller_extension'
-require 'multitenant-mysql/conf_file'
-require 'multitenant-mysql/arc'
-
 require 'multitenant-mysql/active_record_extension'

data/lib/multitenant-mysql/action_controller_extension.rb

@@ -2,24 +2,17 @@ require_relative './connection_switcher'
 
 class ActionController::Base
   def self.set_current_tenant(tenant_method)
-    require Multitenant::Mysql::ConfFile.path
-
-    raise "you should provide tenant method" unless tenant_method
-
+    raise InvalidTenantError.new('Multitenant::Mysql: you should provide tenant method') unless tenant_method
     @@tenant_method = tenant_method
 
     before_filter :establish_tenant_connection
-
     def establish_tenant_connection
       Multitenant::Mysql::ConnectionSwitcher.new(self, @@tenant_method).execute
     end
   end
 
   def self.set_current_tenant_by_subdomain
-    require Multitenant::Mysql::ConfFile.path
-
     before_filter :establish_tenant_connection_by_subdomain
-
     def establish_tenant_connection_by_subdomain
       tenant_name = request.subdomain
       Multitenant::Mysql::ConnectionSwitcher.set_tenant(tenant_name)

data/lib/multitenant-mysql/active_record_extension.rb

@@ -1,5 +1,5 @@
 class ActiveRecord::Base
-  def self.acts_as_tenant
+  def self.acts_as_tenants_bucket
     after_create do
       config = Rails.configuration.database_configuration
       password = config[Rails.env]["password"]
@@ -8,34 +8,34 @@ class ActiveRecord::Base
     end
   end
 
-  def self.inherited(child)
-    return unless FileTest.exist?(Multitenant::Mysql::ConfFile.full_path) # do nothing if no config file provided
-    require Multitenant::Mysql::ConfFile.path
-
-    model_name = child.to_s
-    if Multitenant::Mysql.models.include? model_name
-      view_name = model_name.to_s.downcase.pluralize + "_view"
-
-      # check whether the view exists in db
-      if ActiveRecord::Base.connection.table_exists? view_name
-        child.class_eval do
-          cattr_accessor :original_table_name
+  def self.acts_as_tenant
+    view_name = model_name.to_s.downcase.pluralize + "_view"
+    # check whether the view exists in db
+    if ActiveRecord::Base.connection.table_exists? view_name
+      self.class_eval do
+        cattr_accessor :original_table_name
 
-          self.original_table_name = self.table_name
-          self.table_name = view_name
-          self.primary_key = :id
+        self.original_table_name = self.table_name
+        self.table_name = view_name
+        self.primary_key = :id
 
-          def self.new(*args)
-            object = super(*args)
-            object.id = nil # workaround for https://github.com/rails/rails/issues/5982
-            object
-          end
+        def self.new(*args)
+          object = super(*args)
+          object.id = nil # workaround for https://github.com/rails/rails/issues/5982
+          object
         end
       end
     end
+  end
 
-    if Multitenant::Mysql.tenant == child
+  def self.inherited(child)
+    model_name = child.to_s
+    if Multitenant::Mysql.configs.models.include? model_name
       child.send :acts_as_tenant
     end
+
+    if Multitenant::Mysql.configs.tenant == child
+      child.send :acts_as_tenants_bucket
+    end
   end
 end

data/lib/multitenant-mysql/configs.rb

@@ -0,0 +1,23 @@
+require_relative './configs/bucket'
+require_relative './configs/base'
+
+module Multitenant
+  module Mysql
+    class << self
+      def configure &block
+        raise InvalidConfigsError.new('Multitenant::Mysql: No configs provided') unless block_given?
+        configs = Configs::Base.new
+        block.call(configs)
+        self.configs = configs
+      end
+
+      def configs=configs
+        @configs = configs
+      end
+
+      def configs
+        @configs
+      end
+    end
+  end
+end

data/lib/multitenant-mysql/configs/base.rb

@@ -0,0 +1,20 @@
+module Multitenant
+  module Mysql
+    module Configs
+      class Base
+        attr_accessor :models, :bucket
+
+        def tenants_bucket(name)
+          raise InvalidBucketError.new('Multitenant::Mysql: invalid bucket') if name.blank?
+
+          @bucket = Bucket.new(name)
+          yield(@bucket) if block_given?
+        end
+
+        def tenant
+          @bucket.model
+        end
+      end
+    end
+  end
+end

data/lib/multitenant-mysql/configs/bucket.rb

@@ -0,0 +1,43 @@
+module Multitenant
+  module Mysql
+    module Configs
+      class Bucket
+        DEFAULT_TENANT_NAME_ATTR = [:name, :title]
+        attr_accessor :name, :field
+
+        def initialize(name)
+          @name = name
+        end
+
+        def model
+          @name.constantize
+        rescue
+          if @name.blank?
+            raise InvalidBucketError.new('Multitenant::Mysql: You should specify model which stores info about tenants.')
+          else
+            raise InvalidBucketError.new("Please check your multitenant-mysql configs. Seems like you are trying to use model which doesn't exist: #{@name}")
+          end
+        end
+
+        def field
+          @field ||= default_field
+          @field || raise(InvalidBucketFieldError.new('Multitenant::Mysql: You should specify tenants bucket field or use one default: name, title'))
+          raise InvalidBucketFieldError.new("Multitenant::Mysql: #{model} doesn't have '#{@field}' attribute") unless validate_field?
+          @field
+        end
+
+        private
+
+        def default_field
+          DEFAULT_TENANT_NAME_ATTR.each do |n|
+            return n if model.column_names.include?(n.to_s)
+          end
+        end
+
+        def validate_field?
+          @valid ||= model.column_names.include?(@field.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/multitenant-mysql/connection_switcher.rb

@@ -2,13 +2,13 @@ require_relative './db'
 
 module Multitenant
   module Mysql
-    class NoTenantRegistratedError < StandardError; end;
-
     class Tenant
       def self.exists? tenant_name
         return true if tenant_name.blank?
-        if Multitenant::Mysql.tenant.where(Multitenant::Mysql.tenant_name_attr => tenant_name).blank?
-          raise Multitenant::Mysql::NoTenantRegistratedError.new("No tenant registered: #{tenant_name}")
+        tenant = Multitenant::Mysql.configs.tenant
+        field = Multitenant::Mysql.configs.bucket.field
+        if tenant.where(field => tenant_name).blank?
+          raise NoTenantRegistratedError.new("No tenant registered: #{tenant_name}")
         end
         true
       end

data/lib/multitenant-mysql/db.rb

@@ -14,7 +14,6 @@ module Multitenant
           config = configs
           config['username'] = tenant_name.blank? ? 'root' : tenant_name
           ActiveRecord::Base.establish_connection(config)
-          true
         end
       end
     end

data/lib/multitenant-mysql/errors.rb

@@ -0,0 +1,9 @@
+module Multitenant
+  module Mysql
+    class InvalidBucketError < StandardError; end;
+    class NoTenantRegistratedError < StandardError; end;
+    class InvalidConfigsError < StandardError; end;
+    class InvalidBucketFieldError < StandardError; end;
+    class InvalidTenantError < StandardError; end;
+  end
+end

data/lib/multitenant-mysql/version.rb

@@ -1,5 +1,5 @@
 module Multitenant
   module Mysql
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/spec/configs_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Multitenant::Mysql do
+  subject { Multitenant::Mysql }
+
+  context '#configure' do
+    it 'should raise error with no block given' do
+      expect { subject.configure }.to raise_error(Multitenant::Mysql::InvalidConfigsError)
+    end
+
+    context 'with valid params' do
+      before do
+        class Subdomain; end;
+        subject.configure do |conf|
+          conf.models = ['Book']
+          conf.tenants_bucket 'Subdomain'
+        end
+      end
+
+      it 'should be of valid type' do
+        expect(subject.configs).to be_kind_of Multitenant::Mysql::Configs::Base
+      end
+
+      it 'should have valid values' do
+        expect(subject.configs.models).to eql(['Book'])
+        expect(subject.configs.tenant).to eql(Subdomain)
+      end
+    end
+  end
+
+  context '#configs=' do
+    let(:configs) { Multitenant::Mysql::Configs::Base.new }
+
+    it 'should set configs' do
+      subject.configs = configs
+      expect(subject.configs).to eql(configs)
+    end
+  end
+end

data/spec/connection_switcher_spec.rb

@@ -1,49 +1,57 @@
 require 'spec_helper'
 
-describe Multitenant::Mysql::ConnectionSwitcher do
+describe Multitenant::Mysql::Tenant do
+  subject { Multitenant::Mysql::Tenant }
+
   before do
-    Multitenant::Mysql.stub(:tenant_name_attr).and_return('name')
+    create_table('subdomains')
+    class Subdomain < ActiveRecord::Base; end;
   end
 
-  context '#execute' do
-    it 'should raise error if there is no tenant account in db' do
-      ar_mock = double('ActiveRecord::Relation')
-      ar_mock.stub(:where).and_return(nil)
-      Multitenant::Mysql.stub(:tenant).and_return(ar_mock)
+  context '#exists?' do
+    it 'should return true for existing tenant' do
+      mock = double('Subdomain')
+      Subdomain.stub(:where).and_return([mock])
+      expect(subject.exists?('blade')).to be_true
+    end
 
-      ac_mock = double('ActionController::Base')
-      ac_mock.should_receive(:send).and_return('unexisting tenant')
-      switcher = Multitenant::Mysql::ConnectionSwitcher.new(ac_mock, :tenant_method)
-      Multitenant::Mysql::DB.stub(:configs).and_return({ 'username' => 'root' })
+    it 'should return true for blank name' do
+      expect(subject.exists?('')).to be_true
+    end
 
-      expect { switcher.execute }.to raise_error(Multitenant::Mysql::NoTenantRegistratedError)
+    it 'should raise an error for unexisting tenant' do
+      ActiveRecord::Base.stub(:where).and_return(nil)
+      expect { subject.exists?('invalid tenant') }.to raise_error(Multitenant::Mysql::NoTenantRegistratedError)
     end
+  end
 
-    it 'should change db connection' do
-      ar_mock = double('ActiveRecord::Relation')
-      ar_mock.stub(:where).and_return(:some_result)
-      Multitenant::Mysql.stub(:tenant).and_return(ar_mock)
+end
 
-      ac_mock = double('ActionController::Base')
-      ac_mock.should_receive(:tenant_method)
-      switcher = Multitenant::Mysql::ConnectionSwitcher.new(ac_mock, :tenant_method)
-      Multitenant::Mysql::DB.stub(:configs).and_return({ 'username' => 'root' })
+describe Multitenant::Mysql::ConnectionSwitcher do
+  context '#set_tenant' do
+    subject { Multitenant::Mysql::ConnectionSwitcher }
 
-      ActiveRecord::Base.should_receive(:establish_connection)
+    before do
+      Multitenant::Mysql::Tenant.stub(:exists?).and_return(true)
+    end
 
-      expect( switcher.execute ).to be
+    it 'should change db connection' do
+      Multitenant::Mysql::DB.should respond_to(:establish_connection_for)
+      Multitenant::Mysql::DB.should_receive(:establish_connection_for).with('tenant')
+      expect{ subject.set_tenant('tenant') }.to_not raise_error
     end
   end
 
-  context '.set_tenant' do
-    subject { Multitenant::Mysql::ConnectionSwitcher }
+  context '.execute' do
+    let(:mock_ac) { double('ActionController::Base') }
+
+    subject { Multitenant::Mysql::ConnectionSwitcher.new(mock_ac, :tenant) }
 
     it 'should change db connection' do
       Multitenant::Mysql::Tenant.stub(:exists?).and_return(true)
-      Multitenant::Mysql::DB.stub(:configs).and_return({ 'username' => 'root' })
-
-      ActiveRecord::Base.should_receive(:establish_connection).with({ 'username' => 'google'})
-      expect( subject.set_tenant('google') ).to be
+      mock_ac.should_receive(:send).with(:tenant).and_return('wallmart')
+      Multitenant::Mysql::DB.should_receive(:establish_connection_for).with('wallmart')
+      expect { subject.execute }.to_not raise_error
     end
   end
 end

data/spec/db_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Multitenant::Mysql::DB do
+  subject { Multitenant::Mysql::DB }
+  let(:configs) { { 'username' => 'root', 'password' => 'password' } }
+
+  context '#configs' do
+    it 'should set configs' do
+      subject.configs = configs
+      expect(subject.configs).to eql(configs)
+    end
+
+    it 'should get configs' do
+      class Rails; end;
+      Rails.stub_chain(:configuration, :database_configuration, :[]).and_return(configs)
+
+      expect(subject.configs['username']).to eql('root')
+      expect(subject.configs['password']).to eql('password')
+    end
+  end
+
+  context '#establish_connection_for' do
+    it 'should change db connection with root account' do
+      subject.configs = configs
+      ActiveRecord::Base.should_receive(:establish_connection).with({ 'username' => 'root', 'password' => 'password' })
+      expect { subject.establish_connection_for(nil) }.to_not raise_error
+    end
+
+    it 'should change db connection for particular tenant' do
+      subject.configs = configs
+      ActiveRecord::Base.should_receive(:establish_connection).with({ 'username' => 'wallmart', 'password' => 'password' })
+      expect { subject.establish_connection_for('wallmart') }.to_not raise_error
+    end
+  end
+end

data/spec/rails/active_record_base_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe ActiveRecord::Base do
   subject { ActiveRecord::Base }
-
-  before do
-    Multitenant::Mysql.arc = { models: ['Book', 'Task'] }
+  it 'should respond to acts_as_tenant' do
+    subject.should respond_to(:acts_as_tenant)
   end
 
-  it 'should respond to acts_as_tenant' do
-    subject.should respond_to(:acts_as_tenant)  
+  it 'should respond to acts_as_tenants_bucket' do
+    subject.should respond_to(:acts_as_tenants_bucket)
   end
 
   it 'should redefine table name and primary key and keep original table name' do
     ActiveRecord::Base.stub_chain(:connection, :table_exists?).and_return(true)
 
-    Multitenant::Mysql.stub(:tenant).and_return(true)
+    Multitenant::Mysql.stub_chain(:configs, :models).and_return(['Book'])
+    Multitenant::Mysql.stub_chain(:configs, :tenant).and_return(false)
 
     class Book < ActiveRecord::Base
     end

data/spec/spec_helper.rb

@@ -5,14 +5,13 @@ require 'active_record'
 require 'action_controller'
 require 'multitenant-mysql'
 
+require 'coveralls'
+Coveralls.wear!
 
 GEM_ROOT_PATH = File.expand_path('../../', __FILE__)
-CONF_FILE_PATH = GEM_ROOT_PATH + '/spec/support/multitenant_mysql_conf'
 
 RSpec.configure do |config|
   config.before do
-    Multitenant::Mysql::ConfFile.path = CONF_FILE_PATH
-
     ActiveRecord::Base.establish_connection({
       adapter: 'mysql2',
       username: 'root',
@@ -21,6 +20,14 @@ RSpec.configure do |config|
     ActiveRecord::Base.connection.execute('drop database if exists `tenant_test`;')
     ActiveRecord::Base.connection.execute('create database `tenant_test`;')
     ActiveRecord::Base.connection.execute('use `tenant_test`;')
+
+
+    Multitenant::Mysql.configure do |conf|
+      conf.models = ['Book']
+      conf.tenants_bucket 'Subdomain' do |tb|
+        tb.field = 'name'
+      end
+    end
   end
 
   config.after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multitenant-mysql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -57,22 +57,25 @@ files:
 - lib/generators/multitenant/views/sql/create.rb
 - lib/generators/multitenant/views/sql/drop.rb
 - lib/generators/multitenant/views_and_triggers/create_generator.rb
+- lib/generators/multitenant/views_and_triggers/drop_generator.rb
 - lib/generators/multitenant/views_and_triggers/list/list.rb
 - lib/generators/multitenant/views_and_triggers/list/sql.rb
 - lib/generators/multitenant/views_and_triggers/refresh_generator.rb
 - lib/multitenant-mysql.rb
 - lib/multitenant-mysql/action_controller_extension.rb
 - lib/multitenant-mysql/active_record_extension.rb
-- lib/multitenant-mysql/arc.rb
-- lib/multitenant-mysql/conf_file.rb
+- lib/multitenant-mysql/configs.rb
+- lib/multitenant-mysql/configs/base.rb
+- lib/multitenant-mysql/configs/bucket.rb
 - lib/multitenant-mysql/connection_switcher.rb
 - lib/multitenant-mysql/db.rb
+- lib/multitenant-mysql/errors.rb
 - lib/multitenant-mysql/version.rb
 - multitenant-mysql.gemspec
 - rails/init.rb
-- spec/arc_spec.rb
-- spec/conf_file_spec.rb
+- spec/configs_spec.rb
 - spec/connection_switcher_spec.rb
+- spec/db_spec.rb
 - spec/generators/list_spec.rb
 - spec/generators/triggers/sql/create_spec.rb
 - spec/generators/triggers/sql/drop_spec.rb
@@ -81,7 +84,6 @@ files:
 - spec/rails/action_controller_extension_spec.rb
 - spec/rails/active_record_base_spec.rb
 - spec/spec_helper.rb
-- spec/support/multitenant_mysql_conf.rb
 homepage: https://github.com/eugenekorpan/multitenant-mysql
 licenses: []
 post_install_message: 
@@ -102,14 +104,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add multi-tenancy to Rails application using MySql views
 test_files:
-- spec/arc_spec.rb
-- spec/conf_file_spec.rb
+- spec/configs_spec.rb
 - spec/connection_switcher_spec.rb
+- spec/db_spec.rb
 - spec/generators/list_spec.rb
 - spec/generators/triggers/sql/create_spec.rb
 - spec/generators/triggers/sql/drop_spec.rb
@@ -118,4 +120,3 @@ test_files:
 - spec/rails/action_controller_extension_spec.rb
 - spec/rails/active_record_base_spec.rb
 - spec/spec_helper.rb
-- spec/support/multitenant_mysql_conf.rb

data/lib/multitenant-mysql/arc.rb

@@ -1,52 +0,0 @@
-module Multitenant
-  module Mysql
-
-    class << self
-
-      DEFAULT_TENANT_NAME_ATTR = [:name, :title]
-
-      def active_record_configs=(configs)
-        @configs = configs
-      end
-
-      def active_record_configs
-        @configs
-      end
-
-      alias_method :arc, :active_record_configs
-      alias_method :arc=, :active_record_configs=
-
-      def tenant
-        arc[:tenant_model][:name].constantize
-      rescue
-        if arc.blank? || arc[:tenant_model].blank? || arc[:tenant_model][:name].blank?
-          raise "
-            Multitenant::Mysql: You should specify model which stores info about tenants.
-            E.g. in initializer:
-            Multitenant::Mysql.arc = {
-              tenant_model: { name: 'Subdomain' }
-            }
-          "
-        else
-          raise "Please check your multitenant-mysql configs. Seems like you are trying to use model which doesn't exist: #{arc[:tenant_model][:name]}"
-        end
-      end
-
-      def models
-        active_record_configs[:models]
-      end
-
-      def tenant_name_attr
-        return active_record_configs[:tenant_model][:tenant_name_attr] if active_record_configs[:tenant_model][:tenant_name_attr]
-
-        DEFAULT_TENANT_NAME_ATTR.each do |name|
-          return name if tenant.column_names.include?(name.to_s)
-        end
-
-        raise 'You should specify tenant name attribute or use one default: name, title'
-      end
-
-    end
-
-  end
-end

data/lib/multitenant-mysql/conf_file.rb

@@ -1,22 +0,0 @@
-module Multitenant
-  module Mysql
-    class ConfFile
-      def self.path=(path)
-        @path = path
-      end
-
-      def self.path
-        # workaround to reqire conf file in rails app
-        @path ||= default_path
-      end
-
-      def self.full_path
-        "#{path}.rb"
-      end
-
-      def self.default_path
-        Rails.root.to_s + '/config/multitenant_mysql_conf'
-      end
-    end
-  end
-end

data/spec/arc_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Multitenant::Mysql do
-  subject { Multitenant::Mysql }
-
-  context 'active record configs' do
-
-    it 'should raise error if no tenant name provided' do
-      subject.active_record_configs = nil
-      expect {
-        subject.tenant_name_attr
-      }.to raise_error
-    end
-
-    context 'tenant name attribute' do
-      it 'should use name or title by default' do
-        mock = double()
-        mock.stub(:column_names).and_return(['name'])
-        subject.stub(:tenant).and_return(mock)
-        subject.stub(:active_record_configs).and_return({tenant_model: {}})
-        expect(subject.tenant_name_attr).to eql(:name)
-
-        mock.stub(:column_names).and_return(['title'])
-        expect(subject.tenant_name_attr).to eql(:title)
-      end
-
-      it 'should use attribute from configs' do
-        subject.stub(:active_record_configs).and_return({tenant_model: {tenant_name_attr: 'subdomain'}})
-        expect(subject.tenant_name_attr).to eql('subdomain')
-      end
-    end
-
-    context '.tenant' do
-      before do
-        Subdomain = :constant
-      end
-
-      it 'should find and return appropriate model' do
-        subject.active_record_configs = { tenant_model: { name: 'Subdomain' } }
-        expect(subject.tenant).to eq(Subdomain)
-      end
-
-      context 'invalid data' do
-        it 'should raise error if no data provided' do
-          subject.active_record_configs = {}
-          expect { subject.tenant }.to raise_error(RuntimeError)
-        end
-
-        it 'should raise error if invalid data provided' do
-          subject.active_record_configs = { tenant_model: { name: nil } }
-          expect { subject.tenant }.to raise_error(RuntimeError)
-        end
-
-        it 'should raise error if invalid model provided' do
-          subject.active_record_configs = { tenant_model: { name: 'UnexistingModelLa' } }
-          expect { subject.tenant }.to raise_error(RuntimeError)
-        end
-      end
-    end
-
-    context '.models' do
-      it 'should return listed models' do
-        subject.active_record_configs = { models: ['Book', 'Task'] }
-        expect(subject.models).to have(2).items
-      end
-    end
-
-    context 'alias methods' do
-      it 'should use aliased setter' do
-        subject.arc = 'ARC'
-        expect(subject.active_record_configs).to eql('ARC')
-      end
-
-      it 'should use aliased getter' do
-        subject.active_record_configs = 'ABC'
-        expect(subject.arc).to eql('ABC')
-      end
-    end
-
-  end
-end

data/spec/conf_file_spec.rb

@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe Multitenant::Mysql::ConfFile do
-  subject { Multitenant::Mysql::ConfFile }
-
-  context '.path' do
-    it 'should return path' do
-      subject.path = '/conf/file'
-      expect(subject.path).to eql('/conf/file')
-    end
-
-    it 'should return default path to conf file in rails app' do
-      path = 'Rails.root/config/multitenant_mysql_conf'
-
-      subject.stub(:default_path).and_return(path)
-      subject.path = nil
-
-      expect(subject.path).to eql(path)
-    end
-  end
-
-  context '.full_path' do
-    it 'should return path with extension of the file' do
-      subject.path = '/conf/file'
-      expect(subject.full_path).to eql('/conf/file.rb')
-    end
-
-    it 'should return correct path no metter how many times we call it' do
-      subject.path = '/conf/file'
-      2.times do
-        expect(subject.full_path).to eql('/conf/file.rb')
-      end
-    end
-  end
-
-  context '.default_path' do
-    it 'should return path to conf file in rails app' do
-      class Rails
-        def self.root
-          'Rails.root'
-        end
-      end
-
-      expect(subject.default_path).to eql('Rails.root/config/multitenant_mysql_conf')
-    end
-  end
-
-end

data/spec/support/multitenant_mysql_conf.rb

@@ -1,4 +0,0 @@
-Multitenant::Mysql.active_record_configs = {
-  models: ['Book'],
-  tenant_model: { name: 'Subdomain', tenant_name_attr: 'title' }
-}