tuktuk 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97bb260002d749e3b1ba6d8ba74ca8de38703b910905aca728e216dd67b51f30
-  data.tar.gz: 40f123a96156d45417c19d8e47606753a51aa22975d1e92016808746fd4accfc
+  metadata.gz: 645a6229301a14c9ea9de30d17f6fed26fefbc9f28d8217ca3bc62c092029e59
+  data.tar.gz: 2fa5cd367e612f7a5214d48c670afd07a69b297437db0444fc85f6da750be588
 SHA512:
-  metadata.gz: f2a8ec6b931ed21669bd70ebd30a6cf1bb94ae917f40d41ecc01923f492461e3b790732dc4b994534eaa3a202994c3c70330efe6125f59e19637e56504f9b34b
-  data.tar.gz: 6af566d6997d3e4e0b4773d34c1d0a2f03de59a3e8046c86f90e0a687e1e4869cf47690394a4f04be02bb33c0e50bd64c379ce2a7d4eca0541e2d7abfa7df585
+  metadata.gz: e496e4ab7b6eed91ad413acf28a36d63bd325a0f3638f41d004fe8b02caa27b4256a7c4c85bb1c4e9c3ad1b2308e1bed3c12d58f2a00687f99ea7b651c8121e9
+  data.tar.gz: cdcfd31010bceb164b591699c96b5e9bc010bbfaec53bf3d6f23c2bfee4b1141f34a0ab4ca3b6b70fb7ac2ee8130c6f510069b6216208f07e368488d08344d68

data/lib/tuktuk/tuktuk.rb

@@ -30,16 +30,19 @@ module Tuktuk
 
     def deliver(message, opts = {})
       # raise 'Please pass a valid message object.' unless message[:to]
+      bcc = opts.delete(:bcc) || []
+      bcc = [bcc] if bcc.is_a?(String)
+
       self.options = opts if opts.any?
       mail = Package.build(message)
-      response = lookup_and_deliver(mail)
+      response = lookup_and_deliver(mail, bcc)
       return response, mail
     end
 
     # same as deliver but raises error. used by ActionMailer
-    def deliver!(mail)
+    def deliver!(mail, opts = {})
       @logger = Rails.logger if defined?(Rails) and !config[:log_to]
-      resp, email = deliver(mail)
+      resp, email = deliver(mail, opts)
       if resp.is_a?(Exception)
         raise resp
       else
@@ -89,7 +92,9 @@ module Tuktuk
       hash = {}
       array.each_with_index do |message, i|
         mail = Package.build(message, i)
-        raise "Invalid destination count: #{mail.destinations.count}" if mail.destinations.count != 1
+        if mail.destinations.count != 1
+          raise ArgumentError, "Invalid destination count: #{mail.destinations.count}" 
+        end
 
         if to = mail.destinations.first and domain = get_domain(to)
           domain = domain.downcase
@@ -109,7 +114,7 @@ module Tuktuk
       servers.any? && servers
     end
 
-    def lookup_and_deliver(mail, attempt = 1)
+    def lookup_and_deliver(mail, bcc = [])
       if mail.destinations.empty?
         raise "No destinations found! You need to pass a :to field."
       end
@@ -127,9 +132,10 @@ module Tuktuk
         last_error = nil
         servers.each do |server|
           begin
-            response = send_now(mail, server, to)
+            response = send_now(mail, server, to, bcc)
             break
           rescue Exception => e # explicitly rescue Exception so we catch Timeout:Error's too
+            logger.error "Error: #{e}"
             last_error = e
           end
         end
@@ -210,14 +216,14 @@ module Tuktuk
       responses
     end
 
-    def send_now(mail, server, to)
+    def send_now(mail, server, to, bcc = [])
       logger.info "#{to} - Delivering email at #{server}..."
       from = get_from(mail)
 
       response = nil
       socket = init_connection(server)
       socket.start(get_helo_domain(from), nil, nil, nil) do |smtp|
-        response = smtp.send_message(get_raw_mail(mail), from, to)
+        response = smtp.send_message(get_raw_mail(mail), from, to, *bcc)
         logger.info "#{to} - [SENT] #{response.message.strip}"
       end
 

data/lib/tuktuk/version.rb

@@ -1,7 +1,7 @@
 module Tuktuk
   MAJOR = 0
-  MINOR = 6
-  PATCH = 5
+  MINOR = 7
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/spec/deliver_spec.rb

@@ -1,8 +1,142 @@
 require './lib/tuktuk/tuktuk'
 require 'rspec/mocks'
 
+def email(attrs = {})
+  { :to => "user#{rand(1000)}@domain.com",
+    :from => 'me@company.com',
+    :subject => 'Test email',
+    :body => 'Hello world.'
+  }.merge(attrs)
+end
+
 describe 'deliver' do
 
