multitenant-mysql 1.2.1 → 1.2.2

data/CHANGELOG.rdoc

@@ -7,3 +7,6 @@
 
 1.2.1 (April 1, 2013)
   * fixed bug (https://github.com/eugenekorpan/multitenant-mysql/issues/25)
+
+1.2.2 (Jun 20, 2013)
+  * fixed issue (https://github.com/eugenekorpan/multitenant-mysql/issues/28)

data/lib/multitenant-mysql/active_record_extension.rb

@@ -1,45 +1,52 @@
-class ActiveRecord::Base
-  def self.acts_as_tenants_bucket
-    after_create do
-      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;"
+ActiveRecord::Base.class_eval do
+
+  class << self
+
+    def acts_as_tenants_bucket
+      after_create do
+        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
-  end
 
-  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
-
-        def self.new(*args)
-          object = super(*args)
-          object.id = nil # workaround for https://github.com/rails/rails/issues/5982
-          object
+    def 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
+
+          def self.new(*args)
+            object = super(*args)
+            object.id = nil # workaround for https://github.com/rails/rails/issues/5982
+            object
+          end
         end
       end
     end
-  end
 
-  def self.inherited(child)
-    super
+    alias_method :multitenant_mysql_chained_inherited, :inherited
 
-    model_name = child.to_s
-    if Multitenant::Mysql.configs.models.include? model_name
-      child.send :acts_as_tenant
-    end
+    def inherited(child)
+      multitenant_mysql_chained_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
+      if Multitenant::Mysql.configs.tenant? child
+        child.send :acts_as_tenants_bucket
+      end
     end
 
   end
+
 end

data/lib/multitenant-mysql/version.rb

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

data/spec/conf/database.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multitenant-mysql
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Add multi-tenancy to Rails application using MySql views