mail 1.4.1 → 1.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== Mon 28 Dec 2009 01:21:52 UTC Mikel Lindsaar <raasdnil@gmail.com>
+
+* Added sorting of parts, default is text/plain, then text/enriched and text/html.  Access through  Body#set_sort_order and Body#sort_parts! (called from Body#encode automatically)
+* Version bump to 1.4.2
+
 == Sun Dec 27 10:38:24 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Updating treetop and mail to initialize uninitialized instance variables to

data/Rakefile

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

data/lib/mail/body.rb

@@ -30,6 +30,7 @@ module Mail
       @boundary = nil
       @preamble = nil
       @epilogue = nil
+      @part_sort_order = [ "text/plain", "text/enriched", "text/html" ]
       @parts = []
       if string.blank?
         @raw_source = ''
@@ -89,7 +90,26 @@ module Mail
     def match(regexp)
       self.decoded.match(regexp)
     end
-    
+
+    # Allows you to set the sort order of the parts, overriding the default sort order.
+    # Defaults to 'text/plain', then 'text/enriched', then 'text/html' with any other content
+    # type coming after.
+    def set_sort_order(order)
+      @part_sort_order = order
+    end
+    
+    # Allows you to sort the parts according to the default sort order, or the sort order you
+    # set with :set_sort_order.
+    #
+    # sort_parts! is also called from :encode, so there is no need for you to call this explicitly
+    def sort_parts!
+      order = @part_sort_order
+      @parts = @parts.sort do |a, b|
+        a_order = order.index(a.content_type.string.downcase) || 1000
+        b_order = order.index(b.content_type.string.downcase) || 1000
+        a_order <=> b_order
+      end
+    end
     
     # Returns the raw source that the body was initialized with, without
     # any tampering
@@ -101,6 +121,7 @@ module Mail
     # raw source.  Need to implement
     def encoded
       if multipart?
+        self.sort_parts!
         encoded_parts = parts.map { |p| p.encoded }
         ([preamble] + encoded_parts).join(crlf_boundary) + end_boundary + epilogue.to_s
       else

data/lib/mail/message.rb

@@ -486,7 +486,8 @@ module Mail
       if body.only_us_ascii?
         content_type.parameters['charset'] = 'US-ASCII'
       else
-        STDERR.puts("Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.")
+        warning = "Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.\nCalled from:\n#{caller.join("\n")}"
+        STDERR.puts(warning)
         content_type.parameters['charset'] = 'UTF-8'
       end
     end
@@ -498,7 +499,8 @@ module Mail
       if body.only_us_ascii?
         header['Content-Transfer-Encoding'] = '7bit'
       else
-        STDERR.puts("Non US-ASCII detected and no content-transfer-encoding defined.\nDefaulting to 8bit, set your own if this is incorrect.")
+        warning = "Non US-ASCII detected and no content-transfer-encoding defined.\nDefaulting to 8bit, set your own if this is incorrect.\nCalled from:\n#{caller.join("\n")}"
+        STDERR.puts(warning)
         header['Content-Transfer-Encoding'] = '8bit'
       end
     end

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 1
     MINOR = 4
-    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: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 +11:00
+date: 2009-12-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency