ar_mailer 1.3.3 → 1.4.0

data/History.txt

@@ -1,9 +1,15 @@
-= 1.3.3
+=== 1.4.0
+
+* 1.8.7 and 1.9 STARTTLS compatibility, now uses smtp_tls gem for STARTTLS on
+  1.8.6
+* Fix 1.9 warnings
+
+=== 1.3.3
 
 * Work around class_inheritable_accessor being the wrong thing for
   ActionMailer::ARMailer.
 
-= 1.3.2
+=== 1.3.2
 
 * Terminate SMTP connection on TimeoutError since Net::SMTP may be in a bogus
   state.  Issue by Eric O'Connell.
@@ -12,14 +18,14 @@
 * Upgraded to modern Hoe
 * Updated configuration information for Rails > 2.0
 
-= 1.3.1
+=== 1.3.1
 
 * Fix bug #12530, gmail causes SSL errors.  Submitted by Kyle Maxwell
   and Alex Ostleitner.
 * Try ActionMailer::Base::server_settings then ::smtp_settings.  Fixes
   bug #12516.  Submitted by Alex Ostleitner.
 
-= 1.3.0
+=== 1.3.0
 
 * New Features
   * Added automatic mail queue cleanup.
@@ -28,7 +34,7 @@
 * Bugs fixed
   * Authentication errors are now handled by retrying once.
 
-= 1.2.0
+=== 1.2.0
 
 * Bugs fixed
   * Handle SMTPServerBusy by backing off @delay seconds then re-queueing
@@ -41,7 +47,7 @@
   * Supports TLS now.  Requested by Dave Thomas. smtp_tls.rb from Kyle
     Maxwell & etc.
 
-= 1.1.0
+=== 1.1.0
 
 * Features
   * Added --chdir to set rails directory
@@ -56,11 +62,11 @@
     * Messages are removed from the queue on 5xx errors
     * Added Net::SMTP.reset to avoid needing to recreate the connection
 
-= 1.0.1
+=== 1.0.1
 
 * Bugs fixed
   * From and to of email destination were swapped
 
-= 1.0.0
+=== 1.0.0
 
 * Birthday

data/Manifest.txt

@@ -6,8 +6,8 @@ Rakefile
 bin/ar_sendmail
 lib/action_mailer/ar_mailer.rb
 lib/action_mailer/ar_sendmail.rb
-lib/smtp_tls.rb
 share/ar_sendmail
 test/action_mailer.rb
+test/active_support.rb
 test/test_armailer.rb
 test/test_arsendmail.rb

data/Rakefile

@@ -1,12 +1,11 @@
 require 'hoe'
 
-$:.unshift 'lib'
-require 'action_mailer/ar_sendmail'
-
-Hoe.new 'ar_mailer', ActionMailer::ARSendmail::VERSION do |ar_mailer|
-  ar_mailer.rubyforge_name = 'seattlerb'
-  ar_mailer.developer 'Eric Hodel', 'drbrain@segment7.net'
-  ar_mailer.testlib = :minitest
-  ar_mailer.extra_dev_deps << ['minitest', '~> 1.3']
+Hoe.plugin :seattlerb
+
+Hoe.spec 'ar_mailer' do
+  self.rubyforge_name = 'seattlerb'
+  developer 'Eric Hodel', 'drbrain@segment7.net'
+
+  extra_dev_deps << ['minitest', '~> 1.3']
 end
 

data/lib/action_mailer/ar_sendmail.rb

@@ -1,7 +1,12 @@
 require 'optparse'
 require 'net/smtp'
-require 'smtp_tls'
 require 'rubygems'
+require 'openssl'
+begin
+  require 'smtp_tls'
+rescue LoadError
+  # only for 1.8.6 versions
+end
 
 class Object # :nodoc:
   unless respond_to? :path2class then
@@ -14,20 +19,16 @@ end
 ##
 # Hack in RSET
 
-module Net # :nodoc:
-class SMTP # :nodoc:
+class Net::SMTP
 
