mime 0.3.0 → 0.4.0

data/lib/mime/headers/mime.rb

@@ -8,19 +8,19 @@ module MIME
 
       attr_reader(
         :mime_version,
-        :content_description,
-        :content_disposition,
-        :content_id,
-        :content_transfer_encoding,
-        :content_type
+        :description,
+        :disposition,
+        :id,
+        :transfer_encoding,
+        :type
       )
 
       #
       # Describes the content, which can be useful for non-MIME clients.
       #
-      def content_description= description
-        @content_description = description
-        headers.add('Content-Description', description)
+      def description= description
+        @description = description
+        headers.set('Content-Description', description)
       end
 
       #
@@ -30,18 +30,18 @@ module MIME
       #
       # RFC 2183 Communicating Presentation Information in Internet Messages.
       #
-      def content_disposition= disposition
-        @content_disposition = disposition
-        headers.add('Content-Disposition', disposition)
+      def disposition= disposition
+        @disposition = disposition
+        headers.set('Content-Disposition', disposition)
       end
 
       #
       # Globally unique ID that identifies a top-level message or message
       # entity. Content IDs can be used for referencing or caching purposes.
       #
-      def content_id= id
-        @content_id = id
-        headers.add('Content-ID', "<#{id}>")
+      def id= id
+        @id = id
+        headers.set('Content-ID', "<#{id}>")
       end
 
       #
@@ -54,9 +54,9 @@ module MIME
       # * quoted-printable
       # * base64
       #
-      def content_transfer_encoding= encoding
-        @content_transfer_encoding = encoding
-        headers.add('Content-Transfer-Encoding', encoding)
+      def transfer_encoding= encoding
+        @transfer_encoding = encoding
+        headers.set('Content-Transfer-Encoding', encoding)
       end
 
       #
@@ -64,7 +64,7 @@ module MIME
       #
       def mime_version= version
         @mime_version = version
-        headers.add('MIME-Version', version)
+        headers.set('MIME-Version', version)
       end
 
       protected
@@ -80,9 +80,9 @@ module MIME
       # * text/plain
       # * video/mpeg
       #
-      def content_type= type
-        @content_type = type
-        headers.add('Content-Type', type)
+      def type= type
+        @type = type
+        headers.set('Content-Type', type)
       end
 
       #
@@ -97,20 +97,31 @@ module MIME
       #
       # The values for the *-date keys may use Time::rfc2822.
       #
-      def set_content_disposition type, params = {}
-        disposition = type
-
+      def set_disposition type, params = {}
         if params['filename']
           params['filename'] = File.basename(params['filename'])
         elsif self.respond_to?(:path)
           params['filename'] = File.basename(self.path)
         end
+        self.disposition = append_field_params(type, params)
+      end
+
+
+      private
 
+      #
+      # Append parameters to header field body.
+      # Used for Content-Type and Content-Disposition headers.
+      #
+      def append_field_params body, params = {}
         params.each do |name, value|
