Changeset 6094

Timestamp:

01/31/07 02:07:09 (3 years ago)

Author:

nzkoz

Message:

Deprecate server_settings renaming it to smtp_settings, add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]

Files:

• branches/1-2-stable/actionmailer/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/actionmailer/lib/action_mailer/base.rb (modified) (7 diffs)
• branches/1-2-stable/actionmailer/test/mail_service_test.rb (modified) (1 diff)

branches/1-2-stable/actionmailer/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Deprecate server_settings renaming it to smtp_settings,  add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]
+
-*1.3.1* (January 16th, 2007)
-

branches/1-2-stable/actionmailer/lib/action_mailer/base.rb

@@ -185 +185 @@
-  #   Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
-  #
-erver_settings</tt> -  Allows detailed configuration of the server
+mtp_settings</tt> -  Allows detailed configuration for :smtp delivery method
-  #   * <tt>:address</tt> Allows you to use a remote mail server. Just change it from its default "localhost" setting.
-  #   * <tt>:port</tt> On the off chance that your mail server doesn't run on port 25, you can change it.
@@ -194 +194 @@
-  #     This is a symbol and one of :plain, :login, :cram_md5
-  #
+  # * <tt>sendmail_settings</tt> - Allows you to override options for the :sendmail delivery method
+  #   * <tt>:location</tt> The location of the sendmail executable, defaults to "/usr/sbin/sendmail"
+  #   * <tt>:arguments</tt> The command line arguments
-  # * <tt>raise_delivery_errors</tt> - whether or not errors should be raised if the email fails to be delivered.
-  #
-  # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.
-  #   Sendmail is assumed to be present at "/usr/sbin/sendmail".
-  #
-  # * <tt>perform_deliveries</tt> - Determines whether deliver_* methods are actually carried out. By default they are,
@@ -229 +231 @@
-    cattr_accessor :logger
-
-erver
+mtp
-      :address        => "localhost", 
-      :port           => 25, 
@@ -237 +239 @@
-      :authentication => nil
-    }
-
+
+
+
+
+
+
+
-
-    @@raise_delivery_errors = true
@@ -356 +364 @@
-        new.deliver!(mail)
-      end
+      
+      # Server Settings is the old name for <tt>smtp_settings</tt>
+      def server_settings
+        smtp_settings
+      end
+      deprecate :server_settings=>"It's now named smtp_settings"
+      
+      def server_settings=(settings)
+        ActiveSupport::Deprecation.warn("server_settings has been renamed smtp_settings, this warning will be removed with rails 2.0", caller)
+        self.smtp_settings=settings
+      end
+      
-    end
-
@@ -543 +563 @@
-        mail.ready_to_send
-
-erver_settings[:address], server_settings[:port], server
-erver_settings[:user_name], server_settings[:password], server
+mtp_settings[:address], smtp_settings[:port], smtp
+mtp_settings[:user_name], smtp_settings[:password], smtp
-          smtp.sendmail(mail.encoded, mail.from, destinations)
-        end
@@ -550 +570 @@
-
-      def perform_delivery_sendmail(mail)
-/usr/sbin/sendmail -i -t
+#{sendmail_settings[:location]} #{sendmail_settings[:arguments]}
-          sm.print(mail.encoded.gsub(/\r/, ''))
-          sm.flush

branches/1-2-stable/actionmailer/test/mail_service_test.rb

@@ -788 +788 @@
-    assert_match %r{charset=utf-8}, mail['content-type'].to_s
-  end
+  
+  def test_deprecated_server_settings
+    old_smtp_settings = ActionMailer::Base.smtp_settings
+    assert_deprecated do
+      ActionMailer::Base.server_settings
+    end
+    assert_deprecated do
+      ActionMailer::Base.server_settings={}
+      assert_equal Hash.new, ActionMailer::Base.smtp_settings
+    end
+  ensure
+    ActionMailer::Base.smtp_settings=old_smtp_settings    
+  end
-end
-