effective_resources 1.8.36 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f8572e4cacab573ff3121145f120c1844e81af1c35d57d3fa9d42ffd819338
-  data.tar.gz: c168aa140a18323a17132c25d16edd3fb88329738f63c1a4dcfe7d66bde6ec6d
+  metadata.gz: d4e5791f81c07c0f264f6c4d91d4cb3e01c0194577457ae38239cfafd99ae6a6
+  data.tar.gz: 5e82bcba8a50e8b9beceffa977241c95000805690f02343aad7ffef7a66d0f97
 SHA512:
-  metadata.gz: 5043556b5414776fd0ad50ee9a298cede2ae403da26eb6cbacc4d2ccf418c71db71c22671fc5e52f378d2a0db244dd14ee45ecbf21756edcd468d0b8b22f07f2
-  data.tar.gz: eb2538b9526d60153db7faa8bd37eee9080001bcf268070ba2b754333213142ec90d98ba3067cb76c643f2eff988cad395d9353bdadc0a1910ed304388626054
+  metadata.gz: 14a3dce0969cf7487a9f950a11b8fc8cd696b5dd01253c1d89792ed1c804af08b8ba886ce640e118e5f75e1ab47a6ff500c4dd3feca75ecacc1b3f5e9646e2ec
+  data.tar.gz: 72546fd49b52e4da7c713bcadf0179438d2f91fae66d9a99d09f08a35d96a71eb149d107add609b9232dc666af8866482e7f7a5d365d00b0af06af03e06cb2a5

data/app/controllers/concerns/effective/wizard_controller/save.rb

@@ -12,7 +12,13 @@ module Effective
           @skip_to ||= skip_to_step(resource)
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
-          redirect_to(@redirect_to || wizard_path(@skip_to))
+          if @redirect_to
+            redirect_to(@redirect_to)
+          elsif @skip_to
+            redirect_to(wizard_path(@skip_to))
+          else
+            redirect_to_finish_wizard(options, params)
+          end
         else
           flash.now[:danger] = options.delete(:error) || resource_flash(:danger, resource, action)
           render_step(wizard_value(step), options)

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

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.36'.freeze
+  VERSION = '1.9.1'.freeze
 end

metadata

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