rails_multitenant 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293f8ddc31294eb5091ec683117246dc68d8b2ee
-  data.tar.gz: ba3050ebc4ecd0abb397137aa5e323d775d47fd2
+  metadata.gz: '08f671a9e38be41cc1e23a8f79db4f7d8b2b5a09'
+  data.tar.gz: c59f436adebc42b31b325df61f5c74a2227855d4
 SHA512:
-  metadata.gz: 9f3fe2d0f2d6a0af2f1e5b2a34873864f1b984a5e8e882a5668e8a6f62be580b8141b017d596246966946a8548eb99ceab4bef13c021a18d0cbb1752d3ba9003
-  data.tar.gz: 0dae290726903206c204610e1bbc47443ae0cb8475a20c5b2b881327d8bf15471d6b811f3665c30bc420c40c6ec724440e396ecf7d5ba2a20ada00e94d95aabd
+  metadata.gz: c0c279650d661914c08bf934a70d6b8cf8043feeb233be653d2721a4fcb3f58cc37632818195ab16fa8dba75b2e45f2587c24698c459f01791b368d212bed7ef
+  data.tar.gz: 90e7b9c505b892fa5f8673c51c1556dbe8c6741dbf6f74b994c5b57ce0f23f61fa752ef3fdbd2104122b63d2bf3cd4a5845ac665aafa894b20425c70f1c16ee9

data/.gitignore

@@ -7,5 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/
 
 bundle

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.7.0
+* Add Rack middleware to create a new isolated registry per request.
+
 ### 0.6.0
 * Rails 5.1 support.
 

data/README.md

@@ -19,6 +19,10 @@ Or install it yourself as:
 
     $ gem install rails_multitenant
 
+If you're using Rails, there's nothing else you need to do.
+
+Otherwise, you need to insert `RailsMultitenant::Middleware::IsolatedContextRegistry` into your middleware stack
+
 ## Usage
 
 The gem supports two multi-tenancy strategies:
@@ -26,7 +30,7 @@ The gem supports two multi-tenancy strategies:
 1. Based on a model attribute, typically a foreign key to an entity owned by another service
 2. Based on a model association
 
-The gem uses ActiveRecord default scopes to make isolating tenants fairly transparent. 
+The gem uses ActiveRecord default scopes to make isolating tenants fairly transparent.
 
 ### Multi-tenancy Based on Model Attributes
 

data/lib/rails_multitenant.rb

@@ -4,4 +4,6 @@ require 'active_record'
 require "rails_multitenant/global_context_registry"
 require "rails_multitenant/multitenant_model"
 
+require "rails_multitenant/middleware/extensions"
+
 # rails_multitenant/rspec has to be explicitly included by clients who want to use it

data/lib/rails_multitenant/middleware/extensions.rb

@@ -0,0 +1,5 @@
+require 'rails_multitenant/middleware/isolated_context_registry'
+
+if defined?(Rails)
+  require 'rails_multitenant/middleware/railtie'
+end

data/lib/rails_multitenant/middleware/isolated_context_registry.rb

@@ -0,0 +1,15 @@
+module RailsMultitenant
+  module Middleware
+    class IsolatedContextRegistry
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        GlobalContextRegistry.with_isolated_registry do
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/rails_multitenant/middleware/railtie.rb

@@ -0,0 +1,9 @@
+module RailsMultitenant
+  module Middleware
+    class Railtie < ::Rails::Railtie
+      initializer "rails_multitenant.middleware" do |app|
+        app.config.middleware.insert 0, ::RailsMultitenant::Middleware::IsolatedContextRegistry
+      end
+    end
+  end
+end

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,3 @@
 module RailsMultitenant
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/middleware_isolated_context_registry_spec.rb

@@ -0,0 +1,15 @@
+describe Middleware::IsolatedContextRegistry do
+  let(:payload) { [200, {'Content-Type' => 'text/plain'}, ['OK']] }
+  let(:app) { lambda { |env| env[2] = GlobalContextRegistry.get(:foo); env } }
+  let(:middleware) { described_class.new(app) }
+
+  describe '.call' do
+    specify do
+      GlobalContextRegistry.set(:foo, 'bar')
+      # Assert that a new global registry is created and read from, where :foo is not set
+      expect(middleware.call(payload)).to eq [200, {'Content-Type' => 'text/plain'}, nil]
+      # Assert that the outer global context registry is restored
+      expect(GlobalContextRegistry.get(:foo)).to eq 'bar'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,9 @@ files:
 - bin/setup
 - lib/rails_multitenant.rb
 - lib/rails_multitenant/global_context_registry.rb
+- lib/rails_multitenant/middleware/extensions.rb
+- lib/rails_multitenant/middleware/isolated_context_registry.rb
+- lib/rails_multitenant/middleware/railtie.rb
 - lib/rails_multitenant/multitenant_model.rb
 - lib/rails_multitenant/rspec.rb
 - lib/rails_multitenant/version.rb
@@ -181,6 +184,7 @@ files:
 - spec/item_spec.rb
 - spec/item_subtype_spec.rb
 - spec/item_with_optional_org_spec.rb
+- spec/middleware_isolated_context_registry_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/salsify/rails-multitenant
 licenses:
@@ -202,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment
@@ -216,4 +220,5 @@ test_files:
 - spec/item_spec.rb
 - spec/item_subtype_spec.rb
 - spec/item_with_optional_org_spec.rb
+- spec/middleware_isolated_context_registry_spec.rb
 - spec/spec_helper.rb