ruby-gmail 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.7 / 2009-12-23
+
+* 1 bugfix
+
+  * Improved multipart message parsing reliability
+
 === 0.0.6 / 2009-12-21
 
 * 1 bugfix

data/lib/gmail.rb

@@ -3,7 +3,7 @@ require 'net/smtp'
 require 'smtp_tls'
 
 class Gmail
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   class NoLabel < RuntimeError; end
 

data/lib/ietf/rfc2045.rb

@@ -4,10 +4,10 @@ module IETF
     def self.parse_rfc2045_from(raw)
       headers, raw = IETF::RFC822.parse_rfc822_from(raw)
 
-      if headers['content-type'] =~ /multipart\/(\w+); boundary=([\"\']?)(.*)\2/
+      if headers['content-type'] =~ /multipart\/(\w+); boundary=([\"\']?)(.*)\2?/
         content = {}
         content[:type] = $1
-        content[:boundary] = $2
+        content[:boundary] = $3
         content[:content] = IETF::RFC2045.parse_rfc2045_content_from(raw, content[:boundary])
       else
         content = raw
@@ -17,9 +17,11 @@ module IETF
     end
 
     def self.parse_rfc2045_content_from(raw, boundary)
-      parts = raw.split(/#{CRLF.source}--#{boundary}(?:--)?(?:#{CRLF.source}|$)/)
+      parts = ("\r\n" + raw).split(/#{CRLF.source}--#{boundary}(?:--)?(?:#{CRLF.source}|$)/)
       parts.reject! {|p| p.gsub(/^[ \r\n#{HTAB}]?$/,'') == ''} # Remove any parts that are blank
+      puts "[RFC2045] PARTS:\n\t#{parts.map {|p| p.gsub(/\n/,"\n\t")}.join("\n---\n\t")}" if $DEBUG
       parts.collect {|part|
+        puts "[RFC2045] Parsing PART with boundary #{boundary.inspect}:\n\t#{part.gsub(/\n/,"\n\t")}" if $DEBUG
         IETF::RFC2045.parse_rfc2045_from(part)
       }
     end

data/lib/ietf/rfc822.rb

@@ -12,6 +12,7 @@ module IETF
       headers = {}
       # Parse out rfc822 (headers)
       head, remaining_raw = raw.split(/#{CRLF.source}#{CRLF.source}/,2)
+      puts "[RFC822] HEAD found:\n\t#{head.gsub(/\n/,"\n\t")}" if $DEBUG
       head.scan(FIELD) do |field_name, field_body|
         headers[field_name.downcase] = field_body
       end

data/lib/mime/entity.rb

@@ -12,7 +12,7 @@ module MIME
   class Entity
     def initialize(arg=nil)
       if arg.is_a?(String)
-        @raw = arg.gsub(/\r\r+/, "\r").gsub(/([^\r])\n/, "\\1\r\n") # normalizes end-of-line characters
+        @raw = arg.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
@@ -39,16 +39,17 @@ module MIME
           if parsed[1].is_a?(Hash)
             @multipart_type = parsed[1][:type]
             @multipart_boundary = parsed[1][:boundary]
+            raise "IETF PARSING FAIL! (empty boundary)" if @multipart_boundary == ''
           end
         else
-          raise "IETF PARSING FAIL!"
+          raise "IETF PARSING FAIL! ('A' structure)"
         end
         return self
       when Hash
         if parsed.has_key?(:type) && parsed.has_key?(:boundary) && parsed.has_key?(:content)
           @content = parsed[:content].is_a?(Array) ? parsed[:content].collect {|p| Entity.new.from_parsed(p)} : parsed[:content]
         else
-          raise "IETF PARSING FAIL!"
+          raise "IETF PARSING FAIL! ('H' structure)"
         end
         return self
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-gmail
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Daniel Parker
@@ -30,7 +30,7 @@ cert_chain:
   teST6sOe8lUhZQ==
   -----END CERTIFICATE-----
 
-date: 2009-12-21 00:00:00 -05:00
+date: 2009-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency