rails_multitenant 0.12.0 → 0.13.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ff37a41d189f0a862756fad37fcde1f1795aa7636c1ff74272b0bfc2a9c0b2
-  data.tar.gz: aabfc280d54676a28e97377ac3c2efb05d2bbc465cdf5324f1ddf4698254d3e6
+  metadata.gz: '076093fe7d37b29994df42aac4d14d7d6343da6cb8933eb5eccad10c46296ead'
+  data.tar.gz: c74e198268ecd3b19776d5f7fcb6245b7699e7cc0c94e7875e1adf0314dd0397
 SHA512:
-  metadata.gz: ba686f109c703650b17d446119b8aea52c7a9d4c40121e90788b9755219b37b45cedb8abca64f61961233cc06cf152d2f8c1c51ce3c418f9e24dacd535944e84
-  data.tar.gz: e627d7ed403a1e7c54e224d094d9211a224c2bf598ee20a8465029f4d4ce55962169f506ad053ba1d282dda5b1d283f73128e7833b280a8daa93869237109339
+  metadata.gz: c932812c863c1393500aa185b6f09ecce088db356c07612c09cf49a1b1f1e49cff176e1d4b6a5b21b92a5656e5463393a19d64a40ed88f378d3d156e6b2d7aaf
+  data.tar.gz: ff326a18fad4f155016929a2834912ce51f43d15c043c183cef1a4ef71196954681228a4b50c9428a7603e440f6203cc97e5137f28976225fa96afb623518088

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 Salsify, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/rails_multitenant.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require 'active_support/all'
 require 'active_record'
 
-require "rails_multitenant/global_context_registry"
-require "rails_multitenant/multitenant_model"
+require 'rails_multitenant/global_context_registry'
+require 'rails_multitenant/multitenant_model'
 
-require "rails_multitenant/middleware/extensions"
+require 'rails_multitenant/middleware/extensions'
 
 module RailsMultitenant
   extend self
 
-  delegate :get, :[], :fetch, :set, :[]=, :delete, :with_isolated_registry, to: :GlobalContextRegistry
+  delegate :get, :[], :fetch, :set, :[]=, :delete, :with_isolated_registry, :merge!, :with_merged_registry,
+           to: :GlobalContextRegistry
 end
 
 # rails_multitenant/rspec has to be explicitly included by clients who want to use it

data/lib/rails_multitenant/global_context_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Handles storing of global state that may be swapped out or unset at
 # various points. We use this in dandelion to store the current user,
 # org, catalog, etc.
@@ -35,6 +37,7 @@ module RailsMultitenant
 
         def current=(object)
           raise "#{object} is not a #{self}" if object.present? && !object.is_a?(self)
+
           GlobalContextRegistry.set(current_registry_obj, object)
           __clear_dependents!
         end
@@ -78,9 +81,10 @@ module RailsMultitenant
         end
 
         def __current_default
-          if self.default_provider
-            default = self.default_provider.call(self)
+          if default_provider
+            default = default_provider.call(self)
             raise "#{default} is not a #{self}" if default.present? && !default.is_a?(self)
+
             default
           end
         end
@@ -103,7 +107,7 @@ module RailsMultitenant
       end
 
       def current?
-        self.class.current? && self.equal?(self.class.current)
+        self.class.current? && equal?(self.class.current)
       end
 
     end
@@ -124,6 +128,7 @@ module RailsMultitenant
 
         def current=(object)
           raise "#{object} is not a #{self}" if object.present? && !object.is_a?(self)
+
           GlobalContextRegistry.set(current_instance_registry_obj, object)
           GlobalContextRegistry.set(current_instance_registry_id, object.try(:id))
           __clear_dependents!
@@ -231,10 +236,15 @@ module RailsMultitenant
     end
     alias_method :[], :get
 
+    # merge the given values into the registry
+    def merge!(values)
+      globals.merge!(values)
+    end
+
     # Duplicate the registry
     def duplicate_registry
       globals.each_with_object({}) do |(key, value), result|
-        result[key] = (value.nil? || value.is_a?(Integer)) ? value : value.dup
+        result[key] = value.nil? || value.is_a?(Integer) ? value : value.dup
       end
     end
 
@@ -246,6 +256,14 @@ module RailsMultitenant
       self.globals = prior_globals
     end
 
+    # Run a block of code with the given values merged into the current registry
+    def with_merged_registry(values = {})
+      prior_globals = new_registry(globals.merge(values))
+      yield
+    ensure
+      self.globals = prior_globals
+    end
+
     # Prefer .with_isolated_registry to the following two methods.
     # Note: these methods are intended for use in a manner like .with_isolated_registry,
     # but in contexts where around semantics are not allowed.
@@ -285,7 +303,6 @@ module RailsMultitenant
 
     def globals=(value)
       Thread.current[:global_context_registry] = value
-      value
     end
   end
 end

data/lib/rails_multitenant/middleware/extensions.rb

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

data/lib/rails_multitenant/middleware/isolated_context_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsMultitenant
   module Middleware
     class IsolatedContextRegistry

data/lib/rails_multitenant/middleware/railtie.rb

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

data/lib/rails_multitenant/multitenant_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsMultitenant
   module MultitenantModel
     extend ActiveSupport::Concern
