mail 2.1.1 → 2.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== Thu Jan 28 00:25:02 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Added TMM1's patch to not raise errors if a email is not multipart/report
+* Added html_part and text_part now return the first text/html or text/plain part they find. Order is from top to bottom of the email, all parts, flattened.
+* Version bump to 2.1.2
+
 == Mon Jan 25 11:36:13 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Added ability for address fields to init on an array instead of just a string.

data/README.rdoc

@@ -219,11 +219,9 @@ what you are doing.
 
 === Sending an email:
 
- require 'mail'
-
- Mail.defaults do
-   smtp '127.0.0.1', 25
- end
+Mail defaults to sending via SMTP to local host port 25.  If you have a 
+sendmail or postfix daemon running on on this port, sending email is as
+easy as:
 
  Mail.deliver do
        from 'me@test.lindsaar.net'
@@ -235,10 +233,6 @@ what you are doing.
 
 or
  
- Mail.defaults do
-   smtp '127.0.0.1' # Port 25 defult
- end
-
  mail = Mail.new do
        from 'me@test.lindsaar.net'
          to 'you@test.lindsaar.net'
@@ -249,6 +243,22 @@ or
  
  mail.deliver!
 
+Sending via sendmail can be done like so:
+
+  mail = Mail.new do
+        from 'me@test.lindsaar.net'
+          to 'you@test.lindsaar.net'
+     subject 'Here is the image you wanted'
+        body File.read('body.txt')
+    add_file {:filename => 'somefile.png', :content => File.read('/somefile.png')}
+  end
+  
+  mail.delivery_method :sendmail
+  
+  mail.deliver
+
+mail.deliver!
+
 
 === Getting emails from a pop server:
 
@@ -344,10 +354,6 @@ simple as possible.... (asking a lot from a mail library)
 
  require 'mail'
 
- Mail.defaults do
-   smtp '127.0.0.1' # Port 25 defult
- end
-
  mail = Mail.deliver do
    to 'nicolas@test.lindsaar.net.au'
    from 'Mikel Lindsaar <mikel@test.lindsaar.net.au>'

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "2.1.1"
+  s.version     = "2.1.2"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"

data/lib/mail/message.rb

@@ -1379,31 +1379,31 @@ module Mail
     end
     
     def bounced?
-      delivery_status_part.bounced?
+      delivery_status_part and delivery_status_part.bounced?
     end
     
     def action
-      delivery_status_part.action
+      delivery_status_part and delivery_status_part.action
     end
     
     def final_recipient
-      delivery_status_part.final_recipient
+      delivery_status_part and delivery_status_part.final_recipient
     end
     
     def error_status
-      delivery_status_part.error_status
+      delivery_status_part and delivery_status_part.error_status
     end
 
     def diagnostic_code
-      delivery_status_part.diagnostic_code
+      delivery_status_part and delivery_status_part.diagnostic_code
     end
     
     def remote_mta
-      delivery_status_part.remote_mta
+      delivery_status_part and delivery_status_part.remote_mta
     end
     
     def retryable?
-      delivery_status_part.retryable?
+      delivery_status_part and delivery_status_part.retryable?
     end
     
     # Returns the current boundary for this message part
@@ -1465,7 +1465,7 @@ module Mail
         add_multipart_alternate_header unless html_part.blank?
         add_part(@html_part)
       else
-        @html_part
+        @html_part || find_first_mime_type('text/html')
       end
     end
     
@@ -1476,7 +1476,7 @@ module Mail
         add_multipart_alternate_header unless html_part.blank?
         add_part(@text_part)
       else
-        @text_part
+        @text_part || find_first_mime_type('text/plain')
       end
     end
     
@@ -1649,6 +1649,14 @@ module Mail
     def filename
       find_attachment
     end
+
+    def all_parts
+      parts.map { |p| [p, p.all_parts] }.flatten
+    end
+
+    def find_first_mime_type(mt)
+      all_parts.detect { |p| p.mime_type == mt }
+    end
     
   private
 

data/lib/mail/network/delivery_methods/smtp.rb

@@ -28,8 +28,8 @@ module Mail
   #     delivery_method :smtp, { :address              => "smtp.gmail.com",
   #                              :port                 => 587,
   #                              :domain               => 'baci.lindsaar.net',
-  #                              :user_name            => 'raasdnil',
-  #                              :password             => 'g333ma11',
+  #                              :user_name            => '<username>',
+  #                              :password             => '<password>',
   #                              :authentication       => 'plain',
   #                              :enable_starttls_auto => true  }
   #   end

data/lib/mail/part.rb

@@ -32,7 +32,7 @@ module Mail
     end
     
     def bounced?
-      (action =~ /failed/i)
+      !!(action =~ /failed/i)
     end
     
     def action

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 2
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +11:00
+date: 2010-01-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency