rails_multitenant 0.11.0 → 0.15.0

data/lib/rails_multitenant/global_context_registry/registry_dependent_on.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RailsMultitenant
+  module GlobalContextRegistry
+    module RegistryDependentOn
+      # Is this class dependent on changes in another GlobalContextRegistry-
+      # stored object? Register that dependency here.
+      def global_context_dependent_on(*klasses)
+        klasses.each { |klass| GlobalContextRegistry.send(:add_dependency, klass, self) }
+      end
+    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
@@ -16,7 +18,9 @@ module RailsMultitenant
         scope_sym = "from_current_#{context_entity}".to_sym
 
         scope scope_sym, -> do
-          where(context_entity_id_field => GlobalContextRegistry[context_entity_id_field])
+          unless GlobalContextRegistry.use_unscoped_queries?
+            where(context_entity_id_field => GlobalContextRegistry[context_entity_id_field])
+          end
         end
 
         default_scope { send(scope_sym) }
@@ -42,7 +46,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.11.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Pat Breault
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -96,30 +96,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '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
@@ -140,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 description: Handles multiple tenants in a Rails environment
 email:
 - pbreault@salsify.com
@@ -155,44 +183,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
+- LICENSE.txt
 - lib/rails_multitenant.rb
 - lib/rails_multitenant/global_context_registry.rb
+- lib/rails_multitenant/global_context_registry/current.rb
+- lib/rails_multitenant/global_context_registry/current_instance.rb
+- lib/rails_multitenant/global_context_registry/registry_dependent_on.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
-- 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,29 +207,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+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,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/log/
-
-bundle
-.idea
-*.iml

data/.rspec

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

data/.ruby-version

@@ -1 +0,0 @@
-2.4.3

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-sudo: false
-env:
-  - RAILS_VERSION="~> 4.1.16"
-  - RAILS_VERSION="~> 4.2.10"
-  - RAILS_VERSION="~> 5.0.7"
-  - RAILS_VERSION="~> 5.1.6"
-  - RAILS_VERSION="~> 5.2.0"
-rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
-  - 2.1.10
-matrix:
-  exclude:
-  - rvm: 2.1.10
-    env: RAILS_VERSION="~> 5.0.7"
-  - rvm: 2.1.10
-    env: RAILS_VERSION="~> 5.1.6"
-  - rvm: 2.1.10
-    env: RAILS_VERSION="~> 5.2.0"
-  - rvm: 2.4.4
-    env: RAILS_VERSION="~> 4.1.16"
-  - rvm: 2.5.1
-    env: RAILS_VERSION="~> 4.1.16"
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'

data/CHANGELOG.md

@@ -1,57 +0,0 @@
-# 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.
-
-### 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`.