mail_room 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f1281c4daadee7a741b0d9cf55eb4b1592a42f
-  data.tar.gz: a46e8058fa97d38c6a63903994d34954588247c2
+  metadata.gz: 836563b572db61eacd01d2363273d998863e9831
+  data.tar.gz: de0cab71b636b3c7ffe0f08cd021896e403940c3
 SHA512:
-  metadata.gz: f1cdbd850515534f5d3c504bc4453a522be6f190276235f92914641c63e2dab8da47d30290b49ea70dc6fa99e45ded4cc404a2c6d16bcaf4e76a489240fe85c7
-  data.tar.gz: c78b9a59fe28fedd44a042bee256c9aca38d4beb5cf7960e86aa511ba72ecd2487f8ad49b5c406469496dcedfdcb2ff9ccad37d221375ad9ac03a965e2001643
+  metadata.gz: 9648c21785544fab432cedeca09c6c28ffd7d993f7ff90c30c1bb2d893e00517687f233118ae945be43fe1c0123ce7f0b2a0addf78c7b5fb22876fae81718df9
+  data.tar.gz: 503a0ac11cf7e0dddb4299c608ba5d87a5820419afb08ed8a65aeed6e04c6e56a54133f61239f193c63a8f11384fe91540b16ad7dac2a81cbbad4044e794ef1d

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## mail_room 0.5.2 ##
+
+* Fix Sidekiq delivery method for non-UTF8 email
+
+    *Douwe Maan <@DouweM>*
+
+* Add StartTLS session support
+
+    *Tony Pitale <@tpitale>*
+
 ## mail_room 0.5.1 ##
 
 * Re-idle after 29 minutes to maintain IDLE connection

data/README.md

@@ -195,7 +195,7 @@ This setting allows configuration of the IMAP search command sent to the server.
 
 ## IMAP Server Configuration ##
 
-You can set per-mailbox configuration for the IMAP server's `host` (default: 'imap.gmail.com'), `port` (default: 993), and `ssl` (default: true). 
+You can set per-mailbox configuration for the IMAP server's `host` (default: 'imap.gmail.com'), `port` (default: 993), `ssl` (default: true), and `start_tls` (default: false).
 
 If you're seeing the error `Please log in via your web browser: https://support.google.com/mail/accounts/answer/78754 (Failure)`, you need to configure your Gmail account to allow less secure apps to access it: https://support.google.com/accounts/answer/6010255.
 

data/lib/mail_room/delivery/sidekiq.rb

@@ -1,6 +1,7 @@
 require "redis"
 require "securerandom"
 require "json"
+require "charlock_holmes"
 
 module MailRoom
   module Delivery
@@ -53,7 +54,7 @@ module MailRoom
       def item_for(message)
         {
           'class'       => options.worker,
-          'args'        => [message],
+          'args'        => [utf8_encode_message(message)],
 
           'queue'       => options.queue,
           'jid'         => SecureRandom.hex(12),
@@ -61,6 +62,19 @@ module MailRoom
           '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

data/lib/mail_room/mailbox.rb

@@ -6,6 +6,7 @@ module MailRoom
     :host,
     :port,
     :ssl,
+    :start_tls,
     :search_command,
     :name,
     :delete_after_delivery,
@@ -27,6 +28,7 @@ module MailRoom
       :host => 'imap.gmail.com',
       :port => 993,
       :ssl => true,
+      :start_tls => false,
       :delete_after_delivery => false,
       :delivery_options => {}
     }

data/lib/mail_room/mailbox_watcher.rb

@@ -65,6 +65,7 @@ module MailRoom
     # log in and set the mailbox
     def setup
       reset
+      start_tls
       log_in
       set_mailbox
     end
@@ -77,6 +78,11 @@ module MailRoom
       @idling = false
     end
 
+    # start a TLS session
+    def start_tls
+      imap.starttls if @mailbox.start_tls
+    end
+
     # send the imap login command to google
     def log_in
       imap.login(@mailbox.email, @mailbox.password)

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of MailRoom gem
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/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

data/spec/lib/mailbox_watcher_spec.rb

@@ -37,10 +37,17 @@ describe MailRoom::MailboxWatcher do
   end
 
   describe '#setup' do
+    let(:imap) {stub(:login => true, :select => true)}
+
+    let(:mailbox) {
+      MailRoom::Mailbox.new(:email => 'user1@gmail.com', :password => 'password', :name => 'inbox', )
+    }
+
+    let(:watcher) {
+      MailRoom::MailboxWatcher.new(mailbox)
+    }
+
     it 'logs in and sets the mailbox to watch' do
-      imap = stub(:login => true, :select => true)
-      mailbox = stub(:email => 'user1@gmail.com', :password => 'password', :name => 'inbox')
-      watcher = MailRoom::MailboxWatcher.new(mailbox)
       watcher.stubs(:imap).returns(imap)
 
       watcher.setup
@@ -49,6 +56,20 @@ describe MailRoom::MailboxWatcher do
       watcher.logged_in?.should eq(true)
       imap.should have_received(:select).with('inbox')
     end
+
+    context 'with start_tls configured as true' do
+      before(:each) do
+        mailbox.start_tls = true
+        imap.stubs(:starttls)
+        watcher.stubs(:imap).returns(imap)
+      end
+
+      it 'sets up tls session on imap setup' do
+        watcher.setup
+
+        imap.should have_received(:starttls)
+      end
+    end
   end
 
   describe '#idle' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_room
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: mail_room will proxy email (gmail) from IMAP to a delivery method
 email:
 - tpitale@gmail.com