multitenant-mysql 1.2.0 → 1.2.1

data/CHANGELOG.rdoc

@@ -4,3 +4,6 @@
 1.2.0 (March 20, 2013)
   * refactored some code
   * changed config file structure little bit, for older versions just update the config file
+
+1.2.1 (April 1, 2013)
+  * fixed bug (https://github.com/eugenekorpan/multitenant-mysql/issues/25)

data/lib/multitenant-mysql/active_record_extension.rb

@@ -1,10 +1,11 @@
 class ActiveRecord::Base
   def self.acts_as_tenants_bucket
     after_create do
-      config = Rails.configuration.database_configuration
-      password = config[Rails.env]["password"]
-      ActiveRecord::Base.connection.execute "GRANT ALL PRIVILEGES ON *.* TO '#{self.name}'@'localhost' IDENTIFIED BY '#{password}' WITH GRANT OPTION;"
-      ActiveRecord::Base.connection.execute "flush privileges;"
+      password = Multitenant::Mysql::DB.configs['password']
+      tenant_name = self.send(Multitenant::Mysql.configs.bucket_field)
+      connection = Multitenant::Mysql::DB.connection
+      connection.execute "GRANT ALL PRIVILEGES ON *.* TO '#{tenant_name}'@'localhost' IDENTIFIED BY '#{password}' WITH GRANT OPTION;"
+      connection.execute "flush privileges;"
     end
   end
 
@@ -29,13 +30,16 @@ class ActiveRecord::Base
   end
 
   def self.inherited(child)
+    super
+
     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
+    if Multitenant::Mysql.configs.tenant? child
       child.send :acts_as_tenants_bucket
     end
+
   end
 end

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

@@ -14,6 +14,14 @@ module Multitenant
         def tenant
           @bucket.model
         end
+
+        def bucket_field
+          @bucket.field
+        end
+
+        def tenant?(model)
+          tenant == model
+        end
       end
     end
   end

data/lib/multitenant-mysql/db.rb

@@ -15,6 +15,10 @@ module Multitenant
           config['username'] = tenant_name.blank? ? 'root' : tenant_name
           ActiveRecord::Base.establish_connection(config)
         end
+
+        def connection
+          ActiveRecord::Base.connection
+        end
       end
     end
   end

data/lib/multitenant-mysql/version.rb

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

data/spec/bucket_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Multitenant::Mysql::Configs::Bucket do
+  context '#field' do
+    subject { Multitenant::Mysql::Configs::Bucket.new('Post') }
+
+    before do
+      create_table('posts')
+      Multitenant::Mysql.stub_chain(:configs, :tenant?).and_return(true)
+      Multitenant::Mysql.stub_chain(:configs, :models).and_return([])
+      class Post < ActiveRecord::Base; end;
+    end
+
+    it 'should use default' do
+      expect(subject.field).to eql(:name)
+    end
+
+    it 'should use specific one' do
+      subject.field = 'tenant'
+      expect(subject.field).to eql('tenant')
+    end
+
+    it 'should raise error for invalid field' do
+      subject.field = 'unexisting column'
+      expect { subject.field }.to raise_error(Multitenant::Mysql::InvalidBucketFieldError)
+    end
+  end
+end

data/spec/conf/database.yml

@@ -0,0 +1,3 @@
+adapter: mysql2
+username: root
+password:

data/spec/rails/active_record_base_spec.rb

@@ -11,10 +11,10 @@ describe ActiveRecord::Base do
   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_chain(:configs, :models).and_return(['Book'])
-    Multitenant::Mysql.stub_chain(:configs, :tenant).and_return(false)
+    Multitenant::Mysql.stub_chain(:configs, :tenant?).and_return(false)
+    create_table('books')
+    create_view_for_table('books')
 
     class Book < ActiveRecord::Base
     end
@@ -23,4 +23,24 @@ describe ActiveRecord::Base do
     expect(Book.primary_key).to eql('id')
     expect(Book.original_table_name).to eql('books')
   end
+
+  context 'bucket' do
+    it 'should create new mysql account' do
+      Multitenant::Mysql.stub_chain(:configs, :models).and_return([])
+      Multitenant::Mysql.stub_chain(:configs, :tenant?).and_return(true)
+      Multitenant::Mysql.stub_chain(:configs, :bucket_field).and_return('name')
+      Multitenant::Mysql::DB.stub_chain(:configs, :[]).and_return($cnf['password'])
+
+      create_table('users')
+      create_view_for_table('users')
+      class User < ActiveRecord::Base; end;
+
+      mock_connection = double
+      mock_connection.should_receive(:execute).with("GRANT ALL PRIVILEGES ON *.* TO 'default_name'@'localhost' IDENTIFIED BY '#{$cnf['password']}' WITH GRANT OPTION;").once
+      mock_connection.should_receive(:execute).with("flush privileges;").once
+      Multitenant::Mysql::DB.stub(:connection).and_return(mock_connection)
+
+      expect(User.create(name: 'default_name', tenant: 'bla bla bla')).to be
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,13 +10,12 @@ Coveralls.wear!
 
 GEM_ROOT_PATH = File.expand_path('../../', __FILE__)
 
+require 'yaml'
+$cnf = YAML::load_file(File.join(File.dirname(File.expand_path(__FILE__)), './conf/database.yml'))
+ActiveRecord::Base.establish_connection($cnf)
+
 RSpec.configure do |config|
   config.before do
-    ActiveRecord::Base.establish_connection({
-      adapter: 'mysql2',
-      username: 'root',
-      password: ''
-    })
     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`;')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multitenant-mysql
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,6 +73,8 @@ files:
 - lib/multitenant-mysql/version.rb
 - multitenant-mysql.gemspec
 - rails/init.rb
+- spec/bucket_spec.rb
+- spec/conf/database.yml
 - spec/configs_spec.rb
 - spec/connection_switcher_spec.rb
 - spec/db_spec.rb
@@ -109,6 +111,8 @@ signing_key:
 specification_version: 3
 summary: Add multi-tenancy to Rails application using MySql views
 test_files:
+- spec/bucket_spec.rb
+- spec/conf/database.yml
 - spec/configs_spec.rb
 - spec/connection_switcher_spec.rb
 - spec/db_spec.rb