effective_resources 1.8.16 → 1.8.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a854fdf544ea77faf7d45b251f8161b54ef66685c71730d6b4bdef42298ac371
-  data.tar.gz: 22d0141d18a049ed853d2ba54197758e46817ffdf6704c1facee7850cad5bef6
+  metadata.gz: aedd54df5d6ebf911041fedaa519ab1f8fde409e6bed5fd9374e6b9460ef2506
+  data.tar.gz: bd179f5ee32166042cd5e0f011b40e5738b7a7ec3abca222ce778c4ac69e20cc
 SHA512:
-  metadata.gz: fa64174fb405b2499a303ed87d64b8e32aa4d7c48388875c811919526935679a4c98bfef973e0f41b2124257b5d9d46207e906f85776d5eb5c0bf487ee086179
-  data.tar.gz: e00c2e31e5430de0a3e19d2f0d607fa73426edbbe8f7d31c0936f60a418a4bf92206fef2d904d2ba78dab1bfffc132235056ad138ede924642cabdeffd8a6408
+  metadata.gz: 97a13796ce565f1b05891c1b92382eaaaa8677846d60add08dd23cdc2577b883bfc285b2b8f6b3d64fb39fff1fd3acd36143f476375d08bd1740f1d1003b62d3
+  data.tar.gz: af4e9d7d6332731e7d5f6d7c6a0e17ec0c0d07aecff8d000e41ac9446b27b013c60fd218dcca846d06bf1f15bc3463b694f6e61c5b8784e10eb8c2d1efeab35d

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

@@ -125,8 +125,10 @@ module Effective
     end
 
     def resource_layout
-      namespace = controller_path.include?('admin/') ? 'admin' : 'application'
-      defined?(Tenant) ? "#{Tenant.current}/#{namespace}" : namespace
+      if defined?(Tenant)
+        namespace = controller_path.include?('admin/') ? 'admin' : 'application'
+        "#{Tenant.current}/#{namespace}"
+      end
     end
 
     def resource_params_method_name

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

@@ -41,7 +41,7 @@ module Effective
 
       messages = resource.errors.map do |error|
         attribute = error.respond_to?(:attribute) ? error.attribute : error
-        message = error.respond_to?(:message) ? error.message : resource.errors[attribute].to_sentence
+        message = error.respond_to?(:attribute) ? error.message : resource.errors[attribute].to_sentence
 
         if message[0] == message[0].upcase # If the error begins with a capital letter
           message

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

@@ -65,6 +65,8 @@ module EffectiveDeviseUser
   end
 
   module ClassMethods
+    def effective_devise_user?; true; end
+
     def permitted_sign_up_params # Should contain all fields as per views/users/_sign_up_fields
       raise('please define a self.permitted_sign_up_params')
       [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]

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

@@ -46,4 +46,22 @@ module EffectiveResources
     (config.respond_to?(:active_job) && config.active_job.queue_adapter) ? :deliver_later : :deliver_now
   end
 
+  def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
+    raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
+
+    business_days.times do
+      loop do
+        date = date + 1.day
+        break if business_day?(date, holidays: holidays)
+      end
+    end
+
+    date
+  end
+
+  def self.business_day?(date, holidays: [:ca, :observed])
+    require 'holidays' unless defined?(Holidays)
+    date.wday != 0 && date.wday != 6 && Holidays.on(date, *holidays).blank?
+  end
+
 end

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.16'.freeze
+  VERSION = '1.8.21'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.16
+  version: 1.8.21
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: holidays
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Make any controller an effective resource controller.
 email:
 - info@codeandeffect.com
@@ -133,10 +147,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 +193,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