dcidev_mailer 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a56a9c54429232d7fd7d01cc3f657534537ca554886d5d77aa30c8f7ae93567
-  data.tar.gz: 7404b2af018fe76212836484eb364b42ec5375c84d4f9a00844ae20ad2201c62
+  metadata.gz: 3f3f6f2bc44b3d45a845f89bc2922dfb527a8a3fd98156b444a46fb1920ef355
+  data.tar.gz: e395df17cc4a719004e7d58b513aaa8d534032c335b82e34054380c08fa427be
 SHA512:
-  metadata.gz: db523c536b6164e8830f4de07d94ccb00d27c8fa6341748747830dcb45e2d7a1e147a3226837457da585c2942caeea818ee39e25bd2d5623ce53d2947bc6fdbc
-  data.tar.gz: 85ac24510c11d94287baffe97b5a728badfb9ab8040297908a03061fc42c9db209cd04e8ee3c62391c6e7ff83bf11ff1db2123b7577b7099f27dc1584814f499
+  metadata.gz: 26926484cb0021436d5a9f9d74a9927d3220f6bdea7438c9d6ba99ea104c21290fde491c60af8f413772e01df74e79cc12f6e8fa3c54d3879a7716caa9be83fd
+  data.tar.gz: f82ebb6124f7425de9fc3b2b6bd8e09122f8514b3137dfb7e23ce31dfecf48e99c5e6dd5284f08aead7157ce8e0fce736b7445e9743c57589fe6377e16ab04a0

data/README.md

@@ -30,7 +30,7 @@ Add this to `config/initializer/mailer.rb`
 ActionMailer::Base.delivery_method = :smtp
 
 # change it to your helper class name
