emailbutler 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d6612dd1009249a9314d73130f50e552ca2617ac9e9396321d838097847b2b4
-  data.tar.gz: e844f163ca10039a3214b441fce3ce1036e1d621c75719af5b45f0c6301d4a98
+  metadata.gz: e383f6ed08c050c7149654b5c8799486a3a0dd896e2af2fa8148524c9dd73428
+  data.tar.gz: 1e6934ee8b820cb46d586899bf30bcb818944de02c3e466e3feb18f5baef367a
 SHA512:
-  metadata.gz: bded1db47fe2574726f9b695154b96a18c51cf639c1a0f54d4fe561ed7932b681bbe069c463c905c00f7ef8b1b9f2f58b8a710fd638d40a9b24b1046280c3ef6
-  data.tar.gz: 8e889730f6f8d5e14e70c327b9e627c57daba2200113b924ef4adbd71ff84960a3ff12913e8a5cc00111b62526278e8d6007dbefbe1fab429c63a854cc140c7a
+  metadata.gz: 5f40fda2c1f56e1fa61cb2e54e039470bbd6ff885c9e63e3caa77306789e7d661c410f560fb9f185ab491273abf173bed36b46e1512ef62b73aff8b77b6f80f5
+  data.tar.gz: 7ead6ad7e71e30e67094a28700913d166bea96a3daa09541f6e770c04a16f541bf28cf007f4f3644309884c6e0cb3cc2a66fd7f0bf6bd289faca0db41d789299

data/lib/emailbutler/adapters/active_record.rb

@@ -20,11 +20,12 @@ module Emailbutler
         PROCESSED = 'processed'
         FAILED = 'failed'
         DELIVERED = 'delivered'
+        OPENED = 'opened'
 
         if Gem.loaded_specs['activerecord'].version < Gem::Version.create('7.0')
-          enum status: { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4 }
+          enum status: { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4, OPENED => 5 }
         else
-          enum :status, { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4 }
+          enum :status, { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4, OPENED => 5 }
         end
 
         after_initialize :generate_uuid

data/lib/emailbutler/configuration.rb

@@ -4,16 +4,15 @@ module Emailbutler
   class Configuration
     InitializeError = Class.new(StandardError)
 
-    AVAILABLE_ADAPTERS = %w[
-      Emailbutler::Adapters::ActiveRecord
-    ].freeze
+    AVAILABLE_ADAPTERS = %w[Emailbutler::Adapters::ActiveRecord].freeze
     AVAILABLE_PROVIDERS = %w[sendgrid smtp2go resend mailjet mailtrap mandrill].freeze
 
-    attr_reader :adapter, :providers, :ui_username, :ui_password, :ui_secured_environments
+    attr_reader :adapter, :providers, :mapping, :ui_username, :ui_password, :ui_secured_environments
 
     def initialize
       @adapter = nil
       @providers = []
+      @mapping = true
 
       # It's required to specify these 3 variables to enable basic auth to UI
       @ui_username = ''

data/lib/emailbutler/version.rb

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

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

@@ -6,8 +6,8 @@ module Emailbutler
       class Mailjet
         DELIVERABILITY_MAPPER = {
           'sent' => 'processed',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
         def call(payload:)
@@ -15,17 +15,24 @@ module Emailbutler
           # message-id contains data like <uuid>
           message_uuid = payload['Message_GUID']
           message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-          status = DELIVERABILITY_MAPPER[payload['event']] || Emailbutler::Message::FAILED
           return [] if message_uuid.nil?
 
           [
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(payload['event']),
               timestamp: payload['time'] ? Time.at(payload['time'].to_i).utc.to_datetime : nil
             }
           ]
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

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

@@ -6,8 +6,8 @@ module Emailbutler
       class Mailtrap
         DELIVERABILITY_MAPPER = {
           'delivery' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
         def call(payload:)
@@ -15,16 +15,23 @@ module Emailbutler
             message.stringify_keys!
             message_uuid = message['message_id']
             message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
             next if message_uuid.nil?
 
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(message['event']),
               timestamp: message['timestamp'] ? Time.at(message['timestamp']).utc.to_datetime : nil
             }
           }
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

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

@@ -6,8 +6,8 @@ module Emailbutler
       class Mandrill
         DELIVERABILITY_MAPPER = {
           'send' => 'processed',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
         def call(payload:)
@@ -15,16 +15,23 @@ module Emailbutler
             message.stringify_keys!
             message_uuid = message['_id']
             message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
             next if message_uuid.nil?
 
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(message['event']),
               timestamp: message['ts'] ? Time.at(message['ts']).utc.to_datetime : nil
             }
           }
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

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

@@ -7,25 +7,32 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'email.sent' => 'processed',
           'email.delivered' => 'delivered',
-          'email.opened' => 'delivered',
-          'email.clicked' => 'delivered'
+          'email.opened' => 'opened',
+          'email.clicked' => 'opened'
         }.freeze
 
         def call(payload:)
           payload.stringify_keys!
           message_uuid = payload.dig('data', 'email_id')
           message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-          status = DELIVERABILITY_MAPPER[payload['type']] || Emailbutler::Message::FAILED
           return [] if message_uuid.nil?
 
           [
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(payload['type']),
               timestamp: payload['created_at'] ? DateTime.parse(payload['created_at']).utc : nil
             }
           ]
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

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

@@ -7,25 +7,32 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'processed' => 'processed',
           'delivered' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
-        def call(payload:) # rubocop: disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def call(payload:) # rubocop: disable Metrics/AbcSize, Metrics/CyclomaticComplexity
           payload['_json'].filter_map { |message|
             message.stringify_keys!
             message_uuid = message['smtp-id'] || message['sg_message_id']
             message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
-            next if message_uuid.nil? || status.nil?
+            next if message_uuid.nil?
 
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(message['event']),
               timestamp: message['timestamp'] ? Time.at(message['timestamp'].to_i).utc.to_datetime : nil
             }
           }
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

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

@@ -7,8 +7,8 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'processed' => 'processed',
           'delivered' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
         def call(payload:)
@@ -16,17 +16,24 @@ module Emailbutler
           # message-id contains data like <uuid>
           message_uuid = payload['message-id']
           message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
-          status = DELIVERABILITY_MAPPER[payload['event']] || Emailbutler::Message::FAILED
           return [] if message_uuid.nil?
 
           [
             {
               message_uuid: message_uuid,
-              status: status,
+              status: transform_status(payload['event']),
               timestamp: payload['sendtime'] ? Time.at(payload['sendtime'].to_i).utc.to_datetime : nil
             }
           ]
         end
+
+        private
+
+        def transform_status(value)
+          return DELIVERABILITY_MAPPER[value] || Emailbutler::Message::FAILED if Emailbutler.configuration.mapping
+
+          value
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailbutler
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container