emailbutler 0.8.12 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e041b4eb9f94cb8591b0bdd439eb35ea40f9f2806e065feb13e65d3ea217191
-  data.tar.gz: 33f46385632a0c85e219aa3d55731d53ee548e4cb6fdc932a05c5e4fa77759ad
+  metadata.gz: a462f9ebcf6a686f4692573eecc1f319bb274f10aecb3247cf6e1d3191f80397
+  data.tar.gz: 41eab094dd56a6e374fb0a20a32c00aee1538b50a9eb5ea735ce3b9d13c681bd
 SHA512:
-  metadata.gz: cff7daacc6e23cc0d01b17762ccd23eac8305f58f4756687f3efed466e45e2f19cdf6e93ddaadca99c15912b52eb8d071255fccf68f34f64f5a59ff0c1330fe6
-  data.tar.gz: d32be30b001977e334190dc8b07dad3c900177642b8fc6eef21a0ed3f733f10c211c3a48be138663753ac2c1e725e9a5b896fb60abe3fc1a4c3b38d8374bd8d7
+  metadata.gz: ac70ce8e0fef8bf4a37a96f63d8b918afccbb7539f651f5aa1fdd116f62afffdfffb2797954373b3707806ace2c84aae43df6e638527583c2131cb0be9e61220
+  data.tar.gz: 9810ff0ab0ddf8024cf2a8bbe5269f5cfd6b7c93e788c009b5273c049ed5fe73ac97c9bb0d1aa545f9dcdbdd2485d1b5741dd7c537bc34b46d8e7f3a1dc201df

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.8.12'
+  VERSION = '0.9.1'
 end

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

@@ -6,25 +6,33 @@ module Emailbutler
       class Mailjet
         DELIVERABILITY_MAPPER = {
           'sent' => 'processed',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
         def call(payload:)
           payload.stringify_keys!
           # message-id contains data like <uuid>
           message_uuid = payload['Message_GUID']
-          status = DELIVERABILITY_MAPPER[payload['event']] || Emailbutler::Message::FAILED
+          message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
           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,24 +6,32 @@ module Emailbutler
       class Mailtrap
         DELIVERABILITY_MAPPER = {
           'delivery' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.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
+            message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
             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,24 +6,32 @@ module Emailbutler
       class Mandrill
         DELIVERABILITY_MAPPER = {
           'send' => 'processed',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.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
+            message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
             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,24 +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')
-          status = DELIVERABILITY_MAPPER[payload['type']] || Emailbutler::Message::FAILED
+          message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
           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,24 +7,32 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'processed' => 'processed',
           'delivered' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.freeze
 
-        def call(payload:)
+        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']
-            status = DELIVERABILITY_MAPPER[message['event']] || Emailbutler::Message::FAILED
+            message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
             next if message_uuid.nil? || status.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,25 +7,33 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'processed' => 'processed',
           'delivered' => 'delivered',
-          'open' => 'delivered',
-          'click' => 'delivered'
+          'open' => 'opened',
+          'click' => 'opened'
         }.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']] || Emailbutler::Message::FAILED
+          message_uuid = payload['message-id']
+          message_uuid = message_uuid[1..-2] if message_uuid.starts_with?('<') && message_uuid.ends_with?('>')
           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.8.12
+  version: 0.9.1
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container