actionmailer 0.7.1 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.8.0* (22th March, 2005)
+
+* Added framework support for processing incoming emails with an Action Mailer class. See example in README.
+
+
 *0.7.1* (7th March, 2005)
 
 * Bind to newest Action Pack (1.5.1)

data/README

@@ -5,6 +5,12 @@ are used to consolidate code for sending out forgotten passwords, welcoming
 wishes on signup, invoices for billing, and any other use case that requires
 a written notification to either a person or another system.
 
+Additionally, an Action Mailer class can be used to process incoming email,
+such as allowing a weblog to accept new posts from an email (which could even
+have been sent from a phone).
+
+== Sending emails
+
 The framework works by setting up all the email details, except the body,
 in methods on the service layer. Subject, recipients, sender, and timestamp
 are all set up this way. An example of such a method:
@@ -47,6 +53,36 @@ ApplicationMailer, it would look like this:
   ApplicationMailer.deliver_signed_up("david@loudthinking.com") # sends the email
   ApplicationMailer.new.signed_up("david@loudthinking.com")     # won't work!
 
+== Receiving emails
+
+To receive emails, you need to implement a public instance method called receive that takes a
+tmail object as its single parameter. The Action Mailer framework has a corresponding class method, 
+which is also called receive, that accepts a raw, unprocessed email as a string, which it then turns
+into the tmail object and calls the receive instance method.
+
+Example:
+
+  class Mailman < ActionMailer::Base
+    def receive(email)
+      page = Page.find_by_address(email.to.first)
+      page.emails.create(
+        :subject => email.subject, :body => email.body
+      )
+
+      if email.has_attachments?
+        for attachment in email.attachments
+          page.attachments.create({ 
+            :file => attachment, :description => email.subject
+          })
+        end
+      end
+    end
+  end
+
+This Mailman can be the target for Postfix. In Rails, you would use the runner like this:
+
+  ./script/runner 'Mailman.receive(STDIN.read)'
+
 
 == Dependencies
 

data/lib/action_mailer.rb

@@ -28,7 +28,7 @@ rescue LoadError
     require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller'
   rescue LoadError
     require 'rubygems'
-    require_gem 'actionpack', '>= 0.9.0'
+    require_gem 'actionpack', '>= 1.6.0'
   end
 end
 

data/lib/action_mailer/base.rb

@@ -114,7 +114,7 @@ module ActionMailer #:nodoc:
             rescue Object => e
               raise e if raise_delivery_errors
             end
