effective_resources 1.8.13 → 1.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '064967a176b57ad12b7dd280d6f0471ca8655fd061cb9bf0aa58c6bac94772ad'
-  data.tar.gz: f5c4412bd5732c346a5aa7c5764c11178ab109afc58eb9949c97211dde972c00
+  metadata.gz: 180638d525bdd6d499cddd67f09595509685ebbfdc59e69ea16d89fdef6ff1fa
+  data.tar.gz: e9687c798dceef560a070a4631876ca17b401cf2e7d993c7df98dbe5af5febc4
 SHA512:
-  metadata.gz: 3169964c8d02171156423cbb0439ed671887d095d2c26fa7ffbf254162cfb9b72b7ab0f63dcc8eef2420bb0139fe2cba00a7e16cec7632232d6af3383796ce34
-  data.tar.gz: cdc0afac03a21901fe95495e8b3ebb64c64017b71487173eb2cb85232a35da5cf367af0725d3a25f3170874e13c753c2fdeb67cb98aab8a5ea6cf75f136bc9a5
+  metadata.gz: 41b62506a91d29ebe9049ce5de063e18412ba60cf4d63636e2cbe245d2b972a8a767d4645d2f42f5b4923b73eb867b4ea0ed508bda1ab55747d68f46dc1db4af
+  data.tar.gz: de31440669699862980273c6b1ce68b786057d200b524ec1ad0a54a09d73b8fbae9bfb372918b263fe8bc23254329ca15feb305adab7a683d86833738d0c5f6c

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

@@ -15,7 +15,16 @@ module Effective
 
             format.js do
               flash[:success] ||= resource_flash(:success, resource, action)
-              render(action, locals: { remote_form_redirect: resource_redirect_path(resource, action)}) # action.js.erb
+
+              if params[:_datatable_action]
+                redirect_to(resource_redirect_path(resource, action))
+              else
+                render(
+                  (template_present?(action) ? action : :member_action),
+                  locals: { action: action, remote_form_redirect: resource_redirect_path(resource, action)}
+                )
+              end
+
             end
           end
         elsif template_present?(action)

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

@@ -46,9 +46,9 @@ module Effective
       end
     end
 
-    def resource_wizard_step_title(step)
+    def resource_wizard_step_title(resource, step)
       return if step == 'wicked_finish'
-      effective_resource.klass.const_get(:WIZARD_STEPS).fetch(step)
+      resource.wizard_step_title(step)
     end
 
     def resource_wizard_steps

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

@@ -8,7 +8,7 @@ module Effective
         self.resource ||= resource_scope.new
         EffectiveResources.authorize!(self, :new, resource)
 
-        redirect_to resource_wizard_path(:new, resource_wizard_steps.first)
+        redirect_to resource_wizard_path(:new, resource.first_uncompleted_step || resource_wizard_steps.first)
       end
 
       def show

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

@@ -49,7 +49,7 @@ module Effective
           Rails.logger.info "  Unable to visit step :#{step}. Last can_visit_step? is :#{next_step}. Change the acts_as_wizard model's can_visit_step?(step) function to change this."
         end
 
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(next_step)} step."
+        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(resource, next_step)} step."
         redirect_to wizard_path(next_step)
       end
 
@@ -66,7 +66,7 @@ module Effective
       # before_action :assign_page_title, only: [:show, :update]
       # Assign page title
       def assign_page_title
-        @page_title ||= resource_wizard_step_title(step)
+        @page_title ||= resource_wizard_step_title(resource, step)
       end
 
     end

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

@@ -9,7 +9,7 @@ module Effective
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
-          @skip_to ||= next_step
+          @skip_to ||= resource.required_steps.find { |s| s == next_step } || resource.first_uncompleted_step
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           redirect_to(@redirect_to || wizard_path(@skip_to))

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EffectiveActsAsEmailFormHelper
+
+  def email_form_fields(form, action = nil, skip: true, to: nil, variables: nil, partial: nil)
+    raise('expected a form') unless form.respond_to?(:object)
+
+    resource = form.object
+    raise('expected an acts_as_email_form resource') unless resource.class.respond_to?(:acts_as_email_form?)
+
+    # Load the template.
+    email_template = if action.present? && resource.email_form_effective_email_templates?
+      Effective::EmailTemplate.where(template_name: action).first!
+    end
+
+    # These defaults are only used when there is no email_template
+    email_defaults = form.object.email_form_defaults(action) unless email_template.present?
+
+    locals = {
+      form: form,
+      email_to: to,
+      email_skip: skip,
+      email_action: (action || true),
+      email_defaults: email_defaults,
+      email_template: email_template,
+      email_variables: variables
+    }
+
+    render(partial: (partial || 'effective/acts_as_email_form/fields'), locals: locals)
+  end
+
+end

data/app/helpers/effective_resources_helper.rb

@@ -116,7 +116,6 @@ module EffectiveResourcesHelper
     locals = {
       resource: resource,
       effective_resource: effective_resource,
-      formats: [:html],
       format_block: (block if block_given?),
       namespace: namespace,
       actions: actions,
@@ -133,7 +132,7 @@ module EffectiveResourcesHelper
         spacer_template: spacer_template
       )
     else
-      render(partial, locals)
+      render(partial: partial, formats: [:html], locals: locals)
     end
   end
 

data/app/helpers/effective_resources_wizard_helper.rb

@@ -20,7 +20,7 @@ module EffectiveResourcesWizardHelper
   def render_wizard_sidebar_item(resource, nav_step, index = nil)
     # From Controller
     current = (nav_step == step)
-    title = resource_wizard_step_title(nav_step)
+    title = resource_wizard_step_title(resource, nav_step)
 
     # From Model
     disabled = !resource.can_visit_step?(nav_step)

data/app/models/concerns/acts_as_email_form.rb

@@ -0,0 +1,74 @@
+# ActsAsEmailForm
+# Adds an email_form_skip, email_form_from, email_form_subject, email_form_body attr_accessors
+# And some helpful methods to render and validate a Email to Send form
+# That should work with or without effective_email_templates to send an email on a model
+
+module ActsAsEmailForm
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_email_form
+      include ::ActsAsEmailForm
+    end
+  end
+
+  included do
+    # Yes, we are submitting an email form
+    attr_accessor :email_form_action
+
+    # Skip sending the email entirely
+    attr_accessor :email_form_skip
+
+    # The email From / Subject / Body fields
+    attr_accessor :email_form_from
+    attr_accessor :email_form_subject
+    attr_accessor :email_form_body
+
+    effective_resource do
+      email_form_action      :string, permitted: true
+      email_form_skip        :boolean, permitted: true
+
+      email_form_from        :string, permitted: true
+      email_form_subject     :string, permitted: true
+      email_form_body        :text, permitted: true
+    end
+
+    with_options(if: -> { email_form_action.present? && !email_form_skip? }) do
+      validates :email_form_from, presence: true
+      validates :email_form_subject, presence: true
+      validates :email_form_body, presence: true
+
+      validate(unless: -> { email_form_from.blank? }) do
+        self.errors.add(:email_form_from, 'must be a valid email address') unless email_form_from.include?('@')
+      end
+    end
+
+    if defined?(EffectiveEmailTemplates)
+      validates :email_form_subject, liquid: true, if: -> { email_form_effective_email_templates? }
+      validates :email_form_body, liquid: true, if: -> { email_form_effective_email_templates? }
+    end
+
+    def email_form_params
+      { from: email_form_from, subject: email_form_subject, body: email_form_body }.compact
+    end
+
+    def email_form_skip?
+      EffectiveResources.truthy?(email_form_skip)
+    end
+
+    def email_form_effective_email_templates?
+      !!defined?(EffectiveEmailTemplates)
+    end
+
+    # Only considered when not using an effective email template
+    def email_form_defaults(action)
+      { from: nil, subject: nil, body: nil }
+    end
+
+  end
+
+  module ClassMethods
+    def acts_as_email_form?; true; end
+  end
+
+end

data/app/models/concerns/acts_as_wizard.rb

@@ -43,6 +43,7 @@ module ActsAsWizard
       wizard_steps[current_step.to_sym] ||= Time.zone.now
     end
 
+    # Use can_visit_step? required_steps and wizard_step_title(step) to control the wizard behaviour
     def can_visit_step?(step)
       can_revisit_completed_steps(step)
     end