-  unless instance_methods.include? 'reset' then
-    ##
-    # Resets the SMTP connection.
+  ##
+  # Resets the SMTP connection.
 
-    def reset
-      getok 'RSET'
-    end
+  def reset
+    getok 'RSET'
   end
 
-end
-end
+end unless Net::SMTP.method_defined? :reset
 
 module ActionMailer; end # :nodoc:
 
@@ -36,9 +37,8 @@ module ActionMailer; end # :nodoc:
 # SMTP server configured in your application's config/environment.rb.
 # ar_sendmail does not work with sendmail delivery.
 #
-# ar_mailer can deliver to SMTP with TLS using smtp_tls.rb borrowed from Kyle
-# Maxwell's action_mailer_optional_tls plugin.  Simply set the :tls option in
-# ActionMailer::Base's smtp_settings to true to enable TLS.
+# ar_mailer can deliver to SMTP with TLS using the smtp_tls gem Set the :tls
+# option in ActionMailer::Base's smtp_settings to true to enable TLS.
 #
 # See ar_sendmail -h for the full list of supported options.
 #
@@ -54,7 +54,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -167,7 +167,8 @@ end
 
       puts "%10d %8d %s  %s" % [email.id, size, created, email.from]
       if email.last_send_attempt > 0 then
-        puts "Last send attempt: #{Time.at email.last_send_attempt}"
+        last_send_attempt = Time.at email.last_send_attempt
+        puts "Last send attempt: #{last_send_attempt.asctime}"
       end
       puts "                                         #{email.to}"
       puts
@@ -191,7 +192,7 @@ end
     options[:RailsEnv] = ENV['RAILS_ENV']
     options[:TableName] = 'Email'
 
-    opts = OptionParser.new do |opts|
+    op = OptionParser.new do |opts|
       opts.banner = "Usage: #{name} [options]"
       opts.separator ''
 
@@ -277,8 +278,8 @@ end
               "Name of table holding emails",
               "Used for both sendmail and",
               "migration creation",
-              "Default: #{options[:TableName]}") do |name|
-        options[:TableName] = name
+              "Default: #{options[:TableName]}") do |table_name|
+        options[:TableName] = table_name
       end
 
       opts.on("-v", "--[no-]verbose",
@@ -295,7 +296,7 @@ end
       opts.separator ''
     end
 
-    opts.parse! args
+    op.parse! args
 
     return options if options.include? :Migrate or options.include? :Model
 
@@ -305,7 +306,7 @@ end
       begin
         require 'config/environment'
       rescue LoadError
-        usage opts, <<-EOF
+        usage op, <<-EOF
 #{name} must be run from a Rails application's root to deliver email.
 #{Dir.pwd} does not appear to be a Rails application root.
           EOF
@@ -405,11 +406,14 @@ end
 
   def deliver(emails)
     user = smtp_settings[:user] || smtp_settings[:user_name]
-    Net::SMTP.start smtp_settings[:address], smtp_settings[:port],
-                    smtp_settings[:domain], user,
-                    smtp_settings[:password],
-                    smtp_settings[:authentication],
-                    smtp_settings[:tls] do |smtp|
+    server = Net::SMTP.new smtp_settings[:address], smtp_settings[:port]
+    server.start smtp_settings[:domain], user, smtp_settings[:password],
+                 smtp_settings[:authentication] do |smtp|
+      if smtp_settings[:tls] then
+        raise 'gem install smtp_tls for 1.8.6' unless
+          server.respond_to? :starttls
+        smtp.enable_starttls
+      end
       @failed_auth_count = 0
       until emails.empty? do
         email = emails.shift

data/test/action_mailer.rb

@@ -1,5 +1,8 @@
 require 'net/smtp'
-require 'smtp_tls'
+begin
+  require 'smtp_tls'
+rescue LoadError
+end
 require 'time'
 
 class Net::SMTP
@@ -17,14 +20,8 @@ class Net::SMTP
     attr_reader :deliveries
     attr_reader :send_message_block
     attr_accessor :reset_called
+    attr_accessor :start_block
 
-    send :remove_method, :start
-
-  end
-
-  def self.start(*args)
-    @start_block.call if @start_block
-    yield new(nil)
   end
 
   def self.on_send_message(&block)
@@ -42,6 +39,13 @@ class Net::SMTP
     @reset_called = 0
   end
 
+  alias test_old_start start
+
+  def start(*args)
+    self.class.start_block.call if self.class.start_block
+    yield self
+  end
+
   alias test_old_reset reset if instance_methods.include? 'reset'
 
   def reset

data/test/test_arsendmail.rb

@@ -91,7 +91,7 @@ end
                                          recip@h1.example.com
 
          3        5 Thu Aug 10 11:19:51  nobody@example.com
-Last send attempt: Thu Aug 10 11:40:05 -0700 2006
+Last send attempt: Thu Aug 10 11:40:05 2006
                                          recip@h2.example.com
 
 -- 0 Kbytes in 3 Requests.
@@ -608,7 +608,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
       { :mail => 'body2', :to => 'recip@h2.example.com', :from => nobody },
     ]
 
