mail 1.1.0 → 1.2.1

data/lib/mail/fields/cc_field.rb

@@ -31,9 +31,18 @@ module Mail
     include Mail::CommonAddress
     
     FIELD_NAME = 'cc'
+    CAPITALIZED_FIELD = '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/comments_field.rb

@@ -32,9 +32,10 @@ module Mail
   class CommentsField < UnstructuredField
     
     FIELD_NAME = 'comments'
+    CAPITALIZED_FIELD = 'Comments'
     
     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/common/common_address.rb

@@ -33,14 +33,38 @@ module Mail
         end
         @groups
       end
+      
+      # Returns the addresses that are part of groups
+      def group_addresses
+        groups.map { |k,v| v.map { |a| a.format } }.flatten
+      end
 
       # Returns the name of all the groups in a string
       def group_names # :nodoc:
         tree.group_names
       end
-
+      
       private
       
+      def do_encode(field_name)
+        return '' unless value
+        address_array = tree.addresses.reject { |a| group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
+        address_text  = address_array.join(", \r\n\t")
+        group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\t")};" }
+        group_text  = group_array.join(" \r\n\t")
+        return_array = [address_text, group_text].reject { |a| a.blank? }
+        "#{field_name}: #{return_array.join(", \r\n\t")}\r\n"
+      end
+
+      def do_decode
+        address_array = tree.addresses.reject { |a| group_addresses.include?(a.decoded) }.map { |a| a.decoded }
+        address_text  = address_array.join(", ")
+        group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.decoded }.join(", ")};" }
+        group_text  = group_array.join(" ")
+        return_array = [address_text, group_text].reject { |a| a.blank? }
+        return_array.join(", ")
+      end
+
       # Returns the syntax tree of the Addresses
       def tree # :nodoc:
         @tree ||= AddressList.new(value)

data/lib/mail/fields/common/common_date.rb

@@ -2,10 +2,6 @@
 module Mail
   module CommonDate # :nodoc:
     
-    module ClassMethods # :nodoc:
-      
-    end
-    
     module InstanceMethods # :doc:
       
       # Returns a date time object of the parsed date
@@ -14,6 +10,14 @@ module Mail
       end
 
       private
+      
+      def do_encode(field_name)
+        "#{field_name}: #{value}\r\n"
+      end
+      
+      def do_decode
+        "#{value}"
+      end
 
       def element
         @element ||= Mail::DateTimeElement.new(value)
@@ -27,7 +31,6 @@ module Mail
     end
     
     def self.included(receiver) # :nodoc:
-      receiver.extend         ClassMethods
       receiver.send :include, InstanceMethods
     end
     

data/lib/mail/fields/common/common_field.rb

@@ -9,7 +9,7 @@ module Mail
     module InstanceMethods # :doc:
       
       def name=(value)
-        @name = capitalize_field(value)
+        @name = value
       end
       
       def name
@@ -27,16 +27,8 @@ module Mail
         @value
       end
       
-      def encoded
-        value.blank? ? nil : "#{wrapped_value}\r\n"
-      end
-      
-      def decoded
-        value.blank? ? nil : "#{name}: #{value}\r\n"
-      end
-      
       def to_s
-        decoded.to_s
+        encoded
       end
       
       def field_length
