multi_client 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1e764f0ea27afe1badcbea40da68d90276fd17
-  data.tar.gz: 8c86f38f5c1b50cda437ee573f38b8f0017324bd
+  metadata.gz: ed95e6005b1c1325ace3a288f25b33d5e9a64b35
+  data.tar.gz: 9f780c279a89b8daea900809be1b648b9c9b3eb3
 SHA512:
-  metadata.gz: 9ffcb13eab5be661c10bf40a546dcf2c3f1a87f1c1237c3b03f412f4d946553f1a2dffb89da9ffeea2e4e5df681444bc7dc8a68926c325030c09598b997e2761
-  data.tar.gz: 401252584ef64dbd75da2ecc42c30ebf663fada4384836ad2aeccea962411aaf00bd5334ebc482904ae9346033d140e6b81c4670a873f7880fed89fb98338a69
+  metadata.gz: 6b2c03c72d08b4528f5bc7ae16cc9905626977ea7a72bc50491d35874d57acf92f42f37ad27edd91262b61ee54acc0482d4227ce23bdab5f317d0a1d4edd5330
+  data.tar.gz: 7d08a4a58cec028212220ab4b4f845bec886a379acb4d9c6e0499802342524f85f7ee79cc78d2e2daa2603985acf62deb41652a471ff1fc99b0ea4c1eb3b7b81

data/app/models/multi_client/client.rb

@@ -34,9 +34,23 @@ module MultiClient
 
     def self.with_tenant(tenant, &block)
       original_id = current_id
-      self.current_id = tenant.id
-      block.call
-      self.current_id = original_id
+      begin
+        self.current_id = tenant.id
+        block.call
+      rescue
+        raise
+      ensure
+        self.current_id = original_id
+      end
     end
+
+    def self.master?
+      !!(current && current.identifier == Configuration.master_tenant_identifier)
+    end
+
+    def self.set_current_to_master
+      set_current_by_identifier(Configuration.master_tenant_identifier)
+    end
+
   end
 end

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

@@ -6,7 +6,7 @@ module MultiClient
       source_root File.expand_path('../templates', __FILE__)
 
       def generate_intializer
-        copy_file 'multi_client.rb', 'config/initializers/multi_client.rb'
+        copy_file 'initializer.rb', 'config/initializers/multi_client.rb'
       end
     end
   end

data/lib/generators/multi_client/install/templates/{multi_client.rb → initializer.rb}

@@ -60,4 +60,11 @@ MultiClient.configure do |config|
   # Default: config.no_subdomain_prefixes = ->(request) { ['www', '', nil] }
   # 
   config.no_subdomain_prefixes = ->(request) { ['www', '', nil] }
+
+  # The master tenant is a special tenant. You can ask Tenant.master? to
+  # check, if the actual tenant is the master tenant.
+  # 
+  # Default: config.master_tenant_identifier = '000'
+  # 
+  config.master_tenant_identifier = '000'
 end

data/lib/multi_client/configuration.rb

@@ -24,6 +24,8 @@ module MultiClient
 
     mattr_accessor(:force_client_scope_for_unscoped_callers) { [] }
 
+    mattr_accessor(:master_tenant_identifier) { '000' }
+
     def self.namespaced_model_name
       "MultiClient::#{model_name}"
     end

data/lib/multi_client/version.rb

@@ -1,3 +1,3 @@
 module MultiClient
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
@@ -150,7 +150,7 @@ files:
 - config/routes.rb
 - db/migrate/001_create_multi_client_clients.rb
 - lib/generators/multi_client/install/install_generator.rb
-- lib/generators/multi_client/install/templates/multi_client.rb
+- lib/generators/multi_client/install/templates/initializer.rb
 - lib/multi_client.rb
 - lib/multi_client/configuration.rb
 - lib/multi_client/engine.rb