@@ -52,6 +53,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def wizard_step_title(step)
+      self.class.const_get(:WIZARD_STEPS).fetch(step)
+    end
+
     def first_completed_step
       required_steps.find { |step| has_completed_step?(step) }
     end

data/app/models/effective/resources/init.rb

@@ -78,8 +78,20 @@ module Effective
         # acpa/admin/shirts
         (names.length).downto(1).each do |n|
           names.combination(n).to_a.each do |pieces|
-            klass_pieces = pieces.map { |piece| piece.classify } * '::'
-            klass = klass_pieces.safe_constantize
+            klass = begin
+              klass_pieces = pieces.map { |piece| piece.classify } * '::'
+              klass_pieces.safe_constantize
+            end
+
+            klass ||= if pieces.length > 1
+              klass_pieces = ([pieces.first.classify] + pieces[1..-1].map { |piece| piece.classify }) * '::'
+              klass_pieces.safe_constantize
+            end
+
+            klass ||= if pieces.length > 1
+              klass_pieces = ([pieces.first.classify.pluralize] + pieces[1..-1].map { |piece| piece.classify }) * '::'
+              klass_pieces.safe_constantize
+            end
 
             if klass.present? && klass.class != Module
               @namespaces ||= (names - pieces)

data/app/views/effective/acts_as_email_form/_fields.html.haml

@@ -0,0 +1,33 @@
+= form.hidden_field :email_form_action, value: email_action
+
+- if email_skip
+  = form.check_box :email_form_skip, label: 'Do not send email'
+
+= form.hide_if :email_form_skip, true do
+  - if email_to.present? && form.respond_to?(:static_field)
+    = form.static_field :email_form_to, label: 'To', value: (email_to.respond_to?(:email) ? email_to.email : email_to)
+
+  - if form.object.errors.present?
+    = form.text_field :email_form_from, label: 'From'
+    = form.text_field :email_form_subject, label: 'Subject'
+    = form.text_area :email_form_body, label: 'Body', rows: 10
+
+  - elsif email_template.present?
+    -# email_template is an Effective::EmailTemplate
+    = form.text_field :email_form_from, label: 'From', value: email_template.from
+    = form.text_field :email_form_subject, label: 'Subject', value: email_template.subject
+    = form.text_area :email_form_body, label: 'Body', value: email_template.body, rows: 10
+
+  - else
+    = form.text_field :email_form_from, label: 'From', value: (email_defaults[:from] || '')
+    = form.text_field :email_form_subject, label: 'Subject', value: (email_defaults[:subject] || '')
+    = form.text_area :email_form_body, label: 'Body', rows: 10, value: (email_defaults[:body] || '')
+
+  - if email_variables.present?
+    %p The available variables are:
+
+    %ul
+      - email_variables.each do |variable|
+        %li {{ #{variable} }}
+
+    %small.text-muted Only a developer can add additional variables

data/lib/effective_resources/engine.rb

@@ -23,6 +23,7 @@ module EffectiveResources
     initializer 'effective_resources.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsArchived::Base)
+        ActiveRecord::Base.extend(ActsAsEmailForm::Base)
         ActiveRecord::Base.extend(ActsAsTokened::Base)
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.13'.freeze
+  VERSION = '1.8.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.13
+  version: 1.8.18
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,10 +133,12 @@ files:
 - app/controllers/concerns/effective/wizard_controller/before_actions.rb
 - app/controllers/concerns/effective/wizard_controller/save.rb
 - app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb
+- app/helpers/effective_acts_as_email_form_helper.rb
 - app/helpers/effective_resources_helper.rb
 - app/helpers/effective_resources_private_helper.rb
 - app/helpers/effective_resources_wizard_helper.rb
 - app/models/concerns/acts_as_archived.rb
+- app/models/concerns/acts_as_email_form.rb
 - app/models/concerns/acts_as_slugged.rb
 - app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb
@@ -177,6 +179,7 @@ files:
 - app/views/application/show.html.haml
 - app/views/application/show.js.erb
 - app/views/application/update.js.erb
+- app/views/effective/acts_as_email_form/_fields.html.haml
 - app/views/effective/resource/_actions.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml
 - app/views/effective/resource/_actions_glyphicons.html.haml