effective_resources 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 598341ec405c5f865bd47dd20eb3ac0260243a753bebc3ebe6c113364be41c20
-  data.tar.gz: 17fdbbf3cd41afa8342b6443c646d7082c052706e3995c4a0a0279ed8e063ae9
+  metadata.gz: 72da4b1b0ca72429a3a32b29cfb4f6fa3e8861b0c5ca4e5243b5f9b6405c55fd
+  data.tar.gz: a145acc8a26f9e13aa237bce6519f0d5f6e9964d6c3db556324876dca5fdf2e7
 SHA512:
-  metadata.gz: f1b7daf92008549871a27f404f56f6c24554d49f5d8a33659fe5428af05544cc051b5824e682bce143ad459755b317d39866e2a770c916c0ca9e882d23a9349a
-  data.tar.gz: 4f1815a0e2f563687c78422623c20bef18143b33e01e2fa49d61681583233f8fb40884f5fba98261fb3c7b32dfb4d810f2ffab95d2f241b614ca24d50c1a6180
+  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/lib/effective_resources/version.rb

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

metadata

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