-ActionMailer::Base.add_delivery_method: mandrill_mailer, MandrillMailer
+ActionMailer::Base.add_delivery_method :mandrill_mailer, MandrillMailer
 
 # uncomment if neccessary
 smtp_settings = {
@@ -63,9 +63,9 @@ ActionMailer::Base.raise_delivery_errors = true
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.perform_caching = false
 
-MandrillMailer.configure do |config |
+MandrillMailer.configure do |config|
     config.api_key = ENV["MANDRILL_SMTP_PASSWORD"]
-    config.deliver_later_queue_name =: default
+    config.deliver_later_queue_name :default
 end
 ```
  
@@ -82,25 +82,61 @@ class MandrillMailer
   class << self
     def send_email(customer: nil, email_template: nil, attachments: nil, description: nil)
         raise "invalid customer"if customer.nil?
-        raise "invalid template" if email_template.nil ?
+        raise "invalid template" if email_template.nil?
         begin
             response = ::DcidevMailer::Mandrill.send_email(
                 subject: email_template.subject,
                 html_body: MailerHelper.format_wording(email_template.wording, customer),
-                header_url: email_template.header.try(: url),
-                footer_url: email_template.footer.try(: url),
-                to: customer.email,
+                header_url: email_template.header.try(:url),
+                footer_url: email_template.footer.try(:url),
+                # to: customer.email / can also accept string
+                to: [{name: "Punto Damar P", type: "to", email: "punto@privyid.tech"}],
                 cc: nil, # can be a string / array
                 bcc: nil, # can be a string / array
                 from: ENV['DEFAULT_EMAIL_SENDER'],
+                from_name: ENV['DEFAULT_EMAIL_SENDER_NAME'],
                 attachments: attachments,
                 email_template_path: "mail/blast.html.erb"
                 # specify template file location
             )
         rescue => e
-            error_message = "[SEND EMAIL] " + e.try(: to_s)
+            error_message = "[SEND EMAIL] " + e.try(:to_s)
         ensure
-             EmailHistory.create(application: customer.application, template: email_template, status: response[0]["status"] == "sent" ? : sent:: failed, mail_provider_id: response[0]["_id"], form_cetak_attachment: attachments.present ? , error_message : response[0]["reject_reason"]) if response.present ?
+             EmailHistory.create(application: customer.application, template: email_template, status: response[0]["status"] == "sent" ? :sent : :failed, mail_provider_id: response[0]["_id"], form_cetak_attachment: attachments.present?, error_message: response[0]["reject_reason"]) if response.present?
+             ApplicationHistory.log(description: error_message || description, application: customer.application)
+      end
+  end 
+end
+```
+
+
+### Mandrill Template Example
+```ruby
+require 'dcidev_mailer/mandrill_template'
+
+class MandrillMailer
+  class << self
+    def send_email(customer: nil, email_template: nil, attachments: nil, description: nil)
+        raise "invalid customer"if customer.nil?
+        raise "invalid template" if email_template.nil?
+        begin
+            response = ::DcidevMailer::MandrillTemplate.send_email(
+                subject: email_template.subject,
+                header_url: email_template.header.try(:url),
+                footer_url: email_template.footer.try(:url),
+                template_name: 'customer blast',
+                to: [{name: "Punto Damar P", type: "to", email: "punto@privyid.tech"}],
+                vars: {customer_name: "Punto Damar P", bank_name: "Bang Jago"}, # template variable name configurable from mandrill dashboard
+                cc: nil, # can be a string / array
+                bcc: nil, # can be a string / array
+                from: ENV['DEFAULT_EMAIL_SENDER'],
+                from_name: ENV['DEFAULT_EMAIL_SENDER_NAME'],
+                attachments: attachments,
+            )
+        rescue => e
+            error_message = "[SEND EMAIL] " + e.try(:to_s)
+        ensure
+             EmailHistory.create(application: customer.application, template: email_template, status: response[0]["status"] == "sent" ? :sent : :failed, mail_provider_id: response[0]["_id"], form_cetak_attachment: attachments.present? , error_message : response[0]["reject_reason"]) if response.present?
              ApplicationHistory.log(description: error_message || description, application: customer.application)
       end
   end 
@@ -133,7 +169,7 @@ class MortgageMailer
                     subject: template.subject,  
                     from: ENV['DEFAULT_EMAIL_SENDER'],  
                     template_path: "mail/blast.html.erb"  # specify template file location
-                ).deliver_now  
+                ).deliver_now!  
             rescue => e  
                 error_message = "[SEND EMAIL] " + e.try(:to_s)  
             ensure  

data/lib/dcidev_mailer/mandrill.rb

@@ -5,19 +5,20 @@ module DcidevMailer
         default from: ENV['DEFAULT_EMAIL_SENDER']
 
         class << self
-            def send_email(subject: '', html_body: '', to: nil, cc: nil, bcc: nil, from: nil, attachments: nil, email_template_path: '', header_url: '', footer_url: '')
+            def send_email(subject: '', html_body: '', to: nil, cc: nil, bcc: nil, from: nil, from_name: nil, attachments: nil, email_template_path: '', header_url: '', footer_url: '')
                 ac = ActionController::Base.new
                 wording, images = DcidevMailer.format_image_from_html(html_body)
                 locals = { wording: wording, header: nil, footer: nil }
                 locals, images = DcidevMailer.format_header_footer(header_url: header_url, footer_url: footer_url, locals: locals, images: images) if header_url.present? && footer_url.present?
                 html_body = ac.render_to_string(template: email_template_path, locals: locals)
                 attachments = DcidevMailer.format_attachments(attachments) if attachments.present?
-                self.send_mail(subject, to, cc, bcc, html_body, attachments, images, from).deliver_now
+                self.send_mail(subject, to, cc, bcc, html_body, attachments, images, from, from_name).deliver_now
             end
 
-            def send_mail(subject, to, cc, bcc, html, attachments = nil, images = nil, from = nil)
+            def send_mail(subject, to, cc, bcc, html, attachments = nil, images = nil, from = nil, from_name = nil)
                 mandrill_mail subject: subject,
                               from: from,
+                              from_name: from_name,
                               # to: "dev.puntodamar@gmail.com",
                               to: to,
                               cc: cc,

data/lib/dcidev_mailer/mandrill_template.rb

@@ -0,0 +1,31 @@
+require 'mandrill'
+
+module DcidevMailer
+    class MandrillTemplate < MandrillMailer::TemplateMailer
+        default from: ENV['DEFAULT_EMAIL_SENDER']
+
+        class << self
+            def send_email(subject: '', to: nil, cc: nil, bcc: nil, from: nil, from_name: nil, attachments: nil, vars: nil, template_name: nil, images: nil)
+                raise DcidevMailer::Errors::InvalidTemplate unless template_name.present?
+                images = DcidevMailer.format_images(images) if images.present?
+                attachments = DcidevMailer.format_attachments(attachments) if attachments.present?
+                self.send_mail(subject, to, cc, bcc, attachments, images, from, from_name, template_name, vars).deliver_now
+            end
+
+            def send_mail(subject, to, cc, bcc, attachments = nil, images = nil, from = nil, from_name = nil, template_name = nil, vars = nil)
+                mandrill_mail subject: subject,
+                              from: from,
+                              from_name: from_name,
+                              to: to,
+                              cc: cc,
+                              bcc: bcc,
+                              important: true,
+                              inline_css: true,
+                              attachments: attachments,
+                              images: images,
+                              template_name: template_name,
+                              vars: vars
+            end
+        end
+    end
+end

data/lib/dcidev_mailer/rails_mailer.rb

@@ -5,6 +5,7 @@ require 'mail'
 require 'dcidev_mailer/errors/invalid_recipients'
 require 'dcidev_mailer/errors/invalid_body'
 require 'dcidev_mailer/errors/invalid_template'
+
 module DcidevMailer
   class RailsMailer < ActionMailer::Base
 
@@ -15,7 +16,7 @@ module DcidevMailer
       wording, images = DcidevMailer.format_image_from_html(html_body)
 
       locals = { wording: wording, header: nil, footer: nil }
-      locals, images = DcidevMailer.format_header_footer(header_url: header_url, footer_url: footer_url, locals: locals, images: images) if header_url.present? && footer_url.present?
+      locals, _ = DcidevMailer.format_header_footer(header_url: header_url, footer_url: footer_url, locals: locals, images: images) if header_url.present? || footer_url.present?
       
       file_attachments = DcidevMailer.format_attachments(file_attachments) if file_attachments.present?
       if file_attachments.present?
@@ -24,8 +25,23 @@ module DcidevMailer
         end
       end
 
-      attachments.inline['header'] = File.read(DcidevUtility.download_to_file(header_url)) rescue nil if header_url.present?
-      attachments.inline['footer'] = File.read(DcidevUtility.download_to_file(footer_url)) rescue nil if footer_url.present?
+      begin
+        header_file = File.read(DcidevUtility.download_to_file(header_url))
+        header_mime = MimeMagic.by_magic(header_file)
+        attachments.inline['header'] = header_file
+        attachments.inline['header']['content-type'] = header_mime
+        attachments.inline['header']['content-id'] = '<header>'
+      rescue => _
+      end
+
+      begin
+        footer_file = File.read(DcidevUtility.download_to_file(footer_url))
+        footer_mime = MimeMagic.by_magic(footer_file)
+        attachments.inline['footer'] = footer_file
+        attachments.inline['footer']['content-type'] = footer_mime
+        attachments.inline['footer']['content-id'] = '<footer>'
+      rescue => _
+      end
 
       mail(
         to: to,
@@ -43,38 +59,5 @@ module DcidevMailer
         }
       end
     end
-
-
-    # def self.method_missing(method_name, html_body: "", header_url: "", footer_url: "", file_attachments: nil, to: nil, cc: nil, bcc: nil, from: nil, subject: "")
-    #   raise DcidevMailer::Errors::InvalidRecipients unless to.present?
-    #   raise DcidevMailer::Errors::InvalidBody unless html_body.present? && html_body.is_a?(String)
-    #   wording, images = DcidevMailer.format_image_from_html(html_body)
-    #
-    #   locals = { wording: wording, header: nil, footer: nil }
-    #   locals, images = DcidevMailer.format_header_footer(header_url: header_url, footer_url: footer_url, locals: locals, images: images) if header_url.present? && footer_url.present?
-    #
-    #   if file_attachments.present?
-    #     file_attachments.each do |a|
-    #       am.attachments[a[:name].to_s] = a[:content] unless a[:content].nil?
-    #     end
-    #   end
-    #
-    #   attachments.inline['header'] = File.read(Utility.download_to_file(header_url)) rescue nil if header_url.present?
-    #   attachments.inline['footer'] = File.read(Utility.download_to_file(footer_url)) rescue nil if footer_url.present?
-    #
-    #   mail(
-    #     to: to,
-    #     cc: cc,
-    #     bcc: bcc,
-    #     subject: subject,
-    #     format: "text/html",
-    #     from: from,
-    #   ) do |format|
-    #     format.html {
-    #       render locals: locals
-    #     }
-    #   end
-    # end
-
   end
 end

data/lib/dcidev_mailer.rb

@@ -1,52 +1,61 @@
 module DcidevMailer
-  class << self
-    def format_image_from_html(html)
-
-      images = []
-      body_html = Nokogiri::HTML(html)
-      temp = body_html
-      if ENV["USE_MANDRILL_MAILER"].to_i == 1
-        temp.search("img").each_with_index do |img, i|
-          cid = "body_image_#{i}"
-          images.push({content: nil, encoded_content: DcidevUtility.base64_encoded_string(img["src"]), type: DcidevUtility.base64_extension(img["src"]), name: cid})
-          body_html.search("img")[i]["src"] = 'cid:' + cid
+    class << self
+        def format_image_from_html(html)
+            
+            images = []
+            body_html = Nokogiri::HTML(html)
+            temp = body_html
+            if ENV["USE_MANDRILL_MAILER"].to_i == 1
+                temp.search("img").each_with_index do |img, i|
+                    cid = "body_image_#{i}"
+                    images.push({ content: nil, encoded_content: DcidevUtility.base64_encoded_string(img["src"]), type: DcidevUtility.base64_extension(img["src"]), name: cid })
+                    body_html.search("img")[i]["src"] = 'cid:' + cid
+                end
+            end
+            [body_html.search("body")[0].children.to_html, images]
         end
-      end
-      [body_html.search("body")[0].children.to_html, images]
-    end
-
-    def format_attachments(attachments)
-      formatted = []
-      attachments.each do |a|
-        filetype = MimeMagic.by_magic(a[:file]).type.to_s
-        content = a[:file].read
-        name = "#{a[:filename]}.#{filetype.split("/")[1]}"
-        att = {
-          content: content,
-          name: name,
-        }
-
-        att[:type] = filetype if ENV["USE_MANDRILL_MAILER"].to_i == 0
-        formatted << att
-      end
-      formatted
-    end
-
-    def format_header_footer(header_url: "", footer_url: "", locals: {}, images: {})
-      [{name: "header", url: header_url}, {name: "footer", url: footer_url}].each do |i|
-        return if i[:url].nil?
-        begin
-          extension, encoded, _ = DcidevUtility.file_url_to_base64(i[:url])
-          locals[i[:name].to_sym] = "cid:#{i[:name]}"
-          images.push({content: encoded, encoded_content: encoded, type: extension, name: i[:name]})
-        rescue => _
-
+        
+        def format_images(images)
+            formatted = []
+            images.each do |i|
+                base64 = Base64.encode64(i[:image])
+                formatted << {encoded_content: DcidevUtility.base64_encoded_string(base64), type: DcidevUtility.base64_extension(base64), name: i[:name]}
+            end
+            return formatted
+        end
+        
+        def format_attachments(attachments)
+            formatted = []
+            attachments.each do |a|
+                filetype = MimeMagic.by_magic(a[:file]).type.to_s
+                content = a[:file].read
+                name = "#{a[:filename]}.#{filetype.split("/")[1]}"
+                att = {
+                    content: content,
+                    name: name,
+                }
+                
+                att[:type] = filetype if ENV["USE_MANDRILL_MAILER"].to_i == 0
+                formatted << att
+            end
+            formatted
         end
-      end
-      return [locals, images]
+        
+        def format_header_footer(header_url: "", footer_url: "", locals: {}, images: {})
+            [{ name: "header", url: header_url }, { name: "footer", url: footer_url }].each do |i|
+                return if i[:url].nil?
+                begin
+                    extension, encoded, _ = DcidevUtility.file_url_to_base64(i[:url])
+                    locals[i[:name].to_sym] = "cid:#{i[:name]}"
+                    images.push({ content: encoded, encoded_content: encoded, type: extension, name: i[:name] })
+                rescue => _
+                
+                end
+            end
+            return [locals, images]
+        end
+    
     end
 
-  end
-
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Punto Damar P
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mimemagic
@@ -51,11 +51,12 @@ files:
 - lib/dcidev_mailer/errors/invalid_recipients.rb
 - lib/dcidev_mailer/errors/invalid_template.rb
 - lib/dcidev_mailer/mandrill.rb
+- lib/dcidev_mailer/mandrill_template.rb
 - lib/dcidev_mailer/rails_mailer.rb
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -70,8 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Commonly used email codes
 test_files: []