adzap-ar_mailer 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,8 @@
+= 2.0.1
+
+* Added option to use smtp setting of :tls => false to disable TLS auto start in Ruby 1.8.7+
+* Removed some cruft which can be handled by ActiveSupport
+
 = 2.0.0
 
 * Removed need to use ARMailer subclass. Just set the delivery method and you are ready to go. Backwards compatible with a deprecation notice if you subclass old ARMailer class.

data/README.rdoc

@@ -104,6 +104,16 @@ See <tt>ar_sendmail -h</tt> for full details.
 If you want to set the ActiveRecord model that emails will be stored in,
 see ActionMailer::Base.email_class=
 
+=== A word on TLS
+
+If you are using Ruby 1.8.7 or above TLS will be enabled automatically if your
+SMTP server supports it. If you do not want it to automatically enabled then
+set the :tls option to false in your smtp_settings.
+
+If you on Ruby 1.8.6 or less then the TLS patch included in this plugin will
+be loaded, so you don't need another TLS plugin to add the capability. This 
+patch allows you to explicit set if the server supports TLS by setting the
+:tls option to true in your smtp_settings.
 
 === Help
 

data/lib/action_mailer/ar_mailer.rb

@@ -15,21 +15,11 @@ end
 
 class ActionMailer::Base
 
-  @@email_class = Email
-
-  ##
-  # Current email class for deliveries.
-
-  def self.email_class
-    @@email_class
-  end
-
   ##
-  # Sets the email class for deliveries.
-
-  def self.email_class=(klass)
-    @@email_class = klass
-  end
+  # Set the email class for deliveries.
+  #
+  cattr_accessor :email_class
+  self.email_class = Email
 
   ##
   # Adds +mail+ to the Email table.  Only the first From address for +mail+ is
@@ -37,10 +27,8 @@ class ActionMailer::Base
 
   def perform_delivery_activerecord(mail)
     mail.destinations.each do |destination|
-      @@email_class.create :mail => mail.encoded, :to => destination,
-                           :from => mail.from.first
+      self.class.email_class.create :mail => mail.encoded, :to => destination, :from => mail.from.first
     end
   end
 
 end
-

data/lib/action_mailer/ar_sendmail.rb

@@ -3,14 +3,6 @@ require 'net/smtp'
 require 'smtp_tls' unless Net::SMTP.instance_methods.include?("enable_starttls_auto")
 require 'rubygems'
 
-class Object # :nodoc:
-  unless respond_to? :path2class then
-    def self.path2class(path)
-      path.split(/::/).inject self do |k,n| k.const_get n end
-    end
-  end
-end
-
 ##
 # Hack in RSET
 
@@ -54,7 +46,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -415,7 +407,7 @@ end
 
     @batch_size = options[:BatchSize]
     @delay = options[:Delay]
-    @email_class = Object.path2class options[:TableName]
+    @email_class = options[:TableName].constantize
     @once = options[:Once]
     @verbose = options[:Verbose]
     @max_age = options[:MaxAge]
@@ -449,7 +441,7 @@ end
     
     smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
     if smtp.respond_to?(:enable_starttls_auto)
-      smtp.enable_starttls_auto
+      smtp.enable_starttls_auto unless smtp_settings[:tls] == false
     else
       settings << smtp_settings[:tls]
     end

data/test/test_armailer.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
+require 'rubygems'
+require 'active_support'
 require 'action_mailer'
 require 'action_mailer/ar_mailer'
 

data/test/test_arsendmail.rb

@@ -663,4 +663,3 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-04-12 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []