Changeset 1958

Timestamp:

07/31/05 08:26:32 (3 years ago)

Author:

minam

Message:

ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/base.rb (modified) (3 diffs)
• trunk/actionmailer/test/mail_service_test.rb (modified) (1 diff)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849
-
-* Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 [Kent Sibilev]

trunk/actionmailer/lib/action_mailer/base.rb

@@ -161 +161 @@
-    attr_reader       :mail
-
+    class << self
+      def method_missing(method_symbol, *parameters)#:nodoc:
+        case method_symbol.id2name
+          when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
+          when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
+          when "new" then nil
+          else super
+        end
+      end
+
+      def receive(raw_email) #:nodoc:
+        logger.info "Received mail:\n #{raw_email}" unless logger.nil?
+        mail = TMail::Mail.parse(raw_email)
+        mail.base64_decode
+        new.receive(mail)
+      end
+
+      # Deliver the given mail object directly. This can be used to deliver
+      # a preconstructed mail object, like:
+      #
+      #   email = MyMailer.create_some_mail(parameters)
+      #   email.set_some_obscure_header "frobnicate"
+      #   MyMailer.deliver(email)
+      def deliver(mail)
+        new.deliver!(mail)
+      end
+    end
+
-    # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
-    # will be initialized according to the named method. If not, the mailer will
@@ -224 +252 @@
-    end
-
-
-
-
-
+
+
+
+
+
-      logger.info "Sent mail:\n #{mail.encoded}" unless logger.nil?
-
-      begin
-@
+
-      rescue Object => e
-        raise e if raise_delivery_errors
-      end
-
-@
+
-    end
-
@@ -335 +364 @@
-        deliveries << mail
-      end
-
-    class << self
-      def method_missing(method_symbol, *parameters)#:nodoc:
-        case method_symbol.id2name
-          when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
-          when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
-          when "new" then nil
-          else super
-        end
-      end
-
-      def receive(raw_email)
-        logger.info "Received mail:\n #{raw_email}" unless logger.nil?
-        mail = TMail::Mail.parse(raw_email)
-        mail.base64_decode
-        new.receive(mail)
-      end
-
-    end
-  end
-end

trunk/actionmailer/test/mail_service_test.rb

@@ -669 +669 @@
-    assert_match(/:/, mail.bcc_addrs.to_s)
-  end
+
+  def test_deliver_with_mail_object
+    mail = TestMailer::create_headers_with_nonalpha_chars(@recipient)
+    assert_nothing_raised { TestMailer.deliver(mail) }
+    assert_equal 1, TestMailer.deliveries.length
+  end
-end
-