emailbutler 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f2148f4793cad24e9b23a458dc30a5501bb9bc18dd33690876bb5063a58f6b
-  data.tar.gz: 9fa0ddc6da65ba27422abe993f1ab767f0cfb347925a89a4ebfe77b392d9bc65
+  metadata.gz: 0bd13652cc6d27528cda94c0245808f10ac00a71b903a59a85bf1b5f703d540e
+  data.tar.gz: d1e3a64b3b54906385f69231a2e4ecbc2eb417b06226d43954686e06dc55ccae
 SHA512:
-  metadata.gz: 9356fdca863bdd820bdca2526e3f2b90e09dee401bf0a499664ee9eecca8766ba6e8e415228965732cc0b8db192d0669a81b86b8165abfc8c09fb3733e52ccc5
-  data.tar.gz: e3135c5e199dd2e55804825ffb194d9de3de118bd898eab10040e84cef889b93ff72cbdacc2c72d79550629d4b20b16416bed5d40ee26f08e239191245791fa2
+  metadata.gz: aff55f8d47be9a08766807f4e83ada5e7ae11bb8dc8eedbf0940613222aa768c2ae2ebe6c9af6697fff543e0da256f66eb529c2cd0249981ea51a3bea5f69d36
+  data.tar.gz: 2e012d481612783002bf5f8800b0fbfb2ba8c5366f3867d73fa1aeb19cae687367718ef25db3aa7aad268b5d86560f55c406be64a5e0d3915b261236191375ca

data/README.md

@@ -36,7 +36,7 @@ require 'emailbutler/adapters/active_record'
 
 Emailbutler.configure do |config|
   config.adapter = Emailbutler::Adapters::ActiveRecord.new # required
-  config.providers = %w[sendgrid smtp2go resend mailjet] # optional
+  config.providers = %w[sendgrid smtp2go resend mailjet mailtrap mandrill] # optional
   config.ui_username = 'username' # optional
   config.ui_password = 'password' # optional
   config.ui_secured_environments = ['production'] # optional

data/app/controllers/emailbutler/webhooks_controller.rb

@@ -26,6 +26,8 @@ module Emailbutler
       when 'smtp2go' then Emailbutler::Container.resolve(:smtp2go_mapper)
       when 'resend' then Emailbutler::Container.resolve(:resend_mapper)
       when 'mailjet' then Emailbutler::Container.resolve(:mailjet_mapper)
+      when 'mailtrap' then Emailbutler::Container.resolve(:mailtrap_mapper)
+      when 'mandrill' then Emailbutler::Container.resolve(:mandrill_mapper)
       end
     end
 
@@ -35,6 +37,8 @@ module Emailbutler
       when 'smtp2go' then smtp2go_params
       when 'resend' then resend_params
       when 'mailjet' then mailjet_params
+      when 'mailtrap' then mailtrap_params
+      when 'mandrill' then mandrill_params
       end
     end
 
@@ -53,5 +57,13 @@ module Emailbutler
     def mailjet_params
       params.permit('event', 'time', 'Message_GUID')
     end
+
+    def mailtrap_params
+      params.permit('events' => %w[event timestamp message_id])
+    end
+
+    def mandrill_params
+      params.permit('mandrill_events' => %w[event ts _id])
+    end
   end
 end

data/lib/emailbutler/configuration.rb

@@ -7,7 +7,7 @@ module Emailbutler
     AVAILABLE_ADAPTERS = %w[
       Emailbutler::Adapters::ActiveRecord
     ].freeze
-    AVAILABLE_PROVIDERS = %w[sendgrid smtp2go resend mailjet].freeze
+    AVAILABLE_PROVIDERS = %w[sendgrid smtp2go resend mailjet mailtrap mandrill].freeze
 
     attr_accessor :adapter, :providers, :ui_username, :ui_password, :ui_secured_environments
 
@@ -16,8 +16,8 @@ module Emailbutler
       @providers = []
 
       # It's required to specify these 3 variables to enable basic auth to UI
-      @ui_username = nil
-      @ui_password = nil
+      @ui_username = ''
+      @ui_password = ''
       # Secured environments variable must directly contains environment names
       @ui_secured_environments = []
     end
@@ -25,9 +25,9 @@ module Emailbutler
     def validate
       validate_adapter
       validate_providers
+      validate_secured_environments
       validate_username
       validate_password
-      validate_secured_environments
     end
 
     private
@@ -45,22 +45,22 @@ module Emailbutler
       raise InitializeError, 'Providers list contain invalid element'
     end
 
+    def validate_secured_environments
+      raise InitializeError, 'Environments list must be array' unless ui_secured_environments.is_a?(Array)
+    end
+
     def validate_username
-      return if ui_username.blank?
-      return if ui_username.is_a?(String)
+      return if ui_secured_environments.blank? && ui_username.is_a?(String)
+      return if ui_secured_environments.any? && ui_username.is_a?(String) && ui_username.present?
 
-      raise InitializeError, 'Username must be nil or filled string'
+      raise InitializeError, 'Username must be string'
     end
 
     def validate_password
-      return if ui_password.blank?
-      return if ui_password.is_a?(String)
-
-      raise InitializeError, 'Password must be nil or filled string'
-    end
+      return if ui_secured_environments.blank? && ui_password.is_a?(String)
+      return if ui_secured_environments.any? && ui_password.is_a?(String) && ui_password.present?
 
-    def validate_secured_environments
-      raise InitializeError, 'Environments list must be array' unless ui_secured_environments.is_a?(Array)
+      raise InitializeError, 'Password must be string'
     end
   end
 end

data/lib/emailbutler/container.rb

@@ -5,6 +5,8 @@ require 'emailbutler/webhooks/mappers/sendgrid'
 require 'emailbutler/webhooks/mappers/smtp2go'
 require 'emailbutler/webhooks/mappers/resend'
 require 'emailbutler/webhooks/mappers/mailjet'
+require 'emailbutler/webhooks/mappers/mailtrap'
+require 'emailbutler/webhooks/mappers/mandrill'
 require 'emailbutler/webhooks/receiver'
 
 module Emailbutler
@@ -24,6 +26,8 @@ module Emailbutler
     register(:smtp2go_mapper) { Emailbutler::Webhooks::Mappers::Smtp2Go.new }
     register(:resend_mapper) { Emailbutler::Webhooks::Mappers::Resend.new }
     register(:mailjet_mapper) { Emailbutler::Webhooks::Mappers::Mailjet.new }
+    register(:mailtrap_mapper) { Emailbutler::Webhooks::Mappers::Mailtrap.new }
+    register(:mandrill_mapper) { Emailbutler::Webhooks::Mappers::Mandrill.new }
 
     # webhook receiver
     register(:webhooks_receiver) { Emailbutler::Webhooks::Receiver.new }

data/lib/emailbutler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emailbutler
-  VERSION = '0.8.4'
+  VERSION = '0.8.6'
 end

data/lib/emailbutler/webhooks/mappers/mailjet.rb

@@ -7,19 +7,15 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'sent' => 'processed',
           'open' => 'delivered',
-          'click' => 'delivered',
-          'unsub' => 'failed',
-          'blocked' => 'failed',
-          'bounce' => 'failed',
-          'spam' => 'failed'
+          'click' => 'delivered'
         }.freeze
 
         def call(payload:)
           payload.stringify_keys!
           # message-id contains data like <uuid>
           message_uuid = payload['Message_GUID']
-          status = DELIVERABILITY_MAPPER[payload['event']]
-          return [] if message_uuid.nil? || status.nil?
+          status = DELIVERABILITY_MAPPER[payload['event']] || Emailbutler::Message::FAILED
+          return [] if message_uuid.nil?
 
           [
             {

data/lib/emailbutler/webhooks/mappers/mailtrap.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Emailbutler
+  module Webhooks
+    module Mappers
+      class Mailtrap
+        DELIVERABILITY_MAPPER = {
+          'delivery' => 'delivered',
+          'open' => 'delivered',
+          'click' => 'delivered'
+        }.freeze
+
+        def call(payload:)
+          payload['events'].filter_map { |message|
+            message.stringify_keys!
+            message_uuid = message['message_id']
+            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
+            next if message_uuid.nil?
+
+            {
+              message_uuid: message_uuid,
+              status: status,
+              timestamp: message['timestamp'] ? Time.at(message['timestamp']).utc.to_datetime : nil
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/emailbutler/webhooks/mappers/mandrill.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Emailbutler
+  module Webhooks
+    module Mappers
+      class Mandrill
+        DELIVERABILITY_MAPPER = {
+          'send' => 'processed',
+          'open' => 'delivered',
+          'click' => 'delivered'
+        }.freeze
+
+        def call(payload:)
+          payload['mandrill_events'].filter_map { |message|
+            message.stringify_keys!
+            message_uuid = message['_id']
+            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
+            next if message_uuid.nil?
+
+            {
+              message_uuid: message_uuid,
+              status: status,
+              timestamp: message['ts'] ? Time.at(message['ts']).utc.to_datetime : nil
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/emailbutler/webhooks/mappers/resend.rb

@@ -8,17 +8,14 @@ module Emailbutler
           'email.sent' => 'processed',
           'email.delivered' => 'delivered',
           'email.opened' => 'delivered',
-          'email.clicked' => 'delivered',
-          'email.delivered_delayed' => 'failed',
-          'email.bounced' => 'failed',
-          'email.complained' => 'failed'
+          'email.clicked' => 'delivered'
         }.freeze
 
         def call(payload:)
           payload.stringify_keys!
           message_uuid = payload.dig('data', 'email_id')
-          status = DELIVERABILITY_MAPPER[payload['type']]
-          return [] if message_uuid.nil? || status.nil?
+          status = DELIVERABILITY_MAPPER[payload['type']] || Emailbutler::Message::FAILED
+          return [] if message_uuid.nil?
 
           [
             {

data/lib/emailbutler/webhooks/mappers/sendgrid.rb

@@ -8,18 +8,14 @@ module Emailbutler
           'processed' => 'processed',
           'delivered' => 'delivered',
           'open' => 'delivered',
-          'click' => 'delivered',
-          'deferred' => 'failed',
-          'bounce' => 'failed',
-          'dropped' => 'failed',
-          'spamreport' => 'failed'
+          'click' => 'delivered'
         }.freeze
 
         def call(payload:)
           payload['_json'].filter_map { |message|
             message.stringify_keys!
             message_uuid = message['smtp-id'] || message['sg_message_id']
-            status = DELIVERABILITY_MAPPER[message['event']]
+            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
             next if message_uuid.nil? || status.nil?
 
             {

data/lib/emailbutler/webhooks/mappers/smtp2go.rb

@@ -8,18 +8,15 @@ module Emailbutler
           'processed' => 'processed',
           'delivered' => 'delivered',
           'open' => 'delivered',
-          'click' => 'delivered',
-          'bounce' => 'failed',
-          'reject' => 'failed',
-          'spam' => 'failed'
+          'click' => 'delivered'
         }.freeze
 
         def call(payload:)
           payload.stringify_keys!
           # message-id contains data like <uuid>
           message_uuid = payload['message-id'][1..-2]
-          status = DELIVERABILITY_MAPPER[payload['event']]
-          return [] if message_uuid.nil? || status.nil?
+          status = DELIVERABILITY_MAPPER[payload['event']] || Emailbutler::Message::FAILED
+          return [] if message_uuid.nil?
 
           [
             {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailbutler
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -245,6 +245,8 @@ files:
 - lib/emailbutler/mailers/helpers.rb
 - lib/emailbutler/version.rb
 - lib/emailbutler/webhooks/mappers/mailjet.rb
+- lib/emailbutler/webhooks/mappers/mailtrap.rb
+- lib/emailbutler/webhooks/mappers/mandrill.rb
 - lib/emailbutler/webhooks/mappers/resend.rb
 - lib/emailbutler/webhooks/mappers/sendgrid.rb
 - lib/emailbutler/webhooks/mappers/smtp2go.rb