penthouse 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9555293622bdf6cf3007d78c7898faea5d5bbf11
-  data.tar.gz: 1329b15a6cf64e26e5608cb80b3c00b53b050c53
+  metadata.gz: 793411262ca8ce30ae1f03de55a78f76d4f4d9a2
+  data.tar.gz: 28306b0b4536d295809080968dfd0a2fd7621318
 SHA512:
-  metadata.gz: fbd7fd91293a0c5e75149638713f0c2f1e2ca024023d73f22a9523dad9376eed564691385b41cbc667ae3947421142d83bb79d95a71fe64663d743fbccaf4f93
-  data.tar.gz: 6f54b9485a72214847acdab9ab0afada002bea667836eff675354fde1d08bebb78ca9362c147e6b3021c2657d0360a7085a1d9432fefe7ce2a9ef8ce152fd1fb
+  metadata.gz: 16ce8d5d39cdc76572d89a91ea895986fbd90d9fb59021f6f5a9fd65a7dc76f49121752c69a49d63fceaa48f0da2132547573c8b3df0f472668adc7e0b7140ee
+  data.tar.gz: 5948007a8f5c28089a94e3f48d60f55110b5f67c4b2cc9bf2fb7b7372f5047930253610d0b1d3ec66e5594a2470ebaea70b3df375a273257a0237e27d6832513

data/lib/penthouse/tenants/octopus_schema_tenant.rb

@@ -14,14 +14,15 @@ module Penthouse
   module Tenants
     class OctopusSchemaTenant < SchemaTenant
 
-      # ensures we're on the master Octopus shard, just updates the schema name
-      # with the tenant name
+      # ensures we're on the correct Octopus shard, then just updates the schema
+      # name with the tenant name
+      # @param shard [String, Symbol] The shard to execute within, usually master
       # @param block [Block] The code to execute within the schema
       # @yield [SchemaTenant] The current tenant instance
       # @return [void]
-      def call(&block)
-        Octopus.using(:master) do
-          super
+      def call(shard: :master, &block)
+        Octopus.using(shard) do
+          super(&block)
         end
       end
 

data/lib/penthouse/tenants/octopus_shard_tenant.rb

@@ -1,29 +1,26 @@
 #
-# The ShardTenant class relies upon Octopus [1], it switches to a different
-# shard per tenant, allowing for each tenant to have their own database, 100%
-# isolated from other tenants in terms of data and performance.
+# The OctopusShardTenant class relies upon Octopus [1], it switches to a
+# different shard per tenant, allowing for each tenant to have their own
+# database, 100% isolated from other tenants in terms of data and performance.
 #
 # [1]: (https://github.com/thiagopradi/octopus)
 #
 
-require_relative './base_tenant'
-require 'octopus'
-require_relative './migratable'
+require_relative './octopus_schema_tenant'
 
 module Penthouse
   module Tenants
-    class OctopusShardTenant < BaseTenant
-      include Migratable
+    class OctopusShardTenant < OctopusSchemaTenant
 
       attr_accessor :shard
       private :shard=
 
       # @param identifier [String, Symbol] An identifier for the tenant
       # @param shard [String, Symbol] the configured Octopus shard to use for this tenant
-      def initialize(identifer, shard:)
-        super(identifier)
+      # @param tenant_schema [String] your tenant's schema name within the Postgres shard, typically just 'public' as the shard should be dedicated
+      def initialize(identifer, shard:, tenant_schema: "public", **options)
         self.shard = shard
-        freeze
+        super(identifier, tenant_schema: tenant_schema, **options)
       end
 
       # switches to the relevant Octopus shard, and processes the block
@@ -31,9 +28,7 @@ module Penthouse
       # @yield [ShardTenant] The current tenant instance
       # @return [void]
       def call(&block)
-        Octopus.using(shard) do
-          block.yield(self)
-        end
+        super(shard: shard, &block)
       end
     end
   end

data/lib/penthouse/version.rb

@@ -1,3 +1,3 @@
 module Penthouse
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penthouse
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Townsend