effective_resources 1.9.0 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e170a1dbe4e16bf76c3048540a98601f3944fb624ba7f6dc50a25d31d0c6b528
-  data.tar.gz: 3e0c48d4caa389595a6b77f7ab7f6ad00c469d397e0962d443ec04a8129d73cb
+  metadata.gz: 72da4b1b0ca72429a3a32b29cfb4f6fa3e8861b0c5ca4e5243b5f9b6405c55fd
+  data.tar.gz: a145acc8a26f9e13aa237bce6519f0d5f6e9964d6c3db556324876dca5fdf2e7
 SHA512:
-  metadata.gz: ea9eefce2138894165ba88a81f5fbefa0edd500046aed321bd11ad6b93181b5cc9a36ba51668d869b59043e629c71577e026a97dd9667117f864db7b3199eaa9
-  data.tar.gz: f01e4bcef353c0fd5865b4cb046eb3814acf7172c357b8f2b6b7a9f9456f3209d1a13f0931ed67bb7804e891e6a79aab7ef774b85996d7f07e5872e0b84069db
+  metadata.gz: 6bb00698226acb546365464870767a22e235310a9128d2fa7a80df17dca9697d9f58bfb2810744657591d0c80605a836d507cfe9f9d79abd5cffb6a712ddc4d1
+  data.tar.gz: 329869f907f76bd54bd506e41433a40e1fd95837b81219cf80c2f349fc448d081080e4e73558c42207c90b576f0c0a1a1f31698a7e05378674a048f13486cc17

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -9,7 +9,7 @@ module Effective
         @page_title ||= resource_plural_name.titleize
 
         self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
-        @datatable = resource_datatable(:index)
+        @datatable = resource_datatable()
 
         run_callbacks(:resource_render)
       end
@@ -214,7 +214,7 @@ module Effective
         @page_title ||= "#{action.to_s.titleize} #{resource_plural_name.titleize}"
 
         if request.get?
-          @datatable = resource_datatable(action)
+          @datatable = resource_datatable()
           run_callbacks(:resource_render)
 
           view = lookup_context.template_exists?(action, _prefixes) ? action : :index

data/app/controllers/concerns/effective/crud_controller/dsl.rb

@@ -61,7 +61,20 @@ module Effective
         raise 'expected a label or block' unless (label || block_given?)
 
         instance_exec do
-          before_action(opts) { @page_title ||= (block_given? ? instance_exec(&block) : label).to_s }
+          before_action(opts) do
+            @page_title ||= (block_given? ? instance_exec(&block) : label).to_s
+          end
+        end
+      end
+
+      # datatable -> { MyDatatable.new }, only: [:index]
+      def datatable(obj = nil, opts = {}, &block)
+        raise 'expected a proc or block' unless (obj.respond_to?(:call) || block_given?)
+
+        instance_exec do
+          before_action(opts) do
+            @datatable ||= (block_given? ? instance_exec(&block) : obj.call)
+          end
         end
       end
 
@@ -84,7 +97,6 @@ module Effective
         else
           define_method(:resource_scope_relation) { return obj }
         end
-
       end
 
     end

data/app/controllers/concerns/effective/crud_controller.rb

@@ -108,15 +108,16 @@ module Effective
       resource_scope.where_values_hash.symbolize_keys
     end
 
-    def resource_datatable(action)
-      datatable_klass = if action == :index
-        effective_resource.datatable_klass
-      else # Admin::ActionDatatable.new
-        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.classify].compact.join('::')}Datatable".safe_constantize ||
-        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.pluralize.classify].compact.join('::')}Datatable".safe_constantize ||
-        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.singularize.classify].compact.join('::')}Datatable".safe_constantize
+    def resource_datatable
+      # This might have been done from a before action or dsl method
+      unless @datatable.nil?
+        raise('expected @datatable to be an Effective::Datatable') unless @datatable.kind_of?(Effective::Datatable)
+
+        @datatable.effective_resource = effective_resource
+        return @datatable
       end
 
+      datatable_klass = effective_resource.datatable_klass
       return unless datatable_klass.present?
 
       datatable = datatable_klass.new(resource_datatable_attributes)

data/app/models/concerns/acts_as_wizard.rb

@@ -76,7 +76,11 @@ module ActsAsWizard
     end
 
     def next_step
-      required_steps.reverse.find { |step| can_visit_step?(step) } || required_steps.first
+      first_uncompleted_step ||
+      last_completed_step ||
+      required_steps.reverse.find { |step| can_visit_step?(step) } ||
+      required_steps.first ||
+      :start
     end
 
     def previous_step(step)
@@ -89,6 +93,13 @@ module ActsAsWizard
       previous.blank? || has_completed_step?(previous)
     end
 
+    def has_completed_all_previous_steps?(step)
+      index = required_steps.index(step).to_i
+      previous = required_steps[0...index]
+
+      previous.blank? || previous.all? { |step| has_completed_step?(step) }
+    end
+
     def has_completed_last_step?
       has_completed_step?(required_steps.last)
     end
@@ -97,12 +108,12 @@ module ActsAsWizard
 
     def can_revisit_completed_steps(step)
       return (step == required_steps.last) if has_completed_last_step?
-      has_completed_previous_step?(step)
+      has_completed_all_previous_steps?(step)
     end
 
     def cannot_revisit_completed_steps(step)
       return (step == required_steps.last) if has_completed_last_step?
-      has_completed_previous_step?(step) && !has_completed_step?(step)
+      has_completed_all_previous_steps?(step) && !has_completed_step?(step)
     end
 
   end

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

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.4'.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.0
+  version: 1.9.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-11-16 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