-        end        
+        end
       end
 
       def mail(to, subject, body, from, timestamp = nil, headers = {},
@@ -150,6 +150,11 @@ module ActionMailer #:nodoc:
         "=?#{charset}?Q?#{text}?="
       end
 
+      def receive(raw_email)
+        logger.info "Received mail:\n #{raw_email}" unless logger.nil?
+        new.receive(TMail::Mail.parse(raw_email))
+      end
+
       private
         def perform_delivery_smtp(mail)
           Net::SMTP.start(server_settings[:address], server_settings[:port], server_settings[:domain], 

data/lib/action_mailer/vendor/tmail/attachments.rb

@@ -0,0 +1,31 @@
+require 'stringio'
+
+module TMail
+  class Attachment < StringIO
+    attr_accessor :original_filename, :content_type
+  end
+
+  class Mail
+    def has_attachments?
+      multipart? && parts.any? { |part| part.header["content-type"].main_type != "text" }
+    end
+
+    def attachments
+      if multipart?
+        parts.collect { |part| 
+          if part.header["content-type"].main_type != "text"
+            content   = part.body.unpack("m")[0]
+            content   = part.body if content.blank?
+            file_name = part.header["content-type"].params["name"]
+            
+            next if file_name.blank? || content.blank?
+            
+            attachment = Attachment.new(content)
+            attachment.original_filename = file_name.strip.dup
+            attachment
+          end
+        }.compact
+      end      
+    end
+  end
+end

data/lib/action_mailer/vendor/tmail/facade.rb

@@ -261,6 +261,7 @@ module TMail
         default
       end
     end
+    alias quoted_subject subject
 
     def subject=( str )
       set_string_attr 'Subject', str

data/lib/action_mailer/vendor/tmail/mail.rb

@@ -14,6 +14,8 @@ require 'tmail/header'
 require 'tmail/port'
 require 'tmail/config'
 require 'tmail/utils'
+require 'tmail/attachments'
+require 'tmail/quoting'
 require 'socket'
 
 
@@ -320,7 +322,7 @@ module TMail
       body_port().ropen {|f| f.each(&block) }
     end
 
-    def body
+    def quoted_body
       parse_body
       @body_port.ropen {|f|
           return f.read

data/lib/action_mailer/vendor/tmail/quoting.rb

@@ -0,0 +1,83 @@
+require 'iconv'
+require 'base64'
+
+module TMail
+  class Mail
+    def subject(to_charset = 'utf-8')
+      Unquoter.unquote_and_convert_to(quoted_subject, to_charset)
+    end
+
+    def unquoted_body(to_charset = 'utf-8')
+      Unquoter.unquote_and_convert_to(quoted_body, to_charset, header["content-type"]["charset"])
+    end
+
+    def body(to_charset = 'utf-8', &block)
+      attachment_presenter = block || Proc.new { |file_name| "Attachment: #{file_name}\n" }
+      
+      if multipart?
+        parts.collect { |part| 
+          part.header["content-type"].main_type == "text" ? 
+            part.unquoted_body(to_charset) :
+            attachment_presenter.call(part.header["content-type"].params["name"])
+        }.join
+      else
+        unquoted_body(to_charset)
+      end
+    end
+  end
+
+  class Unquoter
+    class << self
+      def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1")
+        return "" if text.nil?
+        if text =~ /^=\?(.*?)\?(.)\?(.*)\?=$/
+          from_charset = $1
+          quoting_method = $2
+          text = $3
+          case quoting_method
+            when "Q" then
+              unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
+            when "B" then
+              unquote_base64_and_convert_to(text, from_charset, to_charset)
+            else
+              raise "unknown quoting method #{quoting_method.inspect}"
+          end
+        else
+          unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
+        end
+      end
+   
+      def unquote_quoted_printable_and_convert_to(text, from, to)
+        text ? Iconv.iconv(to, from || "ISO-8859-1", text.gsub(/_/," ").unpack("M*").first).first : ""
+      end
+   
+      def unquote_base64_and_convert_to(text, from, to)
+        text ? Iconv.iconv(to, from || "ISO-8859-1", Base64.decode64(text)).first : ""
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  require 'test/unit'
+ 
+  class TC_Unquoter < Test::Unit::TestCase
+    def test_unquote_quoted_printable
+      a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
+      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+    end
+ 
+    def test_unquote_base64
+      a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
+      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+    end
+ 
+    def test_unquote_without_charset
+      a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
+      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+    end
+  end
+end

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionmailer'
-PKG_VERSION   = '0.7.1' + PKG_BUILD
+PKG_VERSION   = '0.8.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.5.1' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.6.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/test/mail_service_test.rb

@@ -212,5 +212,21 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
+  def test_unquote_subject
+    msg = <<EOF
+From: me@example.com
+Subject: =?utf-8?Q?testing_testing_=D6=A4?=
+Content-Type: text/plain; charset=iso-8859-1
+
+This_is_a_test
+2 + 2 =3D 4
+EOF
+    mail = TMail::Mail.parse(msg)
+    assert_equal "testing testing \326\244", mail.subject
+    assert_equal "=?utf-8?Q?testing_testing_=D6=A4?=", mail.quoted_subject
+    assert_equal "This is a test\n2 + 2 = 4\n", mail.body
+    assert_equal "This_is_a_test\n2 + 2 =3D 4\n", mail.quoted_body
+  end
+
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2005-03-07
+  version: 0.8.0
+date: 2005-03-22
 summary: Service layer for easy email delivery and testing.
 require_paths: 
   - lib
@@ -42,6 +42,7 @@ files:
   - lib/action_mailer/vendor/tmail.rb
   - lib/action_mailer/vendor/text/format.rb
   - lib/action_mailer/vendor/tmail/address.rb
+  - lib/action_mailer/vendor/tmail/attachments.rb
   - lib/action_mailer/vendor/tmail/base64.rb
   - lib/action_mailer/vendor/tmail/config.rb
   - lib/action_mailer/vendor/tmail/encode.rb
@@ -56,6 +57,7 @@ files:
   - lib/action_mailer/vendor/tmail/obsolete.rb
   - lib/action_mailer/vendor/tmail/parser.rb
   - lib/action_mailer/vendor/tmail/port.rb
+  - lib/action_mailer/vendor/tmail/quoting.rb
   - lib/action_mailer/vendor/tmail/scanner.rb
   - lib/action_mailer/vendor/tmail/scanner_r.rb
   - lib/action_mailer/vendor/tmail/stringio.rb
@@ -83,5 +85,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.5.1
+            version: 1.6.0
       version: