effective_resources 2.24.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d92db06b508d630c29e392525580e558bc4fa5505358a04dcc371397ef0c6bc3
-  data.tar.gz: e808c12ee8b6e047409ec0c5fb4855db64abfe79f15b35769f324b0202ad97e8
+  metadata.gz: 3a0aa5a3bcbd09397c6cd7815465cdfe0882045fba170ced84f6dbf59732db87
+  data.tar.gz: 0f78f2cce168bbda0d6221d6f8ea41b143c080d97b52ad78c7193c659d1aafa7
 SHA512:
-  metadata.gz: 17830298a77d5f208d346b7a154da717c3670803d9868c803fa08f57f1fb37a0ebcab523a476970be3e90fbdc35fb3df2d4cf2508ddb5f48f7956d8767991b0a
-  data.tar.gz: c03f3f837d93e5c4ed6506f6110cdc737aa3643c1ec0fd88f93168d4dc7f06650253eb9daf09b55e3a949f1f8835926575e6fae98d8a36b55a0834c2569316c5
+  metadata.gz: 035ca01e53c2d094b2174048e9a1f27f01b64e9cf12539587ac94350402b4569562e3be33322eb44f23182a88d5eb2fa68df4d8ff491ad0b6cbc95f2d2da3c09
+  data.tar.gz: 1df2b4a3f3ba19cd4e3d2b1875cd1d58627f3ab181bdb8cf0ebf268fcec8ea8e161754ec7a1f91618dbecb71e6d8c94ee7f5163aa833444a1e616c8c066712cf

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

@@ -28,6 +28,10 @@ module Effective
           params[resource_name].to_unsafe_h
         end
 
+        to_assign ||= if params[effective_resource_name].present? && params[effective_resource_name].respond_to?(:to_unsafe_h)
+          params[effective_resource_name].to_unsafe_h
+        end
+
         to_assign ||= if params.present?
           params.to_unsafe_h.except(:controller, :action, :id, :duplicate_id)
         end

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

@@ -103,6 +103,10 @@ module Effective
       effective_resource.name
     end
 
+    def effective_resource_name # effective_notification
+      effective_resource.resource_name
+    end
+
     def resource_name_id
       (effective_resource.name + '_id').to_sym
     end

data/app/helpers/effective_resources_email_helper.rb

@@ -83,5 +83,20 @@ module EffectiveResourcesEmailHelper
     render(partial: (partial || 'effective/acts_as_email_notification/fields'), locals: locals)
   end
 
+  def email_message_html?(message)
+    message.parts.find { |part| part.content_type.start_with?('text/html') }.present?
+  end
+
+  def email_message_plain?(message)
+    message.parts.find { |part| part.content_type.start_with?('text/html') }.blank?
+  end
+
+  def email_message_body(message)
+    html_body = message.parts.find { |part| part.content_type.start_with?('text/html') }.try(:body).to_s
+    plain_body = message.parts.find { |part| part.content_type.start_with?('text/plain') }.try(:body).to_s
+    message_body = message.body.to_s
+
+    html_body.presence || plain_body.presence || message_body.presence
+  end
 
 end

data/app/models/concerns/acts_as_email_notification.rb

@@ -48,12 +48,33 @@ module ActsAsEmailNotification
     validate(if: -> { email_notification_plain? && body.present? }) do
       errors.add(:body, 'unexpected html tags found in body') if email_notification_body_html?
     end
+
+    validate(if: -> { email_notification_subject_template.present? }) do
+      if(invalid = email_notification_subject_variables - email_template_variables).present?
+        errors.add(:subject, "Invalid variable: #{invalid.to_sentence}")
+      end
+    end
+
+    validate(if: -> { email_notification_body_template.present? }) do
+      if(invalid = email_notification_body_variables - email_template_variables).present?
+        errors.add(:body, "Invalid variable: #{invalid.to_sentence}")
+      end
+    end
   end
 
   module ClassMethods
     def acts_as_email_notification?; true; end
   end
 
+  # To be overrided
+  def email_template
+    raise('to be implemented')
+  end
+
+  def email_template_variables
+    raise('to be implemented')
+  end
+
   def email_notification_params
     { from: from, cc: cc.presence, bcc: bcc.presence, subject: subject, body: body, content_type: content_type }
   end
@@ -74,9 +95,30 @@ module ActsAsEmailNotification
     body.present? && !(body.include?('</p>') || body.include?('</div>'))
   end
 
-  # To be overrided
-  def email_template
-    nil
+  def email_notification_body_template
+    Liquid::Template.parse(body) rescue nil
+  end
+
+  def email_notification_subject_template
+    Liquid::Template.parse(subject) rescue nil
+  end
+
+  def email_notification_body_variables
+    template = email_notification_body_template()
+    return unless template.present?
+
+    Liquid::ParseTreeVisitor.for(template.root).add_callback_for(Liquid::VariableLookup) do |node|
+      [node.name, *node.lookups].join('.')
+    end.visit.flatten.uniq.compact
+  end
+
+  def email_notification_subject_variables
+    template = email_notification_subject_template()
+    return unless template.present?
+
+    Liquid::ParseTreeVisitor.for(template.root).add_callback_for(Liquid::VariableLookup) do |node|
+      [node.name, *node.lookups].join('.')
+    end.visit.flatten.uniq.compact
   end
 
 end

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

@@ -5,6 +5,7 @@
 
 - uid = effective_bootstrap_unique_id
 - expanded = form.object.cc.present? || form.object.bcc.present?
+- mailer_subject_prefix_hint = EffectiveResources.mailer_subject_prefix_hint.to_s.strip.presence
 
 - if form.object.new_record? && form.object.errors.blank?
   .row
@@ -17,7 +18,7 @@
     = form.text_field :cc, label: 'CC', value: email_cc
     = form.text_field :bcc, label: 'BCC', value: email_bcc
 
-  = form.text_field :subject, label: 'Subject', value: email_subject
+  = form.text_field :subject, value: email_subject, hint: (mailer_subject_prefix_hint ? "The subject of your email. It will be automatically prefixed with: #{mailer_subject_prefix_hint}" : 'The subject of your email')
 
   - if email_content_type == 'text/html'
     = form.article_editor :body, label: 'Body', mode: :email, value: email_body
@@ -35,7 +36,7 @@
     = form.text_field :cc, label: 'CC'
     = form.text_field :bcc, label: 'BCC'
 
-  = form.text_field :subject, label: 'Subject'
+  = form.text_field :subject, hint: (mailer_subject_prefix_hint ? "The subject of your email. It will be automatically prefixed with: #{mailer_subject_prefix_hint}" : 'The subject of your email')
 
   - if email_content_type == 'text/html'
     = form.article_editor :body, label: 'Body', mode: :email
@@ -44,10 +45,9 @@
 
 - if email_variables.present?
   = card do
-    %p The available variables are:
+    %p You can use the following variables in the subject and body:
 
     %ul
       - email_variables.each do |variable|
         %li {{ #{variable} }}
 
-    %small.text-muted Please contact us to add additional variables

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.24.0'.freeze
+  VERSION = '2.25.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails