effective_resources 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010a64ad908bb27807756924d3f05112c7910568615678bcc8c99b04c7c69f93
-  data.tar.gz: cee9d5812ee210d09a8481c3261b625db6f7cf9b86d36fb261623d5e4fda2145
+  metadata.gz: 598341ec405c5f865bd47dd20eb3ac0260243a753bebc3ebe6c113364be41c20
+  data.tar.gz: 17fdbbf3cd41afa8342b6443c646d7082c052706e3995c4a0a0279ed8e063ae9
 SHA512:
-  metadata.gz: 72c9617fedc1420ec4b520328d66e92d765691d943c4ed0d0f6b642e876a74d9d2a11f3a9be16003a1fa8540dc20b43617b9f8dec740625010b7cacf37b1f63b
-  data.tar.gz: 7a9e7735119fc14caf02d6cee1e0fe1e9558888fc6ca7df4d33c95f073d28b7422adbb0fd93092391067b8ccd06dcb8eb8708a2017dafac5e5375103aa055d92
+  metadata.gz: f1b7daf92008549871a27f404f56f6c24554d49f5d8a33659fe5428af05544cc051b5824e682bce143ad459755b317d39866e2a770c916c0ca9e882d23a9349a
+  data.tar.gz: 4f1815a0e2f563687c78422623c20bef18143b33e01e2fa49d61681583233f8fb40884f5fba98261fb3c7b32dfb4d810f2ffab95d2f241b614ca24d50c1a6180

data/app/models/effective/resource.rb

@@ -14,7 +14,7 @@ module Effective
     include Effective::Resources::Paths
     include Effective::Resources::Relation
     include Effective::Resources::Sql
-
+    include Effective::Resources::Tenants
 
     # In practice, this is initialized two ways
     # With a klass and a namespace from effective_datatables

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

@@ -30,19 +30,19 @@ module Effective
 
       # Tenants
       def tenant_controller_path
-        (Tenant.module_name.downcase + '/' + controller_path) if defined?(Tenant)
+        (Tenant.module_name.downcase + '/' + controller_path) if tenant?
       end
 
       def tenant_namespaced_class_name
-        (Tenant.module_name + '::' + namespaced_class_name) if defined?(Tenant)
+        (Tenant.module_name + '::' + namespaced_class_name) if tenant?
       end
 
       def tenant_namespaced_module_name
-        (Tenant.module_name + '::' + namespaced_module_name) if defined?(Tenant)
+        (Tenant.module_name + '::' + namespaced_module_name) if tenant?
       end
 
       def tenant_class_name
-        (Tenant.module_name + '::' + class_name) if defined?(Tenant)
+        (Tenant.module_name + '::' + class_name) if tenant?
       end
 
     end

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

@@ -40,7 +40,7 @@ module Effective
       end
 
       def find_tenant_datatable_klass
-        return unless defined?(Tenant)
+        return unless tenant?
 
         "::#{tenant_controller_path.classify.pluralize}Datatable".safe_constantize ||
         "::#{tenant_controller_path.classify}Datatable".safe_constantize ||

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

@@ -65,16 +65,6 @@ module Effective
       def human_plural_name
         name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
       end
-
-      def tenant
-        return nil unless defined?(Tenant)
-        return nil unless klass.present?
-        return nil unless class_name.include?('::')
-
-        name = class_name.split('::').first.downcase.to_sym
-        name if Rails.application.config.tenants[name].present?
-      end
-
     end
   end
 end

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

@@ -5,8 +5,7 @@ module Effective
     module Paths
 
       def tenant_path
-        return unless tenant.present?
-        Tenant.engine_path(tenant).sub("#{Rails.root}/", '')
+        Tenant.engine_path(tenant).sub("#{Rails.root}/", '') if tenant?
       end
 
       def model_file

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

@@ -0,0 +1,20 @@
+module Effective
+  module Resources
+    module Tenants
+
+      def tenant?
+        defined?(::Tenant)
+      end
+
+      def tenant
+        return unless tenant?
+        return nil unless klass.present?
+        return nil unless class_name.include?('::')
+
+        name = class_name.split('::').first.downcase.to_sym
+        name if Rails.application.config.tenants[name].present?
+      end
+
+    end
+  end
+end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.2'.freeze
+  VERSION = '1.9.3'.freeze
 end

data/lib/effective_resources.rb

@@ -33,6 +33,24 @@ module EffectiveResources
 
   # Utilities
 
+  # This looks up the best class give the name
+  # If the Tenant is present, use those classes first.
+  def self.best(name)
+    klass = if defined?(Tenant)
+      ('::' + Tenant.module_name + '::' + name).safe_constantize ||
+      ('::' + Tenant.module_name + '::Effective::' + name).safe_constantize
+    end
+
+    klass ||= begin
+      ('::' + name).safe_constantize ||
+      ('::Effective::' + name).safe_constantize
+    end
+
+    raise("unable to find best #{name}") if klass.blank?
+
+    klass
+  end
+
   def self.truthy?(value)
     if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,6 +184,7 @@ files:
 - app/models/effective/resources/paths.rb
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
+- app/models/effective/resources/tenants.rb
 - app/views/application/_flash.html.haml
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb