mail 1.1.0 → 1.2.1

data/lib/mail/fields/from_field.rb

@@ -31,10 +31,19 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'from'
+    CAPITALIZED_FIELD = 'From'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+
   end
 end

data/lib/mail/fields/in_reply_to_field.rb

@@ -33,9 +33,18 @@ module Mail
     include Mail::CommonMessageId
     
     FIELD_NAME = 'in-reply-to'
+    CAPITALIZED_FIELD = 'In-Reply-To'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/keywords_field.rb

@@ -5,9 +5,10 @@ module Mail
   class KeywordsField < StructuredField
     
     FIELD_NAME = 'keywords'
+    CAPITALIZED_FIELD = 'Keywords'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
     def phrase_list
@@ -18,5 +19,13 @@ module Mail
       phrase_list.phrases
     end
     
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{keywords.join(', ')}\r\n"
+    end
+    
+    def decoded
+      keywords.join(', ')
+    end
+    
   end
 end

data/lib/mail/fields/message_id_field.rb

@@ -35,15 +35,16 @@ module Mail
     include Mail::CommonMessageId
     
     FIELD_NAME = 'message-id'
+    CAPITALIZED_FIELD = 'Message-ID'
     
     def initialize(*args)
       @uniq = 1
       if args.last.blank?
-        self.name = FIELD_NAME
+        self.name = CAPITALIZED_FIELD
         self.value = generate_message_id
         self
       else
-        super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
       end
     end
     
@@ -59,6 +60,14 @@ module Mail
       "<#{message_id}>"
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+    
     private
     
     def generate_message_id

data/lib/mail/fields/mime_version_field.rb

@@ -6,14 +6,15 @@ module Mail
   class MimeVersionField < StructuredField
     
     FIELD_NAME = 'mime-version'
+    CAPITALIZED_FIELD = 'Mime-Version'
 
     def initialize(*args)
       if args.last.blank?
-        self.name = FIELD_NAME
+        self.name = CAPITALIZED_FIELD
         self.value = '1.0'
         self
       else
-        super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
       end
     end
     
@@ -38,5 +39,13 @@ module Mail
       element.minor.to_i
     end
     
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{value}\r\n"
+    end
+    
+    def decoded
+      value
+    end
+    
   end
 end

data/lib/mail/fields/received_field.rb

@@ -23,9 +23,10 @@ module Mail
   class ReceivedField < StructuredField
     
     FIELD_NAME = 'received'
+    CAPITALIZED_FIELD = 'Received'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
     def tree
@@ -45,5 +46,13 @@ module Mail
       element.info
     end
     
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{value}"
+    end
+    
+    def decoded
+      value
+    end
+    
   end
 end

data/lib/mail/fields/references_field.rb

@@ -33,9 +33,18 @@ module Mail
     include CommonMessageId
     
     FIELD_NAME = 'references'
+    CAPITALIZED_FIELD = 'References'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/reply_to_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'reply-to'
+    CAPITALIZED_FIELD = 'Reply-To'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/resent_bcc_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'resent-bcc'
+    CAPITALIZED_FIELD = 'Resent-Bcc'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/resent_cc_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'resent-cc'
+    CAPITALIZED_FIELD = 'Resent-Cc'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/resent_date_field.rb

@@ -7,9 +7,18 @@ module Mail
     include Mail::CommonDate
     
     FIELD_NAME = 'resent-date'
+    CAPITALIZED_FIELD = 'Resent-Date'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/resent_from_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'resent-from'
+    CAPITALIZED_FIELD = 'Resent-From'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/resent_message_id_field.rb

@@ -7,14 +7,23 @@ module Mail
     include CommonMessageId
     
     FIELD_NAME = 'resent-message-id'
+    CAPITALIZED_FIELD = 'Resent-Message-ID'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
     def name
       'Resent-Message-ID'
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+    
   end
 end

data/lib/mail/fields/resent_sender_field.rb

@@ -31,9 +31,10 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'resent-sender'
+    CAPITALIZED_FIELD = 'Resent-Sender'
 
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
 
     def addresses
@@ -44,5 +45,13 @@ module Mail
       result = tree.addresses.first
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+    
   end
 end

data/lib/mail/fields/resent_to_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'resent-to'
+    CAPITALIZED_FIELD = 'Resent-To'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/return_path_field.rb

@@ -25,9 +25,18 @@ module Mail
     include CommonAddress
     
     FIELD_NAME = 'return-path'
+    CAPITALIZED_FIELD = 'Return-Path'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/sender_field.rb

@@ -31,9 +31,10 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'sender'
+    CAPITALIZED_FIELD = 'Sender'
 
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
 
     def addresses
@@ -44,5 +45,13 @@ module Mail
       result = tree.addresses.first
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+    
   end
 end

data/lib/mail/fields/subject_field.rb

@@ -5,9 +5,10 @@ module Mail
   class SubjectField < UnstructuredField
     
     FIELD_NAME = 'subject'
+    CAPITALIZED_FIELD = "Subject"
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
   end

data/lib/mail/fields/to_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'to'
+    CAPITALIZED_FIELD = 'To'
     
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    end
+    
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
     end
     
   end

data/lib/mail/fields/unstructured_field.rb

@@ -22,6 +22,88 @@ module Mail
       self.value = args.last
       self
     end
+    
+    def encoded
+      do_encode(self.name)
+    end
+    
+    def decoded
+      do_decode
+    end
+
+    private
+    
+    def do_encode(name)
+      value.nil? ? '' : "#{wrapped_value}\r\n"
+    end
+    
+    def do_decode
+      value.blank? ? nil : value
+    end
+    
+    # 2.2.3. Long Header Fields
+    # 
+    #  Each header field is logically a single line of characters comprising
+    #  the field name, the colon, and the field body.  For convenience
+    #  however, and to deal with the 998/78 character limitations per line,
+    #  the field body portion of a header field can be split into a multiple
+    #  line representation; this is called "folding".  The general rule is
+    #  that wherever this standard allows for folding white space (not
+    #  simply WSP characters), a CRLF may be inserted before any WSP.  For
+    #  example, the header field:
+    #  
+    #          Subject: This is a test
+    #  
+    #  can be represented as:
+    #  
+    #          Subject: This
+    #           is a test
+    #  
+    #  Note: Though structured field bodies are defined in such a way that
+    #  folding can take place between many of the lexical tokens (and even
+    #  within some of the lexical tokens), folding SHOULD be limited to
+    #  placing the CRLF at higher-level syntactic breaks.  For instance, if
+    #  a field body is defined as comma-separated values, it is recommended
+    #  that folding occur after the comma separating the structured items in
+    #  preference to other places where the field could be folded, even if
+    #  it is allowed elsewhere.
+    def wrapped_value # :nodoc:
+      case
+      when decoded.to_s.ascii_only? && field_length <= 78
+        "#{name}: #{value}"
+      when field_length <= 40 # Allow for =?ISO-8859-1?B?=...=
+        "#{name}: #{encode(value)}"
+      else
+        @folded_line = []
+        @unfolded_line = value.clone
+        fold("#{name}: ".length)
+        folded = @folded_line.compact.join("\r\n\t")
+        "#{name}: #{folded}"
+      end
+    end
+
+    def fold(prepend = 0) # :nodoc:
+      # Get the last whitespace character, OR we'll just choose 
+      # 78 if there is no whitespace
+      @unfolded_line.ascii_only? ? (limit = 78 - prepend) : (limit = 40 - prepend)
+      wspp = @unfolded_line.slice(0..limit) =~ /[ \t][^ \T]*$/ || limit
+      wspp = limit if wspp == 0
+      @folded_line << encode(@unfolded_line.slice!(0...wspp))
+      if @unfolded_line.length > limit
+        fold
+      else
+        @folded_line << encode(@unfolded_line)
+      end
+    end
+
+    def encode(value)
+      if value.ascii_only?
+        value
+      else
+        RUBY_VERSION < '1.9' ? encoding = $KCODE : encoding = @value.encoding
+        Encodings.b_value_encode(value, encoding)
+      end
+    end
 
   end
 end