rails_multitenant 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 67d4b3670342f9781ea8caf11d7bdad5738b2dfe9bd3db7c4b875a04d0ed98d1
-  data.tar.gz: 34f9a2766c8535fef4541a5c4e8029f9f761eb9a619d6e1253f551f359c18e6d
+SHA1:
+  metadata.gz: 7c9936e0904797c7af7fb67e3a08102b5d4388be
+  data.tar.gz: 5ba8bb69723b5d3b83007d6b5ad2148aa9769a50
 SHA512:
-  metadata.gz: 96816ef2f33df7dfe1f77a2dd71fcfb67b54109c760e639030133f7a85ce8ec1949712f091c0e50bf3f3b172ec1d0d97b87020e4b243a2e79547b358c6fd53f2
-  data.tar.gz: 902994f55431faf8747fba66847b2e2c0e2b3b15c949910cb33849e682256c21a1ed05865662aa6de033875b72162c5f98d44edaf4267feedefea49f5a69ae50
+  metadata.gz: c1affba9e932ba4ffd61a034382a05fcc7027701137bafd215345451173ec5d92ef087366acf101db4e8fa48220f33c1b4649b33cb1b57c77c05b99db2de5bda
+  data.tar.gz: d7e99b00fe2ef9bd7070b7074a0ea09e6a7a35a70554f62b095843318086da92a231543530132c95f316b913d01a3f71d062aa22b2d9cb2f3ee116188480e6be

data/.travis.yml

@@ -24,4 +24,6 @@ matrix:
     env: RAILS_VERSION="~> 4.1.16"
   - rvm: 2.5.1
     env: RAILS_VERSION="~> 4.1.16"
-before_install: gem install bundler -v 1.16.2
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.11.0
+* Provide shorthands to access `RailsMultitenant::GlobalContextRegistry` methods via `RailsMultitenant`.
+  For example `RailsMultitenant[:organization_id] = 'some value'` will set that value in the registry.
+
 ### 0.10.0
 * Rails 5.2 support.
 

data/README.md

@@ -99,6 +99,15 @@ end
 By default this adds an ActiveRecord validation to ensure the tenant model is present but this can be disabled
 by passing `required: false` to `multitenant_on_model`.
 
+### Shorthand
+
+When using `rails-multitenant` in a project, it is common to need to set values in `RailsMultitenant::GlobalContextRegistry` at the rails console.
+
+This is difficult to type. Alternatively you can shorten it to `RailsMultitenant`. For example you might type `RailsMultitenant[:organization_id] = 'some value'` and it will have the same effect as the long version.
+
+This is mainly intended as a console convenience. Using the long form in source code is fine, and more explicit.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rails_multitenant.rb

@@ -6,4 +6,10 @@ require "rails_multitenant/multitenant_model"
 
 require "rails_multitenant/middleware/extensions"
 
+module RailsMultitenant
+  extend self
+
+  delegate :get, :[], :fetch, :set, :[]=, :delete, :with_isolated_registry, to: :GlobalContextRegistry
+end
+
 # rails_multitenant/rspec has to be explicitly included by clients who want to use it

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,3 @@
 module RailsMultitenant
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/rails_multitenant.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '< 11.0'
   spec.add_development_dependency 'rspec', '~> 2'
   spec.add_development_dependency 'simplecov', '~> 0.15.1'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.0'
 end

data/spec/rails_multitenant_spec.rb

@@ -0,0 +1,51 @@
+describe "delegating to GlobalContextRegistry" do
+  it "RailsMultitenant.get returns values from the GlobalContextRegistry" do
+    RailsMultitenant::GlobalContextRegistry.set(:organization_id, 'Salsify Housing Authority')
+
+    expect(RailsMultitenant.get(:organization_id)).to eq('Salsify Housing Authority')
+  end
+
+  it "RailsMultitenant[] returns values from the GlobalContextRegistry" do
+    RailsMultitenant::GlobalContextRegistry.set(:organization_id, 'Salsify Farmland Inc.')
+
+    expect(RailsMultitenant[:organization_id]).to eq('Salsify Farmland Inc.')
+  end
+
+  it "RailsMultitenant.set assigns values in the GlobalContextRegistry" do
+    RailsMultitenant.set(:organization_id, 'Salsify Eminient Domain')
+
+    expect(RailsMultitenant::GlobalContextRegistry.get(:organization_id)).to eq('Salsify Eminient Domain')
+  end
+
+  it "RailsMultitenant[]= assigns values in the GlobalContextRegistry" do
+    RailsMultitenant[:organization_id] = 'Salsify Co-op'
+
+    expect(RailsMultitenant::GlobalContextRegistry[:organization_id]).to eq('Salsify Co-op')
+  end
+
+  it "RailsMultitenant.fetch checks and sets the GlobalContextRegistry" do
+    RailsMultitenant::GlobalContextRegistry[:organization_id] = nil
+
+    expect(RailsMultitenant.fetch(:organization_id) { 'Salsify Anarchists' }).to eq('Salsify Anarchists')
+
+    expect(RailsMultitenant.fetch(:organization_id) { 'Salsify Crypto Anarchists' }).to eq('Salsify Anarchists')
+  end
+
+  it "RailsMultitenant.delete removes from the GlobalContextRegistry" do
+    RailsMultitenant::GlobalContextRegistry[:organization_id] = 'Not Salsify'
+
+    RailsMultitenant.delete(:organization_id)
+
+    expect(RailsMultitenant.get(:organization_id)).to be_nil
+  end
+
+  it "RailsMultitenant.with_isolated_registry leverages the GlobalContextRegistry" do
+    RailsMultitenant::GlobalContextRegistry[:organization_id] = 'Salsify Mainland'
+
+    RailsMultitenant.with_isolated_registry({ organization_id: 'Salsify Private Island' }) do
+      expect(RailsMultitenant::GlobalContextRegistry[:organization_id]).to eq('Salsify Private Island')
+    end
+
+    expect(RailsMultitenant::GlobalContextRegistry[:organization_id]).to eq('Salsify Mainland')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,16 +138,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 description: Handles multiple tenants in a Rails environment
 email:
 - pbreault@salsify.com
@@ -186,6 +186,7 @@ files:
 - spec/item_subtype_spec.rb
 - spec/item_with_optional_org_spec.rb
 - spec/middleware_isolated_context_registry_spec.rb
+- spec/rails_multitenant_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/salsify/rails-multitenant
 licenses:
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment
@@ -222,5 +223,6 @@ test_files:
 - spec/db/schema.rb
 - spec/db/database.yml
 - spec/be_multitenant_on_matcher_spec.rb
+- spec/rails_multitenant_spec.rb
 - spec/item_with_optional_org_spec.rb
 - spec/middleware_isolated_context_registry_spec.rb