tuktuk 0.4.4 → 0.4.5

data/lib/tuktuk/tuktuk.rb

@@ -12,6 +12,7 @@ DEFAULTS = {
   :max_workers  => 0,
   :read_timeout => 20,
   :open_timeout => 20,
+  :helo_domain  => nil,
   :verify_ssl   => true,
   :log_to       => nil # $stdout,
 }
@@ -93,6 +94,7 @@ module Tuktuk
         raise "Invalid destination count: #{mail.destinations.count}" if mail.destinations.count != 1
 
         if to = mail.destinations.first and domain = get_domain(to)
+          domain = domain.downcase
           hash[domain] = [] if hash[domain].nil?
           hash[domain].push(mail)
         end
@@ -136,7 +138,7 @@ module Tuktuk
     end
 
     def lookup_and_deliver_many(by_domain)
-      if config[:max_workers] && config[:max_workers] > 0
+      if config[:max_workers] && config[:max_workers] != 0
         lookup_and_deliver_many_threaded(by_domain)
       else
         lookup_and_deliver_many_sync(by_domain)
@@ -144,7 +146,8 @@ module Tuktuk
     end
 
     def lookup_and_deliver_many_threaded(by_domain)
-      queue = WorkQueue.new(config[:max_workers])
+      count = config[:max_workers].is_a?(Integer) ? config[:max_workers] : nil
+      queue = WorkQueue.new(count)
       responses = []
 
       by_domain.each do |domain, mails|
@@ -157,7 +160,8 @@ module Tuktuk
         end # worker
       end
 
-      queue.join
+      queue.join # wait for threads to finish
+      queue.kill # terminate queue
       responses
     end
 
@@ -230,6 +234,7 @@ module Tuktuk
           unless timeout_error
             begin
               resp = smtp.send_message(get_raw_mail(mail), get_from(mail), mail.to)
+              smtp.send(:getok, 'RSET') if server['hotmail'] # fix for '503 Sender already specified'
             rescue Net::SMTPError, EOFError, Timeout::Error => e # may be Net::SMTPFatalError (550 Mailbox not found)
               # logger.error e.inspect
               timeout_error = e if e.is_a?(Timeout::Error)

data/lib/tuktuk/version.rb

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

metadata

@@ -1,103 +1,111 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tuktuk
-version: !ruby/object:Gem::Version
-  version: 0.4.4
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 5
+  version: 0.4.5
 platform: ruby
-authors:
-- Tomás Pollak
+authors: 
+- "Tom\xC3\xA1s Pollak"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: net-dns
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mail
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: dkim
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: dkim
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: work_queue
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: work_queue
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
+  type: :runtime
+  version_requirements: *id005
 description: Easy way of sending DKIM-signed emails from Ruby, no dependencies needed.
-email:
+email: 
 - tomas@forkhq.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -111,26 +119,38 @@ files:
 - tuktuk.gemspec
 homepage: https://github.com/tomas/tuktuk
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: tuktuk
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: SMTP client for Ruby with DKIM support.
 test_files: []
+