Fixed attaching a file to an empty message.

Author: dcparker

History.txt

@@ -1,3 +1,9 @@
+=== 0.0.8 / 2009/12-23
+
+* 1 bugfix
+
+  * Fixed attaching a file to an empty message
+
 === 0.0.7 / 2009-12-23
 
 * 1 bugfix

lib/gmail.rb

@@ -3,7 +3,7 @@
 require 'smtp_tls'
 
 class Gmail
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
   class NoLabel < RuntimeError; end
 

lib/mime/entity.rb

@@ -10,12 +10,14 @@ def self.capitalize_header(header_name)
     header_name.gsub(/^(\w)/) {|m| m.capitalize}.gsub(/-(\w)/) {|n| '-' + n[1].chr.capitalize}
   end
   class Entity
-    def initialize(arg=nil)
-      if arg.is_a?(String)
-        @raw = arg.gsub(/\r/,'').gsub(/\n/, "\r\n") # normalizes end-of-line characters
+    def initialize(one=nil,two=nil)
+      if one.is_a?(Hash) || two.is_a?(Hash)
+        @headers = one.is_a?(Hash) ? one : two
+        set_content one if one.is_a?(String)
+        @encoding = 'quoted-printable' unless encoding
+      elsif one.is_a?(String)
+        @raw = one.gsub(/\r/,'').gsub(/\n/, "\r\n") # normalizes end-of-line characters
         from_parsed(IETF::RFC2045.parse_rfc2045_from(@raw))
-      elsif arg.is_a?(Hash)
-        @headers = arg
       end
     end
 
@@ -72,12 +74,12 @@ def headers
     # Macro Methods #
 
     def multipart?
-      !!(headers['content-type'] =~ /multipart\//)
+      !!(headers['content-type'] =~ /multipart\//) if headers['content-type']
     end
     def multipart_type
       if headers['content-type'] =~ /multipart\/(\w+)/
         $1
-      end
+      end if headers['content-type']
     end
     # Auto-generates a boundary if one doesn't yet exist.
     def multipart_boundary
@@ -90,24 +92,28 @@ def multipart_boundary
       end
     end
     def attachment?
-      headers['content-disposition'] =~ /^attachment(?=;|$)/ || headers['content-disposition'] =~ /^form-data;.* filename=[\"\']?[^\"\']+[\"\']?/
+      headers['content-disposition'] =~ /^attachment(?=;|$)/ || headers['content-disposition'] =~ /^form-data;.* filename=[\"\']?[^\"\']+[\"\']?/ if headers['content-disposition']
     end
     alias :file? :attachment?
     def part_filename
       # Content-Disposition: attachment; filename="summary.txt"
       if headers['content-disposition'] =~ /; filename=[\"\']?([^\"\']+)/
         $1
-      end
+      end if headers['content-disposition']
     end
-    attr_writer :encoding
+
     def encoding
       @encoding ||= headers['content-transfer-encoding'] || nil
     end
+    attr_writer :encoding
+    alias :set_encoding :encoding=
+
     def find_part(options)
       find_parts(options).first
     end
     def find_parts(options)
       parts = []
+      return nil unless (options[:content_type] && headers['content-type']) || (options[:content_disposition] && headers['content-disposition'])
         # Do I match your search?
         iam = true
         iam = false if options[:content_type] && headers['content-type'] !~ /^#{options[:content_type]}(?=;|$)/
@@ -167,7 +173,7 @@ def decoded_content
     end
 
     # You can set new content, and it will be saved in encoded form.
-    def content=(raw)
+    def set_content(raw)
       @content = raw.is_a?(Array) ? raw :
         case encoding.to_s.downcase
         when 'quoted-printable'
@@ -178,10 +184,11 @@ def content=(raw)
           raw
         end
     end
+    alias :content= :set_content
 
     private
       def transfer_to(other)
-        other.instance_variable_set(:@content, @content.dup)
+        other.instance_variable_set(:@content, @content.dup) if @content
         other.headers.clear
         other.headers.merge!(Hash[*headers.dup.select {|k,v| k =~ /content/}.flatten])
       end

lib/mime/message.rb

@@ -12,16 +12,17 @@ def self.generate
 
     def to(addressee=nil)
       headers['to'] = addressee if addressee
-      headers['to'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1]
+      headers['to'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1] if headers['to'].respond_to?(:match)
     end
 
     def subject(subj=nil)
       headers['subject'] = subj if subj
       headers['subject']
     end
 
-    def from
-      headers['from'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1]
+    def from(dummy=nil)
+      raise "Can't set FROM address in the message - will be set automatically when the message is sent." if dummy
+      headers['from'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1] if headers['from'].respond_to?(:match)
     end
 
     def attachments
@@ -47,6 +48,7 @@ def generate_multipart(*content_types)
     end
 
     def attach_file(filename)
+      raise ArgumentError, "Currently the <filename> given must be a String (path to a file)." unless filename.is_a?(String)
       short_filename = filename.match(/([^\\\/]+)$/)[1]
 
       # Generate the attachment piece
@@ -62,12 +64,15 @@ def attach_file(filename)
         # If already enclosed, all we have to do is add the attachment part
         (@content ||= []) << attachment
       else
+        # If there is no content, add a little message about the attachment(s).
+        set_content 'See attachment(s)' if @content.nil?
         # Generate the new top-level multipart, transferring what is here already into a child object
         new_content = Entity.new
         # Whatever it is, since it's not multipart/mixed, transfer it into a child object and add the attachment.
         transfer_to(new_content)
         headers.reject! {|k,v| k =~ /content/}
         headers['content-type'] = 'multipart/mixed'
+        headers.delete 'content-transfer-encoding' # because now it's useless.
         @content = [new_content, attachment]
       end