mail 1.3.5 → 1.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== Sun Dec 27 09:51:27 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 1.4 because now :to_s calls :decoded for all fields and body while
+  :to_s calls :encoded for Message and Header containers.  Makes sense... really.
+
 == Sun Dec 27 07:30:02 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Changed fields to default to :decoded on :to_s, all container objects retain :encoded as the default for :to_s

data/README.rdoc

@@ -113,8 +113,8 @@ I have tried to simplify it some:
 3. By default, calling :to_s on a container object will call it's encoded method, while
    :to_s on a field object will call it's decoded method.  So calling :to_s on a Mail
    object will return the mail, all encoded ready to send, while calling :to_s on the
-   From field will return the decoded value of the field.  The body and headers of Mail
-   objects are considered containers.  If you are in doubt, call :encoded, or :decoded
+   From field or the body will return the decoded value of the object.  The header object
+   of Mail is considered a container.  If you are in doubt, call :encoded, or :decoded
    explicitly, this is safer if you are not sure.
    
 4. Structured fields that have parameter values that can be encoded (e.g. Content-Type) will

data/Rakefile

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

data/lib/mail/body.rb

@@ -97,16 +97,13 @@ module Mail
     # raw source.  Need to implement
     def encoded
       if multipart?
-        encoded_parts = parts.map { |p| p.to_s }
+        encoded_parts = parts.map { |p| p.encoded }
         ([preamble] + encoded_parts).join(crlf_boundary) + end_boundary + epilogue.to_s
       else
         raw_source.to_crlf
       end
     end
     
-    alias :to_s :encoded
-    
-    # Returns the raw source right now.  Need to implement
     def decoded
       if encoding.nil? || !Encodings.defined?(encoding)
         raw_source.to_lf
@@ -115,6 +112,10 @@ module Mail
       end
     end
     
+    def to_s
+      decoded
+    end
+    
     def charset
       @charset
     end

data/lib/mail/header.rb

@@ -165,7 +165,13 @@ module Mail
       buffer
     end
 
-    alias :to_s :encoded
+    def to_s
+      encoded
+    end
+    
+    def decoded
+      raise NoMethodError, 'Can not decode an entire header as there could be character set conflicts, try calling #decoded on the various fields.'
+    end
 
     # Returns true if the header has a Message-ID defined (empty or not)
     def has_message_id?

data/lib/mail/message.rb

@@ -764,8 +764,10 @@ module Mail
       buffer
     end
     
-    alias :to_s :encoded
-    
+    def to_s
+      encoded
+    end
+
     def decoded
       raise NoMethodError, 'Can not decode an entire message, try calling #decoded on the various fields and body or parts if it is a multipart message.'
     end
@@ -900,7 +902,7 @@ module Mail
       if filename = attachment?
         encoding = content_transfer_encoding.encoding if content_transfer_encoding
         @attachment = Mail::Attachment.new(:filename => filename,
-                                           :data => body.to_s,
+                                           :data => body.encoded,
                                            :encoding => encoding)
       end
     end

data/lib/mail/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors: 
 - Mike Lindsaar