-          disposition << %Q[; #{name}="#{value}"]  if value
+          next unless value
+          unless value =~ Internet::DOT_ATOM
+            value = '"' + value.gsub('"','\"') + '"'
+          end
+          body << "; #{name}=#{value}"
         end
-
-        self.content_disposition = disposition
+        body
       end
 
     end

data/lib/mime/mail.rb

@@ -0,0 +1,51 @@
+require 'time'
+require 'mime/headers/internet'
+
+module MIME
+
+  #
+  # Construct RFC 2822 Internet messages.
+  #
+  class Mail
+
+    include Headers::Internet
+
+    attr_reader :headers, :body
+
+    #
+    # Initialize a Mail object with body set to +content+.
+    #
+    def initialize content = nil
+      @headers = Header.new
+      self.body = content
+      self.date = Time.now
+    end
+
+    #
+    # Format the Mail object as an Internet message.
+    #
+    def to_s
+      self.message_id   ||= ID.generate_gid(domain)
+      body.mime_version ||= "1.0 (Ruby MIME v#{VERSION})"
+
+      #--
+      # In an RFC 2822 message, the header and body sections must be separated
+      # by two line breaks (i.e., 2*CRLF). One line break is deliberately
+      # omitted here to allowing the body supplier to append headers to the
+      # top-level message header section.
+      #++
+      "#{headers}\r\n#{body}"
+    end
+
+    def body= content
+      @body = content.is_a?(Media) ? content : Text.new(content.to_s)
+    end
+
+    private
+
+    def domain
+      headers.get('from').match(/@([[:alnum:].-]+)/)[1] rescue nil
+    end
+
+  end
+end

data/lib/mime/media.rb

@@ -0,0 +1,30 @@
+require 'mime/headers/mime'
+
+module MIME
+
+  #
+  # Abstract top-level media class.
+  #
+  class Media
+
+    include Headers::MIME
+
+    attr_reader :headers, :body
+
+    def initialize content, content_type, content_params = {}
+      AbstractClassError.no_instantiation(self, Media)
+      @headers  = Header.new
+      @body     = content
+      self.id   = ID.generate_gid
+      self.type = append_field_params(content_type, content_params)
+    end
+
+    #
+    # Format the Media object as a MIME message.
+    #
+    def to_s
+      "#{headers}\r\n\r\n#{body}"
+    end
+
+  end
+end

data/lib/mime/parser.rb

@@ -1,7 +1,7 @@
 module MIME
 
   #
-  # Parse MIME messages, constructing MediaType objects for each MIME entity.
+  # Parse MIME messages, constructing Media objects for each MIME entity.
   #
   # TODO Implement
   #

data/lib/mime.rb

@@ -18,20 +18,38 @@
 #
 module MIME
 
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
-  module ContentFormats
-    MAX_SMTP_LINE = 997
+  # Defined in RFC: https://tools.ietf.org/html/rfc5322#section-2.1.1
+  MAX_LINE_LENGTH = 998
+
+  module ID
+    #
+    # Generate local ID.
+    #
+    def self.generate_id
+      timestamp = (Time.now.to_f * 1E7).to_i
+      rand(1E9).to_s(36) +
+      object_id.to_s(36) +
+      timestamp.to_s(36)
+    end
+
+    #
+    # Generate global ID for "Message-ID" or "Content-ID" header.
+    #
+    def self.generate_gid domain = nil
+      generate_id + "@" + (domain || "#{generate_id}.local")
+    end
   end
 
 end
 
 require 'mime/content_types'
+require 'mime/content_formats/text_flowed'
 require 'mime/error'
-require 'mime/header_container'
-require 'mime/media_type'
-require 'mime/discrete_media_type'
-require 'mime/composite_media_type'
-require 'mime/message'
+require 'mime/header'
+require 'mime/media'
+require 'mime/composite_media'
+require 'mime/discrete_media'
 require 'mime/discrete_media_factory'
-require 'mime/content_formats/text_flowed'
+require 'mime/mail'

data/test/scaffold/application.msg

@@ -1,8 +1,5 @@
-Date: Wed, 29 Oct 2008 22:02:00 -0700
-Message-ID: <350015069@1033007998>
-MIME-Version: 1.0 (Ruby MIME v0.2.0)
-Content-ID: <10330079680.971971651113797>
+Content-ID: <10330079680@971971651113797>
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: binary
 
-0110000101110101011001000110100101101111
+0110000101110101011001000110100101101111

data/test/scaffold/audio.msg

@@ -1,8 +1,5 @@
-Date: Wed, 29 Oct 2008 22:06:46 -0700
-Message-ID: <738362674@978907908>
-MIME-Version: 1.0 (Ruby MIME v0.2.0)
-Content-ID: <9789078880.11546613041526>
+Content-ID: <9789078880@11546613041526>
 Content-Type: audio/midi
 Content-Transfer-Encoding: binary
 
-0110000101110101011001000110100101101111
+0110000101110101011001000110100101101111

data/test/scaffold/multipart_alternative.msg

@@ -1,15 +1,15 @@
-Content-ID: <154873488180000.3045551269054866>
-Content-Type: multipart/alternative; boundary=Boundary_154873488180000.5284747660488839
+Content-ID: <154873488180000@3045551269054866>
+Content-Type: multipart/alternative; boundary=Boundary_154873488180000
 
---Boundary_154873488180000.5284747660488839
-Content-ID: <154873488189000.6392244491224042>
+--Boundary_154873488180000
+Content-ID: <154873488189000@6392244491224042>
 Content-Type: text/enhanced; charset=us-ascii
 
 *Header*
 message
---Boundary_154873488180000.5284747660488839
-Content-ID: <154873488185800.3424043482513621>
+--Boundary_154873488180000
+Content-ID: <154873488185800@3424043482513621>
 Content-Type: text/html; charset=iso-8859-1
 
 <html><body><h1>Header</h1><p>message</p></body></html>
---Boundary_154873488180000.5284747660488839--
+--Boundary_154873488180000--

data/test/scaffold/multipart_form_data_text.msg

@@ -1,10 +1,10 @@
-Content-ID: <88135231713600.7894413004791365>
-Content-Type: multipart/form-data; boundary=Boundary_88135231713600.3996846921776409
+Content-ID: <88135231713600@7894413004791365>
+Content-Type: multipart/form-data; boundary=Boundary_88135231713600
 
---Boundary_88135231713600.3996846921776409
-Content-ID: <88135231717000.5720607746781624>
+--Boundary_88135231713600
+Content-ID: <88135231717000@5720607746781624>
 Content-Type: text/xml
-Content-Disposition: form-data; name="xml"
+Content-Disposition: form-data; name=xml
 
 <media_types abstract="true">
 	<discrete_media_types abstract="true">
@@ -24,10 +24,10 @@ Content-Disposition: form-data; name="xml"
 	</composite>
 </media_types>
 
---Boundary_88135231713600.3996846921776409
-Content-ID: <88135231721400.4415016053712104>
+--Boundary_88135231713600
+Content-ID: <88135231721400@4415016053712104>
 Content-Type: text/html
-Content-Disposition: form-data; name="htm"
+Content-Disposition: form-data; name=htm
 
 <html>
 <body>
@@ -36,10 +36,10 @@ Content-Disposition: form-data; name="htm"
 </body>
 </html>
 
---Boundary_88135231713600.3996846921776409
-Content-ID: <88135231725400.11623307734175536>
+--Boundary_88135231713600
+Content-ID: <88135231725400@11623307734175536>
 Content-Type: text/plain
-Content-Disposition: form-data; name="txt"
+Content-Disposition: form-data; name=txt
 
 text body
---Boundary_88135231713600.3996846921776409--
+--Boundary_88135231713600--

data/test/scaffold/{plain_text_email.msg → rfc822_discrete.msg}

@@ -1,11 +1,11 @@
 Date: Tue, 17 Dec 2013 04:54:56 -0700
-Message-ID: <776432154@10297424291820>
-MIME-Version: 1.0 (Ruby MIME v0.0.0)
 To: John <john@example.com>, paul@example.com, Mary <mary@example.com>
-Cc: boss@example.com <Head Honcho>
+Cc: Head Honcho <boss@example.com>
 From: jane@example.com
 Subject: This is an important email
-Content-ID: <102975158103800.7998663631497803>
+Message-ID: <776432154@10297424291820>
+Content-ID: <102975158103800@7998663631497803>
 Content-Type: text/plain
+MIME-Version: 1.0 (Ruby MIME v0.0.0)
 
-Hello, world!
+Hello, world!

data/test/scaffold/text.msg

@@ -1,7 +1,4 @@
-Date: Wed, 29 Oct 2008 14:55:34 -0700
-Message-ID: <357114433@1021851988>
-MIME-Version: 1.0 (Ruby MIME v0.1.0)
-Content-ID: <10218519780.0838656876757202>
+Content-ID: <10218519780@0838656876757202>
 Content-Type: text/plain
 
-a plain text message
+a plain text message

data/test/scaffold/video.msg

@@ -1,8 +1,5 @@
-Date: Wed, 29 Oct 2008 21:56:48 -0700
-Message-ID: <740518531@1061166128>
-MIME-Version: 1.0 (Ruby MIME v0.1.0)
-Content-ID: <10611659780.38729886896997>
+Content-ID: <10611659780@38729886896997>
 Content-Type: video/mpeg
 Content-Transfer-Encoding: binary
 
-0110000101110101011001000110100101101111
+0110000101110101011001000110100101101111