@@ -42,7 +44,7 @@ module RailsMultitenant
       def validates_multitenant_uniqueness_of(*attr_names)
         options = attr_names.extract_options!.symbolize_keys
         existing_scope = Array.wrap(options.delete(:scope))
-        scope = existing_scope | [ context_entity_id_field ]
+        scope = existing_scope | [context_entity_id_field]
         validates_uniqueness_of(*attr_names, options.merge(scope: scope))
       end
 

data/lib/rails_multitenant/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define(:be_multitenant_on) do |expected|
   match do |actual|
     actual.respond_to?(:context_entity_id_field) && actual.context_entity_id_field == expected

data/lib/rails_multitenant/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsMultitenant
-  VERSION = '0.12.0'
+  VERSION = '0.13.0.rc1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0.rc1
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: salsify_rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.63.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -155,23 +169,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- Appraisals
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
+- LICENSE.txt
 - lib/rails_multitenant.rb
 - lib/rails_multitenant/global_context_registry.rb
 - lib/rails_multitenant/middleware/extensions.rb
@@ -180,20 +178,6 @@ files:
 - lib/rails_multitenant/multitenant_model.rb
 - lib/rails_multitenant/rspec.rb
 - lib/rails_multitenant/version.rb
-- rails_multitenant.gemspec
-- spec/be_multitenant_on_matcher_spec.rb
-- spec/current_spec.rb
-- spec/db/database.yml
-- spec/db/schema.rb
-- spec/external_item_spec.rb
-- spec/external_item_with_optional_org_spec.rb
-- spec/global_context_registry_spec.rb
-- spec/item_spec.rb
-- 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:
 - MIT
@@ -209,25 +193,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment
-test_files:
-- spec/spec_helper.rb
-- spec/global_context_registry_spec.rb
-- spec/external_item_spec.rb
-- spec/item_subtype_spec.rb
-- spec/current_spec.rb
-- spec/item_spec.rb
-- spec/external_item_with_optional_org_spec.rb
-- 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
+test_files: []

data/.gitignore

@@ -1,16 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/log/
-
-bundle
-.idea
-*.iml
-/gemfiles/*.gemfile.lock
-config

data/.rspec

@@ -1,3 +0,0 @@
---color
---format documentation
---require spec_helper

data/.ruby-version

@@ -1 +0,0 @@
-2.6.3

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-sudo: false
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-matrix:
-  exclude:
-  - rvm: 2.4.6
-    gemfile: gemfiles/rails_6.0.gemfile

data/Appraisals

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-appraise 'rails-4.2' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '4.2.11.1'
-  gem 'activesupport', '4.2.11.1'
-end
-
-appraise 'rails-5.0' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '5.0.7.2'
-  gem 'activesupport', '5.0.7.2'
-end
-
-appraise 'rails-5.1' do
-  gem 'activerecord', '5.1.7'
-  gem 'activesupport', '5.1.7'
-end
-
-appraise 'rails-5.2' do
-  gem 'activerecord', '5.2.3'
-  gem 'activesupport', '5.2.3'
-end
-
-appraise 'rails-6.0' do
-  gem 'activerecord', '6.0.0.rc2'
-  gem 'activesupport', '6.0.0.rc2'
-end

data/CHANGELOG.md

@@ -1,61 +0,0 @@
-# Changelog
-
-### 0.12.0
-* Drop support for Ruby < 2.4 and Rails < 4.2.
-* Add support for Rails 6.
-
-### 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.
-
-### 0.9.0
-* Modify `Current.current` to return a specified default, when not already initialized, or `nil`
-  when no default is specified.    
-* Add `Current.provide_default` to optionally specify a default value for `Current.current`.    
-* Add `Current.current=` / `Current.current?` / `Current.current!` / `Current.as_current`.
-
-### 0.8.0
-* Switch usage of Fixnum to Integer for Ruby > 2.4
-* Test with multiple Rubies
-
-### 0.7.2
-* Fix bug that prevents clearing dependents of classes derived from CurrentInstance.  
-
-### 0.7.1
-* Added as_current multi-tenant class method.
-
-### 0.7.0
-* Add Rack middleware to create a new isolated registry per request.
-
-### 0.6.0
-* Rails 5.1 support.
-
-### 0.5.2
-* Optimize `CurrentInstance.current` / `CurrentInstance.current_id` / `CurrentInstance.current=`
-  / `CurrentInstance.current_id=`.
-
-### 0.5.1
-* Fix incorrect Rails version dependency in rubygems.org.
-
-### 0.5.0
-* Add `required` option to `multitenant_on` and `multitenant_on_model`.
-
-### 0.4.0
-* Fix be_multitenant_on matcher to handle models that don't include the `RailsMultitenant::MultitenantModel` module.
-* Fix `context_entity_id_field` to work with inheritance.
-* Drop Rails 3.2 and 4.0 support since `unscope` doesn't work propertly with default scopes.
-
-### 0.3.1
-* Fix strip_<entity>_scope
-
-### 0.3.0
-* Modify `RailsMultitenant::GlobalContextRegistry#new_registry` to accept an arg
-  specifying the new registry to set. The previous registry is still returned.
-
-### 0.2.0
-* Merged [PR 2](https://github.com/salsify/rails-multitenant/pull/2) which adds support for
-  multi-tenancy based on a foreign key to an external model. As part of this the `multitenant_model_on`
-  method was renamed to `multitenant_on_model`.

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)