mailpy 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4abed45c631030cc0ce9c3dfbc1e411766c62c53ba16dbec1008204339009eff
-  data.tar.gz: 53f6daf94bbc49ec9bd2575ecbd8ed92e42e9f8312c30dda3aab2dbe6b813287
+  metadata.gz: 1107fdfa3e34f5a7f3facf3ec3c500fe235bf9df7fca0dcdfa0c736c80daa138
+  data.tar.gz: 1e487dead8d9daa50dfde103094cc2e1423e2a62fa7ee2d2d57c87f2bef32ba1
 SHA512:
-  metadata.gz: 1bcd790724d95a2629436f415d3a8e24b45513a6a164db9c9f593c2392e1bd614a28722be6d1d1f2c260d5f463abf2a94c250c0e6ae6eb9b124a75dbe3b308c2
-  data.tar.gz: 452893b081f16ea81ff9c00c06ca3f2993f3d411ee3bb5058144bd63caf46d3437b43b36fce98cabb5f33e5ab444dcccd45bde1215754463f308b4e15b22225e
+  metadata.gz: e328e35fe23943fcd35eabbfda65754228e61f1a027bfc197d9c9826919d022dac1018cc63bce095872278e2d094f2092270f33c3847dbcb8af3bc4b4124cba5
+  data.tar.gz: 4a70ed84ef95657f698abc9100aa2b3ed816ac230f985ea91dc5c0c8df92696ce47521dfc2a7541cdb6320bfe136b2650a24099673415cc1463d23b94d2d5609

data/README.md

@@ -1,5 +1,5 @@
 # Mailpy
-Action Mailer Adapter for Send Email Through HTTP APIs.
+Action Mailer Adapter for Sending Email Through HTTP APIs. Mailpy will automatically switch to SMTP method in case your mailer server encounter any problem.
 
 ## Usage
 How to use my plugin.
@@ -15,9 +15,23 @@ Add configuration to your application environments. development.rb, staging.rb,
 
 ```ruby
 config.action_mailer.delivery_method = :mailpy
+config.action_mailer.perform_deliveries = true
+config.action_mailer.raise_delivery_errors = true
 config.action_mailer.mailpy_settings = {
 	endpoint: ENV['MAILER_API_ENDPOINT'],
-	token: ENV['MAILER_API_KEY_OR_AUTH_TOKEN']
+	headers: {
+	  Authorization: ENV['MAILER_API_KEY_OR_AUTH_TOKEN']
+	}
+}
+config.action_mailer.smtp_settings = {
+	address: ENV['SMTP_ADDRESS'],
+	port: ENV['SMTP_PORT'],
+	domain: ENV['SMTP_DOMAIN'],
+	authentication: ENV['SMTP_AUTHENTICATION_METHOD'],
+	user_name: ENV['SMTP_USERNAME'],
+	password: ENV['SMTP_PASSWORD'],
+	enable_starttls_auto: true,
+	openssl_verify_mode: 'none'
 }
 ```
 

data/lib/mailpy.rb

@@ -1,8 +1,11 @@
 require "mailpy/railtie"
 require "mailpy/mailer_api"
+require "mailpy/smtp_api"
 
 module Mailpy
   class DeliveryMethod
+    MailpyDeliveryError = Class.new(StandardError)
+    
     attr_accessor :settings
 
     def initialize(params)
@@ -10,20 +13,21 @@ module Mailpy
     end
 
     def deliver!(mail)
-      MailerApi.new(mail_options(mail), mail.body.to_s).send
+      perform_send_request(mail, settings)
     end
 
     private
-      def mail_options(mail)
-        {
-          to: mail.to.try(:join, ', '),
-          cc: mail.cc.try(:join, ', '),
-          bcc: mail.bcc.try(:join, ', '),
-          sender: mail.from.try(:join, ', '),
-          subject: mail.subject,
-          endpoint: settings[:endpoint],
-          token: settings[:token]
-        }
+    def perform_send_request(mail, settings)
+      begin
+        result = MailerApi.new(mail, settings).send
+        raise(MailpyDeliveryError, JSON.parse(result.body)['message']) unless result.code === 200
+        result
+      rescue Errno::ECONNREFUSED
+        smtp_settings = Rails.application.config.action_mailer.smtp_settings
+        raise(MailpyDeliveryError, "SMTP miss configured. Please add SMTP configuration in your environment config") if smtp_settings.blank?
+        result = SMTPApi.new(mail, smtp_settings).send
+        result
       end
+    end
   end
 end

data/lib/mailpy/mailer_api.rb

@@ -1,34 +1,45 @@
 require 'httparty'
 
 class MailerApi
-  attr_reader :options, :message
-
-  def initialize(options, message)
+  def initialize(mail, options = {})
+    @mail = mail
     @options = options
-    @message = message
   end
 
   def send
-    send_email
+    result = HTTParty.post(
+      options[:endpoint],
+      body: form_data,
+      headers: headers
+    )
   end
 
   private
-  def send_email
-    result = HTTParty.post(
-      options[:endpoint],
-      body: {
-        sender_email: options[:sender], 
-        recipient_email: options[:to], 
-        cc_email: options[:cc],
-		    bcc_email: options[:bcc], 
-        subject_email: options[:subject], 
-        message_email: message
-      }.to_json,
-      
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': options[:token].to_s
+    attr_reader :mail, :options
+
+    def form_data
+      {
+        to: mail.to.try(:join, ', '),
+        cc: mail.cc.try(:join, ', '),
+        bcc: mail.bcc.try(:join, ', '),
+        from: mail.from.try(:join, ', '),
+        subject: mail.subject,
+        body: body_data,
+        attachment: attachment_data
       }
-    )    
-  end
+    end
+
+    def body_data
+      mail.body.parts.present? ? mail.body.parts[0].body.to_s : mail.body.to_s
+    end
+
+    def attachment_data
+      attachments = {}
+      mail.attachments.each { |attachment| attachments[attachment.filename] = attachment.body }
+      attachments
+    end
+
+    def headers
+      options[:headers]
+    end
 end

data/lib/mailpy/smtp_api.rb

@@ -0,0 +1,14 @@
+class SMTPApi < ActionMailer::Base
+  def initialize(mail, options = {})
+    @mail = mail
+    @options = options
+  end
+
+  def send
+		mail.delivery_method :smtp, options
+    mail.deliver!
+  end
+
+  private
+    attr_reader :mail, :options
+end

data/lib/mailpy/version.rb

@@ -1,3 +1,3 @@
 module Mailpy
-  VERSION = '0.1.3'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailpy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Nasrul Gunawan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Action Mailer Adapter for Send Email Through HTTP APIs.
+description: Action Mailer Adapter for sending email through HTTP APIs.
 email:
 - nasrul.remaza@gmail.com
 executables: []
@@ -51,6 +51,7 @@ files:
 - lib/mailpy.rb
 - lib/mailpy/mailer_api.rb
 - lib/mailpy/railtie.rb
+- lib/mailpy/smtp_api.rb
 - lib/mailpy/version.rb
 homepage: https://github.com/nasrulgunawan/mailpy
 licenses:
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Summary of Mailpy.