effective_resources 1.8.38 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ef8a137a53e9e2c1aa64630dfb9e90b0ae9bf3e5da8bcbc3e2f184b3273906
-  data.tar.gz: a467531f9b59542bdb1703b01ee8f5839019a1e540d7b0b35ecbe690a635ab11
+  metadata.gz: 598341ec405c5f865bd47dd20eb3ac0260243a753bebc3ebe6c113364be41c20
+  data.tar.gz: 17fdbbf3cd41afa8342b6443c646d7082c052706e3995c4a0a0279ed8e063ae9
 SHA512:
-  metadata.gz: f2aa7368664b69915f1323908f096ced6228b98debdddc81afabca6cd6e73fcb5cb0a2e8e3fbf216a178448b4e038729836195fea5846f1b209f8b3cccd15210
-  data.tar.gz: 6f3138d9e04b9bd1de179211e12b71b5b338ea8324fab434bee70d6c6fdb30a67cf70f4ad06a7b2ecc3b4d7c033c994c2c85de0971a34989014a31006fea501e
+  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/forms.rb

@@ -1,3 +1,5 @@
+# frozen_sting_literals: true
+
 module Effective
   module Resources
     module Forms

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

@@ -1,3 +1,5 @@
+# frozen_sting_literals: true
+
 module Effective
   module Resources
     module Generator
@@ -26,6 +28,23 @@ module Effective
         Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
       end
 
+      # Tenants
+      def tenant_controller_path
+        (Tenant.module_name.downcase + '/' + controller_path) if tenant?
+      end
+
+      def tenant_namespaced_class_name
+        (Tenant.module_name + '::' + namespaced_class_name) if tenant?
+      end
+
+      def tenant_namespaced_module_name
+        (Tenant.module_name + '::' + namespaced_module_name) if tenant?
+      end
+
+      def tenant_class_name
+        (Tenant.module_name + '::' + class_name) if tenant?
+      end
+
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_sting_literals: true
+
 module Effective
   module Resources
     module Init
@@ -6,7 +8,10 @@ module Effective
 
       def _initialize_input(input, namespace: nil, relation: nil)
         @initialized_name = input
-        @model_klass = (relation ? _klass_by_input(relation) : _klass_by_input(input))
+
+        # Sets the class but also namespaces
+        @model_klass = _klass_by_input(input)
+        @model_klass = _klass_by_input(relation) if relation.present?
 
         # Consider controller_name
         if @model_klass && input.kind_of?(String) && namespace.blank?

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

@@ -7,28 +7,11 @@ module Effective
       end
 
       def datatable_klass
-        if defined?(EffectiveDatatables)
-          "#{controller_path.classify.pluralize}Datatable".safe_constantize ||
-          "#{controller_path.classify}Datatable".safe_constantize ||
-          "#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
-          "#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
-          "#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
-          "#{class_name.pluralize.camelize}Datatable".safe_constantize ||
-          "#{class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
-          "#{name.pluralize.camelize}Datatable".safe_constantize ||
-          "#{name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
-          "Effective::Datatables::#{namespaced_class_name.pluralize}".safe_constantize ||
-          "Effective::Datatables::#{class_name.pluralize.camelize}".safe_constantize ||
-          "Effective::Datatables::#{name.pluralize.camelize}".safe_constantize
-        end
+        (find_tenant_datatable_klass || find_datatable_klass) if defined?(EffectiveDatatables)
       end
 
       def controller_klass
-        "#{namespaced_class_name.pluralize}Controller".safe_constantize ||
-        "#{class_name.pluralize.classify}Controller".safe_constantize ||
-        "#{name.pluralize.classify}Controller".safe_constantize ||
-        "#{initialized_name.to_s.classify.pluralize}Controller".safe_constantize ||
-        "#{initialized_name.to_s.classify}Controller".safe_constantize
+        find_controller_klass
       end
 
       def active_record?
@@ -39,6 +22,44 @@ module Effective
         klass && klass.ancestors.include?(ActiveModel::Model)
       end
 
+      private
+
+      def find_datatable_klass
+        "::#{controller_path.classify.pluralize}Datatable".safe_constantize ||
+        "::#{controller_path.classify}Datatable".safe_constantize ||
+        "::#{namespaced_class_name.pluralize}Datatable".safe_constantize ||
+        "::#{namespaced_module_name.pluralize}Datatable".safe_constantize ||
+        "::#{namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
+        "::#{class_name.pluralize.camelize}Datatable".safe_constantize ||
+        "::#{class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
+        "::#{name.pluralize.camelize}Datatable".safe_constantize ||
+        "::#{name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize ||
+        "::Effective::Datatables::#{namespaced_class_name.pluralize}".safe_constantize ||
+        "::Effective::Datatables::#{class_name.pluralize.camelize}".safe_constantize ||
+        "::Effective::Datatables::#{name.pluralize.camelize}".safe_constantize
+      end
+
+      def find_tenant_datatable_klass
+        return unless tenant?
+
+        "::#{tenant_controller_path.classify.pluralize}Datatable".safe_constantize ||
+        "::#{tenant_controller_path.classify}Datatable".safe_constantize ||
+        "::#{tenant_namespaced_class_name.pluralize}Datatable".safe_constantize ||
+
+        "::#{tenant_namespaced_module_name.pluralize}Datatable".safe_constantize ||
+        "::#{tenant_namespaced_class_name.pluralize.gsub('::', '')}Datatable".safe_constantize ||
+        "::#{tenant_class_name.pluralize.camelize}Datatable".safe_constantize ||
+        "::#{tenant_class_name.pluralize.camelize.gsub('::', '')}Datatable".safe_constantize
+      end
+
+      def find_controller_klass
+        "#{namespaced_class_name.pluralize}Controller".safe_constantize ||
+        "#{class_name.pluralize.classify}Controller".safe_constantize ||
+        "#{name.pluralize.classify}Controller".safe_constantize ||
+        "#{initialized_name.to_s.classify.pluralize}Controller".safe_constantize ||
+        "#{initialized_name.to_s.classify}Controller".safe_constantize
+      end
+
     end
   end
 end

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/effective_gem.rb

@@ -15,16 +15,16 @@ module EffectiveGem
   module ClassMethods
     def config(namespace = nil)
       namespace ||= Tenant.current if defined?(Tenant)
-      @config.dig(namespace) || @config
+      @config.dig(namespace) || @config.dig(:effective)
     end
 
     def setup(namespace = nil, &block)
       @config ||= ActiveSupport::OrderedOptions.new
+
       namespace ||= Tenant.current if defined?(Tenant)
+      namespace ||= :effective
 
-      if namespace
-        @config[namespace] ||= ActiveSupport::OrderedOptions.new
-      end
+      @config[namespace] ||= ActiveSupport::OrderedOptions.new
 
       yield(config(namespace))
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.38'.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.8.38
+  version: 1.9.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 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