mail_room 0.9.1 → 0.10.0

data/spec/lib/mailbox_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
 describe MailRoom::Mailbox do
+  let(:sample_message) { {'RFC822' => 'a message', 'UID' => 123} }
+
   describe "#deliver" do
     context "with arbitration_method of noop" do
       it 'arbitrates with a Noop instance' do
-        mailbox = MailRoom::Mailbox.new({:arbitration_method => 'noop'})
+        mailbox = build_mailbox({:arbitration_method => 'noop'})
         noop = stub(:deliver?)
         MailRoom::Arbitration['noop'].stubs(:new => noop)
 
@@ -18,12 +20,12 @@ describe MailRoom::Mailbox do
 
     context "with arbitration_method of redis" do
       it 'arbitrates with a Redis instance' do
-        mailbox = MailRoom::Mailbox.new({:arbitration_method => 'redis'})
+        mailbox = build_mailbox({:arbitration_method => 'redis'})
         redis = stub(:deliver?)
         MailRoom::Arbitration['redis'].stubs(:new => redis)
 
         uid = 123
-        
+
         mailbox.deliver?(uid)
 
         expect(redis).to have_received(:deliver?).with(uid)
@@ -32,11 +34,11 @@ describe MailRoom::Mailbox do
 
     context "with delivery_method of noop" do
       it 'delivers with a Noop instance' do
-        mailbox = MailRoom::Mailbox.new({:delivery_method => 'noop'})
+        mailbox = build_mailbox({:delivery_method => 'noop'})
         noop = stub(:deliver)
         MailRoom::Delivery['noop'].stubs(:new => noop)
 
-        mailbox.deliver(stub(:attr => {'RFC822' => 'a message'}))
+        mailbox.deliver(stub(:attr => sample_message))
 
         expect(noop).to have_received(:deliver).with('a message')
       end
@@ -44,11 +46,11 @@ describe MailRoom::Mailbox do
 
     context "with delivery_method of logger" do
       it 'delivers with a Logger instance' do
-        mailbox = MailRoom::Mailbox.new({:delivery_method => 'logger'})
+        mailbox = build_mailbox({:delivery_method => 'logger'})
         logger = stub(:deliver)
         MailRoom::Delivery['logger'].stubs(:new => logger)
 
-        mailbox.deliver(stub(:attr => {'RFC822' => 'a message'}))
+        mailbox.deliver(stub(:attr => sample_message))
 
         expect(logger).to have_received(:deliver).with('a message')
       end
@@ -56,11 +58,11 @@ describe MailRoom::Mailbox do
 
     context "with delivery_method of postback" do
       it 'delivers with a Postback instance' do
-        mailbox = MailRoom::Mailbox.new({:delivery_method => 'postback'})
+        mailbox = build_mailbox({:delivery_method => 'postback'})
         postback = stub(:deliver)
         MailRoom::Delivery['postback'].stubs(:new => postback)
 
-        mailbox.deliver(stub(:attr => {'RFC822' => 'a message'}))
+        mailbox.deliver(stub(:attr => sample_message))
 
         expect(postback).to have_received(:deliver).with('a message')
       end
@@ -68,11 +70,11 @@ describe MailRoom::Mailbox do
 
     context "with delivery_method of letter_opener" do
       it 'delivers with a LetterOpener instance' do
-        mailbox = MailRoom::Mailbox.new({:delivery_method => 'letter_opener'})
+        mailbox = build_mailbox({:delivery_method => 'letter_opener'})
         letter_opener = stub(:deliver)
         MailRoom::Delivery['letter_opener'].stubs(:new => letter_opener)
 
-        mailbox.deliver(stub(:attr => {'RFC822' => 'a message'}))
+        mailbox.deliver(stub(:attr => sample_message))
 
         expect(letter_opener).to have_received(:deliver).with('a message')
       end
@@ -80,7 +82,7 @@ describe MailRoom::Mailbox do
 
     context "without an RFC822 attribute" do
       it "doesn't deliver the message" do
-        mailbox = MailRoom::Mailbox.new({:delivery_method => 'noop'})
+        mailbox = build_mailbox({ name: "magic mailbox", delivery_method: 'noop' })
         noop = stub(:deliver)
         MailRoom::Delivery['noop'].stubs(:new => noop)
 
@@ -92,10 +94,33 @@ describe MailRoom::Mailbox do
 
     context "with ssl options hash" do
       it 'replaces verify mode with constant' do
-        mailbox = MailRoom::Mailbox.new({:ssl => {:verify_mode => :none}})
+        mailbox = build_mailbox({:ssl => {:verify_mode => :none}})
 
         expect(mailbox.ssl_options).to eq({:verify_mode => OpenSSL::SSL::VERIFY_NONE})
       end
     end
+
+    context 'structured logger setup' do
+      it 'sets up the logger correctly and does not error' do
+        mailbox = build_mailbox({ name: "magic mailbox", logger: { log_path: '/dev/null' } })
+
+        expect{ mailbox.logger.info(message: "asdf") }.not_to raise_error
+      end
+
+      it 'sets up the noop logger correctly and does not error' do
+        mailbox = build_mailbox({ name: "magic mailbox" })
+
+        expect{ mailbox.logger.info(message: "asdf") }.not_to raise_error
+      end
+    end
+  end
+
+  describe "#validate!" do
+    context "with missing configuration" do
+      it 'raises an error' do
+        expect { build_mailbox({:name => nil}) }.to raise_error(MailRoom::ConfigurationError)
+        expect { build_mailbox({:host => nil}) }.to raise_error(MailRoom::ConfigurationError)
+      end
+    end
   end
 end

data/spec/lib/mailbox_watcher_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe MailRoom::MailboxWatcher do
-  let(:mailbox) {MailRoom::Mailbox.new}
+  let(:mailbox) {build_mailbox}
 
   describe '#running?' do
     it 'is false by default' do

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'bundler/setup'
 require 'rspec'
 require 'mocha/api'
 require 'bourne'
-require 'fakeredis/rspec'
 
 require File.expand_path('../../lib/mail_room', __FILE__)
 
@@ -21,3 +20,13 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+REQUIRED_MAILBOX_DEFAULTS = {
+  :name => "inbox",
+  :email => "user@example.com",
+  :password => "password123"
+}
+
+def build_mailbox(options = {})
+  MailRoom::Mailbox.new(REQUIRED_MAILBOX_DEFAULTS.merge(options))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_room
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeredis
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: letter_opener
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: letter_opener
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,6 @@ files:
 - lib/mail_room/arbitration.rb
 - lib/mail_room/arbitration/noop.rb
 - lib/mail_room/arbitration/redis.rb
-- lib/mail_room/backports/imap.rb
 - lib/mail_room/cli.rb
 - lib/mail_room/configuration.rb
 - lib/mail_room/connection.rb
@@ -213,9 +212,11 @@ files:
 - lib/mail_room/delivery/postback.rb
 - lib/mail_room/delivery/que.rb
 - lib/mail_room/delivery/sidekiq.rb
+- lib/mail_room/logger/structured.rb
 - lib/mail_room/mailbox.rb
 - lib/mail_room/mailbox_watcher.rb
 - lib/mail_room/version.rb
+- logfile.log
 - mail_room.gemspec
 - spec/fixtures/test_config.yml
 - spec/lib/arbitration/redis_spec.rb
@@ -228,6 +229,7 @@ files:
 - spec/lib/delivery/postback_spec.rb
 - spec/lib/delivery/que_spec.rb
 - spec/lib/delivery/sidekiq_spec.rb
+- spec/lib/logger/structured_spec.rb
 - spec/lib/mailbox_spec.rb
 - spec/lib/mailbox_watcher_spec.rb
 - spec/spec_helper.rb
@@ -249,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or
@@ -267,6 +268,7 @@ test_files:
 - spec/lib/delivery/postback_spec.rb
 - spec/lib/delivery/que_spec.rb
 - spec/lib/delivery/sidekiq_spec.rb
+- spec/lib/logger/structured_spec.rb
 - spec/lib/mailbox_spec.rb
 - spec/lib/mailbox_watcher_spec.rb
 - spec/spec_helper.rb

data/lib/mail_room/backports/imap.rb

@@ -1,33 +0,0 @@
-module MailRoom
-  class IMAP < Net::IMAP
-    # Backported 2.3.0 version of net/imap idle command to support timeout
-    def idle(timeout = nil, &response_handler)
-      raise LocalJumpError, "no block given" unless response_handler
-
-      response = nil
-
-      synchronize do
-        tag = Thread.current[:net_imap_tag] = generate_tag
-        put_string("#{tag} IDLE#{CRLF}")
-
-        begin
-          add_response_handler(response_handler)
-          @idle_done_cond = new_cond
-          @idle_done_cond.wait(timeout)
-          @idle_done_cond = nil
-          if @receiver_thread_terminating
-            raise Net::IMAP::Error, "connection closed"
-          end
-        ensure
-          unless @receiver_thread_terminating
-            remove_response_handler(response_handler)
-            put_string("DONE#{CRLF}")
-            response = get_tagged_response(tag, "IDLE")
-          end
-        end
-      end
-
-      return response
-    end
-  end
-end