effective_resources 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5b54802ada357459497c873ed7958745da7a62def14f6e0cea1b8b09b1ad3a
-  data.tar.gz: 391b11cbab23ea721aa01bb1ada824ab064b1182f16bc88083591746205424f2
+  metadata.gz: 1054a07a0d8e4b48dd20bdf6c6f0acd310e67b943cbeb001b6414538fd723397
+  data.tar.gz: 5b042ad47a6827741163a6fffd9c38c2b9b67b175acc8d7927153e08055a16aa
 SHA512:
-  metadata.gz: e33a16caedeaf449a75457ff5ee8ed7af961b3092e871ea3a404739054cb8fbf7fe0b9f388312e100ec6896c5f597591402a2efd0845a79bd4e44c1aa99fb16c
-  data.tar.gz: eb12d90c64e6e8467fd3dbc6733f7e7da0ee02a94231f33f464dc1896056e01f4b1a3e8998aa949815d741bb760fd732697c63682fe303cef2a132833ff801ee
+  metadata.gz: b972f9e99251ef240776847b2235c8359be6c7208a1854caa52f72ab87bf0e7b8cfd269db1f27b7893d75ca8eeb489c20990c9bce567cd9fe8e4e23c4d9f8d7c
+  data.tar.gz: d455d59e0bcfd461b613b46710bfa44acb452171a960bb1d5444d009ccb93c95c105dcc66bd925ee8745971bfeb0d96635f774258f121cad3ecf2aab0adcdc40

data/app/models/effective/resources/actions.rb

@@ -12,11 +12,13 @@ module Effective
         @controller_path ||= route_name #[namespace, plural_name].compact * '/')
       end
 
-      def engines
-        return ([Rails.application] + Rails::Engine.subclasses.reverse) unless tenant?
-
-        [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
-          tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
+      def route_engines
+        if tenant? && Tenant.current.present?
+          [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
+            tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
+          end
+        else
+          [Rails.application] + Rails::Engine.subclasses.reverse
         end
       end
 
@@ -24,6 +26,8 @@ module Effective
         @routes ||= begin
           routes = nil
 
+          engines = route_engines()
+
           # Check from controller_path. This is generally correct.
           engines.each do |engine|
             routes = engine.routes.routes.select do |route|

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.6'.freeze
+  VERSION = '1.9.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - Code and Effect