-    emails = email_data.map do |email_data| Email.create email_data end
+    emails = email_data.map do |email| Email.create email end
 
     tried = Email.create :mail => 'body3', :to => 'recip@h3.example.com',
                          :from => nobody

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors: 
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2009-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 2.3.0
     version: 
 description: |-
   ar_mailer is a two-phase delivery agent for ActionMailer.  Even delivering
@@ -78,9 +78,9 @@ files:
 - bin/ar_sendmail
 - lib/action_mailer/ar_mailer.rb
 - lib/action_mailer/ar_sendmail.rb
-- lib/smtp_tls.rb
 - share/ar_sendmail
 - test/action_mailer.rb
+- test/active_support.rb
 - test/test_armailer.rb
 - test/test_arsendmail.rb
 has_rdoc: true
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.4.2217
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: ar_mailer is a two-phase delivery agent for ActionMailer

data/lib/smtp_tls.rb

@@ -1,105 +0,0 @@
-# Original code believed public domain from ruby-talk or ruby-core email.
-# Modifications by Kyle Maxwell <kyle@kylemaxwell.com> used under MIT license.
-
-require "openssl"
-require "net/smtp"
-
-# :stopdoc:
-
-class Net::SMTP
-
-  class << self
-    send :remove_method, :start
-  end
-
-  def self.start( address, port = nil,
-                  helo = 'localhost.localdomain',
-                  user = nil, secret = nil, authtype = nil, use_tls = false,
-                  &block) # :yield: smtp
-    new(address, port).start(helo, user, secret, authtype, use_tls, &block)
-  end
-
-  alias tls_old_start start
-
-  def start( helo = 'localhost.localdomain',
-             user = nil, secret = nil, authtype = nil, use_tls = false ) # :yield: smtp
-    start_method = use_tls ? :do_tls_start : :do_start
-    if block_given?
-      begin
-        send start_method, helo, user, secret, authtype
-        return yield(self)
-      ensure
-        do_finish
-      end
-    else
-      send start_method, helo, user, secret, authtype
-      return self
-    end
-  end
-
-  private
-
-  def do_tls_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
-    check_auth_args user, secret, authtype if user or secret
-
-    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-    @socket = Net::InternetMessageIO.new(sock)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-
-    check_response(critical { recv_response() })
-    do_helo(helodomain)
-
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    starttls
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-    do_helo(helodomain)
-
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-        @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
-    end
-  end
-
-  def do_helo(helodomain)
-     begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
-    end
-  end
-
-  def starttls
-    getok('STARTTLS')
-  end
-
-  alias tls_old_quit quit
-
-  def quit
-    begin
-      getok('QUIT')
-    rescue EOFError
-    end
-  end
-
-end unless Net::SMTP.private_method_defined? :do_tls_start or
-           Net::SMTP.method_defined? :tls?