Fix Sidekiq delivery method for non-UTF8 email

CHANGELOG.md

@@ -1,3 +1,9 @@
+## mail_room 0.5.2 ##
+
+* Fix Sidekiq delivery method for non-UTF8 email
+
+    *Douwe Maan <@DouweM>*
+
 ## mail_room 0.5.1 ##
 
 * Re-idle after 29 minutes to maintain IDLE connection

lib/mail_room/delivery/sidekiq.rb

@@ -1,6 +1,7 @@
 require "redis"
 require "securerandom"
 require "json"
+require "charlock_holmes"
 
 module MailRoom
   module Delivery
@@ -53,14 +54,27 @@ def client
       def item_for(message)
         {
           'class'       => options.worker,
-          'args'        => [message],
+          'args'        => [utf8_encode_message(message)],
 
           'queue'       => options.queue,
           'jid'         => SecureRandom.hex(12),
           'retry'       => false,
           'enqueued_at' => Time.now.to_f
         }
       end
+
+      def utf8_encode_message(message)
+        message = message.dup
+
+        message.force_encoding("UTF-8")
+        return message if message.valid_encoding?
+
+        detection = CharlockHolmes::EncodingDetector.detect(message)
+        return message unless detection && detection[:encoding]
+
+        # Convert non-UTF-8 body UTF-8 so it can be dumped as JSON.
+        CharlockHolmes::Converter.convert(message, detection[:encoding], 'UTF-8')
+      end
     end
   end
 end

mail_room.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "letter_opener"
   gem.add_development_dependency "redis"
   gem.add_development_dependency "pg"
+  gem.add_development_dependency "charlock_holmes"
 end