effective_resources 2.9.0 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10642ec990cb0ad6b2426415a997aead2f5d53bcdb8a932b3f276af5e9485af9
-  data.tar.gz: a971535ad4974d3931be497db3595f91e1baac7483f718e3197778e84674e525
+  metadata.gz: 39969863270d4e8a60c93f0dd10f138a93936fa84958005d25ad1a6c2ab747dd
+  data.tar.gz: 3836b95d6616e55f9bcd9d0e1c859bf17e87ac0d78dcbd89a2cfd5fbb84fd32c
 SHA512:
-  metadata.gz: c8ee4692a6b49d21cfe3d591233f9991355cb1d4d3697d5317fceb7186eb9011db71edef3dc8b6ddedc8ba97d3d28b7c7cf80bf753c18a31b344c8cbc7393db1
-  data.tar.gz: 7cfa99b30169c1bb0bc316dafdc29bad35996b678affea7f21e9ab6fe469bdf4dd6a3fe013d028b8e8fb4cd4281aa809640477db683e3cb0d987bc40d62375b5
+  metadata.gz: 7c5b1e1c914d649b9c56004066d21d2d3125a68246dc15c95934850f3e2ae68c4d6eb07e1d55c6d163c2de42bdab06340d26dbd3561273078496aa3a41b80e84
+  data.tar.gz: c7e7eb23d4363b1977147d7e26ff2481dadf83ecd7326616f95392df404fff13d9434ac40f8091e41d6d07199b0f9d62f1c6a21bba3252366f5484a90adb32e7

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

@@ -185,8 +185,10 @@ module Effective
           respond_to do |format|
             format.html { }
             format.js do
+              html_template = action if template_present?(action, format: :html)
               template = template_present?(action) ? action : 'member_action'
-              render(template, formats: :js, locals: { action: action })
+
+              render(template, formats: :js, locals: { action: action, html_template: html_template })
             end
           end
 

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

@@ -103,9 +103,10 @@ module Effective
         flash[:danger] ||= danger
       end
 
-      def template_present?(action)
+      def template_present?(action, format: nil)
+        format = Array(format).presence
         formats = [(request.format.symbol.to_s.sub('json', 'js').presence || 'html').to_sym]
-        lookup_context.template_exists?(action, _prefixes, formats: formats)
+        lookup_context.template_exists?(action, _prefixes, formats: (format || formats))
       end
 
     end

data/app/helpers/effective_resources_helper.rb

@@ -189,13 +189,15 @@ module EffectiveResourcesHelper
     safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
-    if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
-      return render(effective_resource.name, atts)
+    partial = (action.present? ? action.to_s : effective_resource.name)
+
+    if lookup_context.template_exists?(partial, controller._prefixes, :partial)
+      return render(partial, atts)
     end
 
     effective_resource.view_paths.each do |view_path|
-      if lookup_context.template_exists?(effective_resource.name, [view_path], :partial)
-        return render(view_path + '/' + effective_resource.name, atts)
+      if lookup_context.template_exists?(partial, [view_path], :partial)
+        return render(view_path + '/' + partial, atts)
       end
     end
 

data/app/models/concerns/acts_as_wizard.rb

@@ -146,10 +146,16 @@ module ActsAsWizard
       has_completed_step?(required_steps.last)
     end
 
-    def reset_wizard_steps!
+    def reset_all_wizard_steps!
       update!(wizard_steps: {})
     end
 
+    def complete_all_wizard_steps!
+      now = Time.zone.now
+      required_steps.each { |step| wizard_steps[step] ||= now }
+      save!
+    end
+
     def without_current_step(&block)
       existing = current_step
 

data/app/validators/size_validator.rb

@@ -15,9 +15,15 @@ class SizeValidator < ActiveModel::EachValidator
     max_size = options.try(:[], :less_than) || 2.megabytes
     message = options.try(:[], :message) || "is too large, please upload a file smaller than #{max_size / 1.megabyte}MB"
 
-    if value.blob.byte_size > max_size
-      record.errors.add(attribute, message)
+    blobs = value.try(:blobs) || value.try(:blob) || raise('unable to find blobs')
+
+    Array(blobs).each do |blob|
+      if blob.byte_size > max_size
+        record.errors.add(attribute, message)
+        break
+      end
     end
 
+    true
   end
 end

data/app/views/application/member_action.js.erb

@@ -1,7 +1,12 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action, safe: true) %>";
+<% if html_template.present? %>
+  EffectiveForm.remote_form_payload = "<%= j(render_resource_partial(@resource, action: action)) %>";
+<% else %>
+  EffectiveForm.remote_form_payload = "<%= j(render_resource_form(@resource, action: action, safe: true).presence || render_resource_partial(@resource)) %>";
+<% end %>
+
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 

data/lib/effective_resources/engine.rb

@@ -46,10 +46,8 @@ module EffectiveResources
       app.config.to_prepare do
         if defined?(CanCan::Ability)
           CanCan::Ability.module_eval do
-            CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
-
             def crud
-              CRUD_ACTIONS
+              [:index, :new, :create, :edit, :update, :show, :destroy]
             end
           end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails