emailbutler 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d753748defc72a9be03be5ce3b5292ac438ccb040babd44955968a73515805f5
-  data.tar.gz: 6a962a4ae519be7280a0bf90ec2fa4e1283a7431967d070899164446d74a4b66
+  metadata.gz: 296cc3406157af31f3ec46810d33662b75f630ce784d1417c2e2ec911c314718
+  data.tar.gz: f5829e5fa9b3d06f276fdc00615fa37495d507c65f9931ff9bbd682050debed1
 SHA512:
-  metadata.gz: e84a65be9929fee1171136cf07190c42c9d6004171ee080fb87e46ea31587252ad231d7e4530aa1ca05deac266ac0903ca5055f0e20b84d720f26549c96ab64a
-  data.tar.gz: cc7bcf25f40122b0efe390b01e8c42cf76eef2fea4894376dec8a2e872cda5ca3ba9aaee858e8666f3417a6a859842480fde431c2394ab4bf11ef61119db5089
+  metadata.gz: e074e7b90157b378365d76efd5295246219336e41330f349e68dc8a3ad4cd3fad309d0549a653754a30110055016ccf3337bfe4b939c560f79c96c844551ed8b
+  data.tar.gz: ce64d8fac91538107a2afb78ab84011de22c08eb08e726bc97dbb5da241e0178d2ed90ac92edfb007c72987bb0089c2c528e8b67fa529f3e740acde9dbc99e45

data/README.md

@@ -1,3 +1,5 @@
+<img align="right" alt="emailbutler" src="https://raw.githubusercontent.com/kortirso/emailbutler/master/logo.svg?sanitize=true">
+
 # Emailbutler
 Simple email tracker for Ruby on Rails applications.
 Emailbutler allows you to track delivery status of emails sent by your app through Sendgrid, SMTP2GO, Resend, Mailjet.
@@ -34,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
@@ -139,3 +141,7 @@ Emailbutler provides UI with rendering email tracking statistics - /emailbutler/
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Sponsors
+
+[<img width="200" src="https://evrone.com/logo/evrone-sponsored-logo.png">](https://evrone.com/?utm_source=emailbutler)

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/adapters/active_record.rb

@@ -21,7 +21,7 @@ module Emailbutler
         FAILED = 'failed'
         DELIVERED = 'delivered'
 
-        enum status: { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4 }
+        enum :status, { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4 }
 
         after_initialize :generate_uuid
 

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
 

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.3'
+  VERSION = '0.8.5'
 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.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-09-30 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