@@ -53,70 +45,6 @@ module Mail
         string.to_s.gsub(/#{field_name}:\s+/i, '')
       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.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 RUBY_VERSION < '1.9'
-          Encodings.b_encode(value, $KCODE)
-        else
-          Encodings.b_encode(value, @value.encoding)
-        end
-      end
-
     end
     
     def self.included(receiver) # :nodoc:

data/lib/mail/fields/common/common_message_id.rb

@@ -24,6 +24,16 @@ module Mail
         element.message_ids
       end
       
+      private
+      
+      def do_encode(field_name)
+        %Q{#{field_name}: #{message_ids.map { |m| "<#{m}>" }.join(', ')}\r\n}
+      end
+      
+      def do_decode
+        "#{message_ids.map { |m| "<#{m}>" }.join(', ')}"
+      end
+      
     end
     
     def self.included(receiver) # :nodoc:

data/lib/mail/fields/common/parameter_hash.rb

@@ -27,5 +27,15 @@ module Mail
       end
     end
 
+    def encoded
+      map.sort { |a,b| a.first <=> b.first }.map do |key_name, value|
+        unless value.ascii_only?
+          value = Mail::Encodings.param_encode(value)
+          key_name = "#{key_name}*"
+        end
+        %Q{#{key_name}="#{value}"}
+      end.join(";\r\n\t")
+    end
+
   end
 end

data/lib/mail/fields/content_description_field.rb

@@ -6,9 +6,10 @@ module Mail
   class ContentDescriptionField < UnstructuredField
     
     FIELD_NAME = 'content-description'
-
+    CAPITALIZED_FIELD = 'Content-Description'
+    
     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/content_disposition_field.rb

@@ -6,9 +6,10 @@ module Mail
   class ContentDispositionField < StructuredField
     
     FIELD_NAME = 'content-disposition'
-
+    CAPITALIZED_FIELD = 'Content-Disposition'
+    
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
     def tree
@@ -42,5 +43,14 @@ module Mail
       @filename
     end
 
+    # TODO: Fix this up
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{value}\r\n"
+    end
+    
+    def decoded
+      value
+    end
+
   end
 end

data/lib/mail/fields/content_id_field.rb

@@ -6,15 +6,16 @@ module Mail
   class ContentIdField < StructuredField
     
     FIELD_NAME = 'content-id'
+    CAPITALIZED_FIELD = "Content-ID"
     
     def initialize(*args)
       @uniq = 1
       if args.last.blank?
-        self.name = FIELD_NAME
+        self.name = CAPITALIZED_FIELD
         self.value = generate_content_id
         self
       else
-        super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
       end
     end
     
@@ -39,6 +40,15 @@ module Mail
       "<#{content_id}>"
     end
     
+    # TODO: Fix this up
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{to_s}\r\n"
+    end
+    
+    def decoded
+      "#{to_s}"
+    end
+    
     private
     
     def generate_content_id

data/lib/mail/fields/content_location_field.rb

@@ -6,9 +6,10 @@ module Mail
   class ContentLocationField < StructuredField
     
     FIELD_NAME = 'content-location'
-
+    CAPITALIZED_FIELD = 'Content-Location'
+    
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
     end
     
     def tree
@@ -24,5 +25,14 @@ module Mail
       element.location
     end
 
+    # TODO: Fix this up
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{value}\r\n"
+    end
+    
+    def decoded
+      value
+    end
+
   end
 end

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -6,9 +6,10 @@ module Mail
   class ContentTransferEncodingField < StructuredField
     
     FIELD_NAME = 'content-transfer-encoding'
-
+    CAPITALIZED_FIELD = 'Content-Transfer-Encoding'
+    
     def initialize(*args)
-      super(FIELD_NAME, strip_field(FIELD_NAME, args.last.to_s.downcase))
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last.to_s.downcase))
     end
     
     def tree
@@ -24,5 +25,14 @@ module Mail
       element.encoding
     end
     
+    # TODO: Fix this up
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{value}\r\n"
+    end
+    
+    def decoded
+      value
+    end
+
   end
 end

data/lib/mail/fields/content_type_field.rb

@@ -6,18 +6,19 @@ module Mail
   class ContentTypeField < StructuredField
     
     FIELD_NAME = 'content-type'
-
+    CAPITALIZED_FIELD = 'Content-Type'
+    
     def initialize(*args)
       if args.last.class == Array
         @main_type = args.last[0]
         @sub_type = args.last[1]
-        @parameters = args.last.last
-        super(FIELD_NAME, args.last)
+        @parameters = ParameterHash.new.merge!(args.last.last)
+        super(CAPITALIZED_FIELD, args.last)
       else
         @main_type = nil
         @sub_type = nil
         @parameters = nil
-        super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
       end
     end
     
@@ -67,7 +68,7 @@ module Mail
     end
     
     def stringify(params)
-      params.map { |k,v| "#{k}=#{v}" }.join("; ")
+      params.map { |k,v| "#{k}=#{Encodings.param_encode(v)}" }.join("; ")
     end
 
     def filename
@@ -81,6 +82,26 @@ module Mail
       end
       @filename
     end
+    
+    # TODO: Fix this up
+    def encoded
+      "#{CAPITALIZED_FIELD}: #{content_type};\r\n\t#{parameters.encoded};\r\n"
+    end
+    
+    def decoded
+      value
+    end
+
+    private
+    
+    def method_missing(name, *args, &block)
+      if name.to_s =~ /([\w_]+)=/
+        self.parameters[$1] = args.first
+        @value = "#{content_type}; #{stringify(parameters)}"
+      else
+        super
+      end
+    end
 
   end
 end

data/lib/mail/fields/date_field.rb

@@ -29,16 +29,25 @@ module Mail
     include Mail::CommonDate
     
     FIELD_NAME = 'date'
+    CAPITALIZED_FIELD = "Date"
     
     def initialize(*args)
       if args.last.blank?
-        self.name = FIELD_NAME
+        self.name = CAPITALIZED_FIELD
         self.value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
         self
       else
-        super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
       end
     end
     
+    def encoded
+      do_encode(CAPITALIZED_FIELD)
+    end
+    
+    def decoded
+      do_decode
+    end
+    
   end
 end