effective_resources 1.9.6 → 1.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0e5b54802ada357459497c873ed7958745da7a62def14f6e0cea1b8b09b1ad3a
4
- data.tar.gz: 391b11cbab23ea721aa01bb1ada824ab064b1182f16bc88083591746205424f2
3
+ metadata.gz: 1054a07a0d8e4b48dd20bdf6c6f0acd310e67b943cbeb001b6414538fd723397
4
+ data.tar.gz: 5b042ad47a6827741163a6fffd9c38c2b9b67b175acc8d7927153e08055a16aa
5
5
  SHA512:
6
- metadata.gz: e33a16caedeaf449a75457ff5ee8ed7af961b3092e871ea3a404739054cb8fbf7fe0b9f388312e100ec6896c5f597591402a2efd0845a79bd4e44c1aa99fb16c
7
- data.tar.gz: eb12d90c64e6e8467fd3dbc6733f7e7da0ee02a94231f33f464dc1896056e01f4b1a3e8998aa949815d741bb760fd732697c63682fe303cef2a132833ff801ee
6
+ metadata.gz: b972f9e99251ef240776847b2235c8359be6c7208a1854caa52f72ab87bf0e7b8cfd269db1f27b7893d75ca8eeb489c20990c9bce567cd9fe8e4e23c4d9f8d7c
7
+ data.tar.gz: d455d59e0bcfd461b613b46710bfa44acb452171a960bb1d5444d009ccb93c95c105dcc66bd925ee8745971bfeb0d96635f774258f121cad3ecf2aab0adcdc40
@@ -12,11 +12,13 @@ module Effective
12
12
  @controller_path ||= route_name #[namespace, plural_name].compact * '/')
13
13
  end
14
14
 
15
- def engines
16
- return ([Rails.application] + Rails::Engine.subclasses.reverse) unless tenant?
17
-
18
- [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
19
- tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
15
+ def route_engines
16
+ if tenant? && Tenant.current.present?
17
+ [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
18
+ tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
19
+ end
20
+ else
21
+ [Rails.application] + Rails::Engine.subclasses.reverse
20
22
  end
21
23
  end
22
24
 
@@ -24,6 +26,8 @@ module Effective
24
26
  @routes ||= begin
25
27
  routes = nil
26
28
 
29
+ engines = route_engines()
30
+
27
31
  # Check from controller_path. This is generally correct.
28
32
  engines.each do |engine|
29
33
  routes = engine.routes.routes.select do |route|
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '1.9.6'.freeze
2
+ VERSION = '1.9.7'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.6
4
+ version: 1.9.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect