effective_resources 1.8.37 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0717144b74cef2f8c9371376473c80c7777ed62ae65678cfa4335a32736896d7
-  data.tar.gz: 7c6965480ed359392c576e95ce651585a6c5c5169b50e41d5ab16c13b964cc8b
+  metadata.gz: 010a64ad908bb27807756924d3f05112c7910568615678bcc8c99b04c7c69f93
+  data.tar.gz: cee9d5812ee210d09a8481c3261b625db6f7cf9b86d36fb261623d5e4fda2145
 SHA512:
-  metadata.gz: 31160ec3013825ae35a28359229f2fa02306776412a0fe333c5f7e2738327ad563fb525faaae64fc5db0130377ee8edc3010113514902e99a496a33d9f4701ea
-  data.tar.gz: ee2846f65473cd2c917c54b428cbd467531a5fa91967c8896a2b489c659c2d1250db374382f941a8af747a0e5b39c5b30be8aedf35fdee29475f133354513e1a
+  metadata.gz: 72c9617fedc1420ec4b520328d66e92d765691d943c4ed0d0f6b642e876a74d9d2a11f3a9be16003a1fa8540dc20b43617b9f8dec740625010b7cacf37b1f63b
+  data.tar.gz: 7a9e7735119fc14caf02d6cee1e0fe1e9558888fc6ca7df4d33c95f073d28b7422adbb0fd93092391067b8ccd06dcb8eb8708a2017dafac5e5375103aa055d92

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 defined?(Tenant)
+      end
+
+      def tenant_namespaced_class_name
+        (Tenant.module_name + '::' + namespaced_class_name) if defined?(Tenant)
+      end
+
+      def tenant_namespaced_module_name
+        (Tenant.module_name + '::' + namespaced_module_name) if defined?(Tenant)
+      end
+
+      def tenant_class_name
+        (Tenant.module_name + '::' + class_name) if defined?(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 defined?(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/lib/effective_resources/effective_gem.rb

@@ -8,22 +8,23 @@ module EffectiveGem
 
     config_keys.each do |key|
       self.singleton_class.define_method(key) { config()[key] }
+      self.singleton_class.define_method("#{key}=") { |value| config()[key] = value }
     end
   end
 
   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.37'.freeze
+  VERSION = '1.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.37
+  version: 1.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails