mailhandler 1.0.33 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b888851bd9c92766c8abb3399b4bc7115dfd54ff
-  data.tar.gz: 39d2842b2fe5be561a99d6a77bf9c2b99cc8f49f
+  metadata.gz: 2b329d4b975268c0863e22ca7bdd1c6b0b68749d
+  data.tar.gz: 8f0a8df3543fb535647995c00d3f7a41fa96c5e2
 SHA512:
-  metadata.gz: b285a314daaa40d85d5133888b21c7a2340df5906c24f98a6165b38d2b3525fc666f54020a6e79aa9989719474ab9bfc6688f5aad753f1e18010a2c63183fb2d
-  data.tar.gz: e55151fa11ab16befe97d21e43463bcdb3e356676c98932b2ec810b5a8d0d3bc6602d2582faff96896f50ddc5f7301d00573ce8f8967bfaaba0928ccce5e476d
+  metadata.gz: ae8c4663433e1ba91a603168f90f18b041619559b2e8019d5de1662b72e0670f3d3d1eb04b82a4765953d1afdc00dea0fc55dc7acd7ce50ec0bed0417621d908
+  data.tar.gz: 1db0cc12950ec81b530da34560536fe834aaac86c606e5f1696ca65ccf30d58c87a829acc762ae4c176142a73609403e5266544b203fd76d4965d9ab0f29ab0e

data/lib/mailhandler/receiving/notification/email.rb

@@ -23,6 +23,7 @@ module MailHandler
           @sender = sender
           @contacts = contacts
           init_state
+          set_content_handler(EmailContent.new)
 
         end
 
@@ -43,11 +44,19 @@ module MailHandler
         def send_email(type, search)
 
           verify_email_type(type)
-          content = EmailContent.send("email_#{type}",search.options, Time.now - search.started_at, sender.dispatcher.username, contacts)
+          content = @content_handler.retrieve(type, search.options, Time.now - search.started_at,
+                                              sender.dispatcher.username, contacts)
           sender.send_email content
 
         end
 
+        # Allow users to specify their own content classes.
+        # Class must match by methods to the interface of MailHandler::Receiving::Notification::EmailContent
+        def set_content_handler(content_handler)
+          @content_handler = content_handler
+        end
+
+
         private
 
         def init_state

data/lib/mailhandler/receiving/notification/email/content.rb

@@ -8,40 +8,41 @@ module MailHandler
 
       class EmailContent
 
+        # @param [Symbol] type - notification type
         # @param [Hash] options - search options used for searching for an email
         # @param [Int] delay - delay in seconds
         # @param [String] from - email address
         # @param [String] to - email address
-        def self.email_received(options, delay, from, to)
+        def retrieve(type, options, delay, from, to)
 
-          Mail.new do
+          mail = Mail.new
+          mail.from = from
+          mail.to = to
+          delay = (delay.to_f/60).round(2)
 
-            from from
-            subject "Received - delay was #{(delay.to_f/60).round(2)} minutes"
-            body "Received - delay was #{(delay.to_f/60).round(2)} minutes - search by #{options}"
-            to to
+          case type
 
-          end
+            when :received
 
-        end
+              mail.subject = "Received - delay was #{delay} minutes"
+              mail.body = "Received - delay was #{delay} minutes - search by #{options}"
 
-        # @param [Hash] options - search options used for searching for an email
-        # @param [Int] delay - delay in seconds
-        # @param [String] from - email address
-        # @param [String] to - email address
-        def self.email_delayed(options, delay, from, to)
+            when :delayed
+
+              mail.subject = "Over #{delay} minutes delay"
+              mail.body = "Over #{delay} minutes delay - search by #{options}"
 
-          Mail.new do
+            else
 
-            from from
-            subject "Over #{(delay.to_f/60).round(2)} minutes delay"
-            body "Over #{(delay.to_f/60).round(2)} minutes delay - search by #{options}"
-            to to
+              raise StandardError, "Incorrect type: #{type}"
 
           end
 
+          mail
+
         end
 
+
       end
 
     end

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.33'
+  VERSION = '1.0.34'
 
 end

data/spec/unit/mailhandler/receiving/notification/email/content_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe MailHandler::Receiving::Notification::EmailContent do
 
-  subject { MailHandler::Receiving::Notification::EmailContent }
+  subject { MailHandler::Receiving::Notification::EmailContent.new }
 
   let(:to) { 'john@example.com' }
   let(:from) { 'igor@example.com' }
@@ -12,7 +12,7 @@ describe MailHandler::Receiving::Notification::EmailContent do
 
     it 'create email' do
 
-      expect(subject.email_received(options, 60, from, to)).to be_kind_of Mail::Message
+      expect(subject.retrieve(:received, options, 60, from, to)).to be_kind_of Mail::Message
 
     end
 
@@ -20,38 +20,38 @@ describe MailHandler::Receiving::Notification::EmailContent do
 
       it 'sender' do
 
-        expect(subject.email_received(options, 60, from, to)[:from].to_s).to eq from
+        expect(subject.retrieve(:received, options, 60, from, to)[:from].to_s).to eq from
 
       end
 
       it 'single recipient' do
 
-        expect(subject.email_received(options, 60, from, to)[:to].to_s).to eq to
+        expect(subject.retrieve(:received, options, 60, from, to)[:to].to_s).to eq to
 
       end
 
       it 'multiple recipients' do
 
         to = 'john1@example.com, john2@example.com'
-        expect(subject.email_received(options, 60, from, to)[:to].to_s).to eq to
+        expect(subject.retrieve(:received, options, 60, from, to)[:to].to_s).to eq to
 
       end
 
       it 'subject - 1 minute delay' do
 
-        expect(subject.email_received(options, 60, from, to).subject).to eq "Received - delay was 1.0 minutes"
+        expect(subject.retrieve(:received, options, 60, from, to).subject).to eq "Received - delay was 1.0 minutes"
 
       end
 
       it 'subject - 1.5 minute delay' do
 
-        expect(subject.email_received(options, 90, from, to).subject).to eq "Received - delay was 1.5 minutes"
+        expect(subject.retrieve(:received, options, 90, from, to).subject).to eq "Received - delay was 1.5 minutes"
 
       end
 
       it 'body' do
 
-        expect(subject.email_received(options, 90, from, to).body.to_s).
+        expect(subject.retrieve(:received, options, 90, from, to).body.to_s).
             to eq "Received - delay was 1.5 minutes - search by #{options}"
 
       end
@@ -64,38 +64,38 @@ describe MailHandler::Receiving::Notification::EmailContent do
 
     it 'sender' do
 
-      expect(subject.email_delayed(options, 60, from, to)[:from].to_s).to eq from
+      expect(subject.retrieve(:delayed, options, 60, from, to)[:from].to_s).to eq from
 
     end
 
     it 'single recipient' do
 
-      expect(subject.email_delayed(options, 60, from, to)[:to].to_s).to eq to
+      expect(subject.retrieve(:delayed, options, 60, from, to)[:to].to_s).to eq to
 
     end
 
     it 'multiple recipients' do
 
       to = 'john1@example.com, john2@example.com'
-      expect(subject.email_delayed(options, 60, from, to)[:to].to_s).to eq to
+      expect(subject.retrieve(:delayed, options, 60, from, to)[:to].to_s).to eq to
 
     end
 
     it 'subject - 1 minute delay' do
 
-      expect(subject.email_delayed(options, 60, from, to).subject).to eq "Over 1.0 minutes delay"
+      expect(subject.retrieve(:delayed, options, 60, from, to).subject).to eq "Over 1.0 minutes delay"
 
     end
 
     it 'subject - 1.5 minute delay' do
 
-      expect(subject.email_delayed(options, 90, from, to).subject).to eq "Over 1.5 minutes delay"
+      expect(subject.retrieve(:delayed, options, 90, from, to).subject).to eq "Over 1.5 minutes delay"
 
     end
 
     it 'body' do
 
-      expect(subject.email_delayed(options, 90, from, to).body.to_s).
+      expect(subject.retrieve(:delayed, options, 90, from, to).body.to_s).
           to eq "Over 1.5 minutes delay - search by #{options}"
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.34
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Postmark email receiving and sending handler.