mailhandler 1.0.35 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce6a144521ea4123b5695c64ea2e6d35225405cd
-  data.tar.gz: 8c33ce15af819275d7ccb7cae0247586ac7cda18
+  metadata.gz: 5e3e402f4b95ef68f6d3e14782e9df18f45a7ff0
+  data.tar.gz: 6285982ac47bfafa48410c2a1c98f6d21c3f0510
 SHA512:
-  metadata.gz: 1e128fa32f6e094999bf2a745461a81fa6e762f2037edbe74be223fd7271b68aa8b37515315af6265613a00e631fc4e79bbb4e6f5b72aabeae5fcbd8ae73f010
-  data.tar.gz: da4d35f2fcd17dd90a231b6df1af27f08313468dcc103a5a3253ffd6ec91109f27b851170080219d16f710954f89201ad24ae571743667fc61c22800295a8009
+  metadata.gz: e132dcab6529c17c696390bac5c052d92ea91d8d718715d575a28342da1f85b57d6bdd370b737c5494ae82c0e64f9cc279287d825b11c0fbfee24e2d44554524
+  data.tar.gz: 3daf78e47d35f23add73b1484667f1b5f9b54385013924ae3ce2ee56778bca044856a4b256665dfb342efc83ab0e41558307eb64e97ee6ec1199e519ad6ed4c0

data/.gitignore

@@ -3,4 +3,5 @@
 **/*.DS_Store
 **/*.idea
 Gemfile.lock
+*.gem
 

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

@@ -11,17 +11,19 @@ module MailHandler
       class Email
 
         attr_reader   :sender,
+                      :from,
                       :contacts,
                       :min_time_to_notify,
                       :max_time_to_notify,
                       :current_state
 
-        def initialize(sender, contacts, min_time_to_notify = 60)
+        def initialize(sender, from, to, min_time_to_notify = 60)
 
           @min_time_to_notify = min_time_to_notify
 
           @sender = sender
-          @contacts = contacts
+          @from = from
+          @contacts = to
           init_state
           set_content_handler(EmailContent.new)
 
@@ -44,8 +46,7 @@ module MailHandler
         def send_email(type, search)
 
           verify_email_type(type)
-          content = @content_handler.retrieve(type, search.options, Time.now - search.started_at,
-                                              sender.dispatcher.username, contacts)
+          content = @content_handler.retrieve(type, search.options, Time.now - search.started_at, from, contacts)
           sender.send_email content
 
         end

data/lib/mailhandler/version.rb

@@ -1,3 +1,3 @@
 module MailHandler
-  VERSION = '1.0.35'
+  VERSION = '1.0.36'
 end

data/readme.md

@@ -105,13 +105,14 @@ Console notification is a good option if you are testing email delivery and want
 To add console or email notifications, to your email searching all you need to do is:
 
 ``` ruby
-email_receiver.add_observer(MailHandler::Receiving::Notification::Email.new(email_sender, contacts))
+email_receiver.add_observer(MailHandler::Receiving::Notification::Email.new(email_sender, from, contacts))
 email_receiver.add_observer(MailHandler::Receiving::Notification::Console.new)
 ``` 
 
 For email notifications, the parameters you need are:
 
 * `email_sender` - email sender you will use for sending an email (it should be one of senders described below)
+* `from` - email address from which email is sent 
 * `contacts` - list of contacts to receive the notification (for example: `john@example.com, igor@example.com`
  
 # Email sending 

data/spec/unit/mailhandler/receiving/notification/email_spec.rb

@@ -4,74 +4,60 @@ describe MailHandler::Receiving::Notification::Email do
 
   let(:search) { double('search') }
   let(:sender) { double('sender') }
-  let(:notification) { MailHandler::Receiving::Notification::Email.new(sender, 'igor@example.com',1) }
+  let(:notification) { MailHandler::Receiving::Notification::Email.new(sender, 'from@example.com', 'igor@example.com',1) }
 
   before(:each) do
-
     allow(sender).to receive(:send_email) { true }
     allow(search).to receive(:max_duration) { 5 }
-
   end
 
   it '.create' do
 
     aggregate_failures "init details" do
-
       expect(notification.min_time_to_notify).to eq 1
       expect(notification.max_time_to_notify).to eq nil
       expect(notification.contacts).to eq 'igor@example.com'
       expect(notification.sender).to eq sender
-
     end
 
   end
 
   it '.notify' do
-
     allow(search).to receive(:started_at) { Time.now }
     notification.notify(search)
     expect(notification.max_time_to_notify).to eq search.max_duration
-
   end
 
   context 'states' do
 
     it 'no delay' do
-
       allow(search).to receive(:started_at) { Time.now }
       notification.notify(search)
       expect(notification.current_state).to be_kind_of MailHandler::Receiving::Notification::NoDelay
-
     end
 
     it 'delayed' do
-
       allow(search).to receive(:started_at) { Time.now - 2}
       allow(search).to receive(:result) { false }
       allow(notification).to receive(:send_email) { }
       notification.notify(search)
       expect(notification.current_state).to be_kind_of MailHandler::Receiving::Notification::Delay
-
     end
 
     it 'received' do
-
       allow(search).to receive(:started_at) { Time.now - 2}
       allow(search).to receive(:result) { true }
       allow(notification).to receive(:send_email) { }
       notification.notify(search)
       expect(notification.current_state).to be_kind_of MailHandler::Receiving::Notification::Received
-
     end
 
     it 'max delayed' do
-
       allow(search).to receive(:started_at) { Time.now - 10}
       allow(search).to receive(:result) { false }
       allow(notification).to receive(:send_email) { }
       notification.notify(search)
       expect(notification.current_state).to be_kind_of MailHandler::Receiving::Notification::MaxDelay
-
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.36
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail