mail 2.2.2 → 2.2.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== Tue Jun  8 01:55:21 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added inline attachment support to mail (mikel)
+
 == Mon Jun  7 18:00:39 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
 
 * Updating versioning so we only have one source, VERSION.yml (mikel)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 2
 :build: 
 :minor: 2

data/lib/mail/attachments_list.rb

@@ -3,6 +3,7 @@ module Mail
 
     def initialize(parts_list)
       @parts_list = parts_list
+      @content_disposition_type = 'attachment'
       parts_list.map { |p|
         if p.content_type == "message/rfc822"
           Mail.new(p.body).attachments
@@ -15,6 +16,11 @@ module Mail
       self
     end
 
+    def inline
+      @content_disposition_type = 'inline'
+      self
+    end
+
     # Returns the attachment by filename or at index.
     #
     # mail.attachments['test.png'] = File.read('test.png')
@@ -33,7 +39,7 @@ module Mail
     def []=(name, value)
       default_values = { :content_type => "#{set_mime_type(name)}; filename=\"#{name}\"",
                          :content_transfer_encoding => "#{guess_encoding}",
-                         :content_disposition => "attachment; filename=\"#{name}\"" }
+                         :content_disposition => "#{@content_disposition_type}; filename=\"#{name}\"" }
 
       if value.is_a?(Hash)
 

data/lib/mail/message.rb

@@ -1644,6 +1644,7 @@ module Mail
     # ready to send
     def ready_to_send!
       identify_and_set_transfer_encoding
+      parts.sort!([ "text/plain", "text/enriched", "text/html", "multipart/alternative" ])
       parts.each do |part| 
         part.transport_encoding = transport_encoding
         part.ready_to_send!
@@ -1695,7 +1696,7 @@ module Mail
     end
 
     def decode_body
-        body.decoded
+      body.decoded
     end
     
     # Returns true if this part is an attachment

data/lib/mail/part.rb

@@ -19,10 +19,24 @@ module Mail
     end
     
     def inline_content_id
+      # TODO: Deprecated in 2.2.2 - Remove in 2.3
+      STDERR.puts("Part#inline_content_id is deprecated, please call Part#cid instead")
+      cid
+    end
+    
+    def cid
       add_content_id unless has_content_id?
       uri_escape(unbracket(content_id))
     end
     
+    def url
+      "cid:#{cid}"
+    end
+    
+    def inline?
+      header[:content_disposition].disposition_type == 'inline' if header[:content_disposition]
+    end
+    
     def add_required_fields
       add_content_id unless has_content_id?
       super

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Mikel Lindsaar