+  before(:each) do
+    @mock_smtp = double('Net::SMTP', enable_starttls_auto: true, :read_timeout= => true, :open_timeout= => true)
+    @mock_conn = double('SMTP Connection')
+    @mock_smtp.stub(:start).and_yield(@mock_conn)
+    @mock_resp = double('SMTP::Response', message: '250 OK')
+
+    Net::SMTP.stub(:new).and_return(@mock_smtp)
+  end
+
+  describe 'single recipient' do
+
+    describe 'when destination is valid (has MX servers)' do
+
+      before do
+        @servers = ['mx1.domain.com', 'mx2.domain.com', 'mx3.domain.com']
+        Tuktuk.stub(:smtp_servers_for_domain).and_return(@servers)
+      end
+
+      it 'sends message' do
+        msg = email
+        expect(@mock_conn).to receive(:send_message).with(String, msg[:from], msg[:to]).and_return(@mock_resp)
+        Tuktuk.deliver(msg)
+      end
+
+      describe 'and bcc is given' do
+
+        let(:bcc_email) { 'bcc@test.com' }
+
+        it 'includes it in destination list' do
+          msg = email
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to], bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: [bcc_email])
+        end
+
+        it 'also works if not passed as array' do
+          msg = email
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to], bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: bcc_email)
+        end
+
+      end
+
+    end
+
+  end
+
+  describe 'multiple recipients (string list)' do
+
+    describe 'when destination is valid (has MX servers)' do
+
+      before do
+        @servers = ['mx1.domain.com', 'mx2.domain.com', 'mx3.domain.com']
+        Tuktuk.stub(:smtp_servers_for_domain).and_return(@servers)
+      end
+
+      it 'sends message' do
+        msg = email(to: 'some@one.com, another@one.com')
+        expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').first).and_return(@mock_resp)
+        expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').last).and_return(@mock_resp)
+        Tuktuk.deliver(msg)
+      end
+
+      describe 'and bcc is given' do
+
+        let(:bcc_email) { 'bcc@test.com' }
+
+        it 'includes it in destination list' do
+          msg = email(to: 'some@one.com, another@one.com')
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').first, bcc_email).and_return(@mock_resp)
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').last, bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: [bcc_email])
+        end
+
+        it 'also works if not passed as array' do
+          msg = email(to: 'some@one.com, another@one.com')
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').first, bcc_email).and_return(@mock_resp)
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].split(', ').last, bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: bcc_email)
+        end
+
+      end
+
+    end
+
+  end
+
+  describe 'multiple recipients (array)' do
+
+    describe 'when destination is valid (has MX servers)' do
+
+      before do
+        @servers = ['mx1.domain.com', 'mx2.domain.com', 'mx3.domain.com']
+        Tuktuk.stub(:smtp_servers_for_domain).and_return(@servers)
+      end
+
+      it 'sends message' do
+        msg = email(to: ['some@one.com', 'another@one.com'])
+        expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].first).and_return(@mock_resp)
+        expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].last).and_return(@mock_resp)
+        Tuktuk.deliver(msg)
+      end
+
+      describe 'and bcc is given' do
+
+        let(:bcc_email) { 'bcc@test.com' }
+
+        it 'includes it in destination list' do
+          msg = email(to: ['some@one.com', 'another@one.com'])
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].first, bcc_email).and_return(@mock_resp)
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].last, bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: [bcc_email])
+        end
+
+        it 'also works if not passed as array' do
+          msg = email(to: ['some@one.com', 'another@one.com'])
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].first, bcc_email).and_return(@mock_resp)
+          expect(@mock_conn).to receive(:send_message).with(instance_of(String), msg[:from], msg[:to].last, bcc_email).and_return(@mock_resp)
+          Tuktuk.deliver(msg, bcc: bcc_email)
+        end
+
+      end
+
+    end
+
+  end
+
 end
 
 describe 'deliver many' do
@@ -17,7 +151,7 @@ describe 'deliver many' do
     it 'raises' do
       lambda do
         Tuktuk.deliver_many []
-      end.should raise_error
+      end.should raise_error(ArgumentError)
     end
 
   end
@@ -26,8 +160,8 @@ describe 'deliver many' do
 
     it 'raises' do
       lambda do
-        Tuktuk.deliver_many [ email, email(:to => 'one@user.com, two@user.com')]
-      end.should raise_error
+        Tuktuk.deliver_many [ email, email(:to => 'one@user.com, two@user.com') ]
+      end.should raise_error(ArgumentError)
     end
 
   end
@@ -89,7 +223,7 @@ describe 'deliver many' do
           end
 
           it 'starts by delivering to first one' do
-            Tuktuk.should_receive(:send_many_now).once.with('mx1.domain.com', [1]).and_return([[1,'ok']])
+            Tuktuk.should_receive(:send_many_now).once.with('mx1.domain.com', [1]).and_return([[1, 'ok']])
             Tuktuk.send(:lookup_and_deliver_by_domain, 'domain.com', [1])
           end
 
@@ -178,7 +312,7 @@ describe 'deliver many' do
             describe 'and other servers are down' do
 
               before do
-                # TODO: for some reason the :init_connection on line  138 is affecting this
+                # TODO: for some reason the :init_connection on line 138 is affecting this
                 # this test should pass when running on its own
                 # Tuktuk.should_receive(:init_connection).once.with('mx1.domain.com').and_return(@mock_smtp)
                 # Tuktuk.should_receive(:init_connection).once.with('mx2.domain.com').and_raise('Unable to connect.')
@@ -204,12 +338,4 @@ describe 'deliver many' do
 
   end
 
-  def email(attrs = {})
-    { :to => "user#{rand(1000)}@domain.com",
-      :from => 'me@company.com',
-      :subject => 'Test email',
-      :body => 'Hello world.'
-    }.merge(attrs)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuktuk
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler