pony-express 0.2.5 → 0.5.0

data/README

@@ -2,7 +2,7 @@ A fast and lightweight ruby mailer based on http://github.com/benprew/pony. For
 historical perspective read  http://en.wikipedia.org/wiki/Pony_Express.
 
 INSTALL:
-  
+
   sudo apt-get install libmimetic-dev
   sudo gem install pony-express
 
@@ -10,8 +10,9 @@ REQUIREMENT:
 
   * Ruby >= 1.9.1
   * rubygems >= 1.3.5
-  * ruby development libraries (debian: ruby1.9.1-dev)
-  * mimetic >= 0.9.6 development libraries
+  * ruby development libraries             (debian: ruby1.9.1-dev)
+  * mimetic >= 0.9.6 development libraries (debian: libmimetic-dev)
+  * pcre++ development libraries           (debian: libpcre++-dev)
 
 USAGE:
 
@@ -19,12 +20,18 @@ USAGE:
   >> args = { from: "jim@example.com", to: "ralph@example.com", subject: "test email", via: "sendmail" }
   >> args[:text] = "Hello!"
   >> args[:html] = "<strong>Hello!</strong>"
+  >> args[:attachments] = [ "/home/jim/party.png" ]
   >> PonyExpress.mail(args)
 
 
 TODO:
 
-  * Attachments, Rainbows and Unicorns.
+  * Check for Memory Leaks, build a Rainbow machine and rope in some Unicorns.
+
+DON'T ASK:
+
+  * Support for Ruby 1.8 or Rubinius or JRuby
+  * MIME parsing. If you need a full blown mail library have a look at the mail gem.
 
 
 LICENSE:

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.5.0

data/ext/extconf.rb

@@ -7,15 +7,27 @@ $CFLAGS = "-DHAVE_INTTYPES_H"
 Config::CONFIG['CC']  = 'g++'
 Config::CONFIG['CPP'] = 'g++'
 
-dir_config("mimetic", ["/usr/local", "/opt/local", "/usr"])
+headers_mimetic = [ 'stdio.h', 'mimetic/mimetic.h' ]
+headers_pcrecpp = [ 'stdio.h', 'pcre++.h' ]
 
-headers = [ 'stdio.h', 'mimetic/mimetic.h' ]
-if have_library('mimetic',  nil, headers)
-  create_makefile 'mimetic'
-else
+if !have_library('mimetic',  nil, headers_mimetic)
   puts <<-ERROR
+
     Cannot find mimetic headers or libraries.
     Try sudo apt-get install libmimetic-dev on debian flavors of linux.
+
+  ERROR
+  exit 1
+end
+
+if !have_library('pcre++',  nil, headers_pcrecpp)
+  puts <<-ERROR
+
+    Cannot find pcre++ headers or libraries.
+    Try sudo apt-get install libpcre++-dev on debian flavors of linux.
+
   ERROR
   exit 1
 end
+
+create_makefile('mimetic')

data/ext/mimetic.cxx

@@ -4,6 +4,8 @@
 #include <unistd.h>
 #include <sstream>
 #include <exception>
+#include <algorithm>
+#include <pcre++.h>
 #include <mimetic/mimetic.h>
 
 #define ID_CONST_GET rb_intern("const_get")
@@ -15,15 +17,75 @@ static VALUE eArgumentError;
 
 using namespace std;
 using namespace mimetic;
+using namespace pcrepp;
 
 #define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 
+map<string, string> MimeTypes;
+
+/* RFC References
+
+http://www.ietf.org/rfc/rfc2822.txt  Internet Message Format.
+http://www.ietf.org/rfc/rfc1341.txt  MIME Extensions - Multipart related.
+http://www.ietf.org/rfc/rfc2392.txt  Content-ID and Message-ID.
+
+*/
+
+// TODO: CHECK FOR MEMORY LEAKS - not sure if mimetic releases mime parts.
+
+bool mimetic_attach_file(MimeEntity *m, char* filename, const char *mimetype) {
+    filebuf ifile;
+    ostringstream encoded;
+    ifile.open(filename, ios::in);
+    if (ifile.is_open()) {
+        istream is(&ifile);
+        Attachment *at = new Attachment(filename, ContentType(mimetype));
+        Base64::Encoder b64;
+        ostreambuf_iterator<char> oi(encoded);
+        istreambuf_iterator<char> ibegin(is), iend;
+        encode(ibegin, iend, b64, oi);
+        at->body().assign(encoded.str());
+        m->body().parts().push_back(at);
+        ifile.close();
+        return true;
+    }
+    else {
+        rb_raise(eRuntimeError, "Mimetic: Unable to read attachment file %s", filename);
+    }
+    return false;
+}
+
+string get_mime_type(string file) {
+    Pcre regex("\\.");
+    string extn = regex.split(file).back();
+    transform(extn.begin(), extn.end(), extn.begin(), ::tolower);
+    string mime = MimeTypes[extn];
+    return mime.length() > 0 ? mime : MimeTypes["bin"];
+}
+
+void rb_load_mime_types(VALUE self, VALUE filename) {
+    char buffer[4096];
+    vector<string> data;
+    Pcre regex("[\\r\\n\\t]+");
+    ifstream file(RSTRING_PTR(filename), ios::in);
+    if (file.is_open()) {
+        while (!file.eof()) {
+            file.getline(buffer, 4096);
+            data = regex.split(buffer);
+            for (int i = 1; i < data.size(); i++)
+                MimeTypes[data[i]] = data[0];
+        }
+        file.close();
+    }
+    else {
+        rb_raise(eRuntimeError, "Mimetic: Unable to load mime.types");
+    }
+}
+
 VALUE rb_mimetic_build(VALUE self, VALUE options) {
     ostringstream output;
-    int message_id = 1;
-
+    VALUE attachment;
     VALUE text    = rb_hash_aref(options, ID2SYM(rb_intern("text")));
-    VALUE html    = rb_hash_aref(options, ID2SYM(rb_intern("html")));
     VALUE to      = rb_hash_aref(options, ID2SYM(rb_intern("to")));
     VALUE from    = rb_hash_aref(options, ID2SYM(rb_intern("from")));
     VALUE subject = rb_hash_aref(options, ID2SYM(rb_intern("subject")));
@@ -33,6 +95,18 @@ VALUE rb_mimetic_build(VALUE self, VALUE options) {
     if (to      == Qnil) rb_raise(eArgumentError, "Mimetic.build called without :to");
     if (subject == Qnil) rb_raise(eArgumentError, "Mimetic.build called without :subject");
 
+    // optional fields
+    VALUE html    = rb_hash_aref(options, ID2SYM(rb_intern("html")));
+    VALUE tcid    = rb_hash_aref(options, ID2SYM(rb_intern("text_content_id")));
+    VALUE hcid    = rb_hash_aref(options, ID2SYM(rb_intern("html_content_id")));
+    VALUE replyto = rb_hash_aref(options, ID2SYM(rb_intern("replyto")));
+    VALUE cc      = rb_hash_aref(options, ID2SYM(rb_intern("cc")));
+    VALUE bcc     = rb_hash_aref(options, ID2SYM(rb_intern("bcc")));
+    VALUE files   = rb_hash_aref(options, ID2SYM(rb_intern("attachments")));
+
+    if (files != Qnil && TYPE(files) != T_ARRAY)
+        rb_raise(eArgumentError, "Mimetic.build expects :attachments to be an array");
+
     VALUE errors  = Qnil;
     MimeEntity *message   = NULL;
     MimeEntity *html_part = NULL;
@@ -50,12 +124,12 @@ VALUE rb_mimetic_build(VALUE self, VALUE options) {
             message->body().parts().push_back(html_part);
             text_part->header().contentType("text/plain; charset=UTF-8");
             text_part->header().contentTransferEncoding("8bit");
-            text_part->header().messageid(message_id++);
+            text_part->header().contentId(tcid == Qnil ? ContentId() : ContentId(RSTRING_PTR(tcid)));
             text_part->header().mimeVersion(v1);
             text_part->body().assign(RSTRING_PTR(text));
             html_part->header().contentType("text/html; charset=UTF-8");
             html_part->header().contentTransferEncoding("7bit");
-            html_part->header().messageid(message_id++);
+            html_part->header().contentId(hcid == Qnil ? ContentId() : ContentId(RSTRING_PTR(hcid)));
             html_part->header().mimeVersion(v1);
             html_part->body().assign(RSTRING_PTR(html));
         }
@@ -63,14 +137,30 @@ VALUE rb_mimetic_build(VALUE self, VALUE options) {
             message->body().assign(RSTRING_PTR(text));
             message->header().contentType("text/plain; charset=UTF-8");
             message->header().contentTransferEncoding("8bit");
-            message->header().messageid(message_id++);
             message->header().mimeVersion(v1);
         }
-        
+
+        if (files != Qnil && RARRAY_LEN(files) > 0) {
+            MimeEntity *m = message;
+            message = new MultipartMixed();
+            message->header().mimeVersion(v1);
+            message->body().parts().push_back(m);
+            for (long i = 0; i < RARRAY_LEN(files); i++) {
+                attachment = rb_ary_entry(files, i);
+                if (attachment != Qnil && TYPE(attachment) == T_STRING)
+                    mimetic_attach_file(message, RSTRING_PTR(attachment), get_mime_type(RSTRING_PTR(attachment)).c_str());
+            }
+        }
+
         message->header().from(RSTRING_PTR(from));
         message->header().to(RSTRING_PTR(to));
         message->header().subject(RSTRING_PTR(subject));
-    
+        message->header().messageid(1);
+
+        if (replyto != Qnil) message->header().replyto(RSTRING_PTR(replyto));
+        if (cc      != Qnil) message->header().cc(RSTRING_PTR(cc));
+        if (bcc     != Qnil) message->header().bcc(RSTRING_PTR(bcc));
+
         output << *message << endl;
         delete message;
         return rb_str_new2(output.str().c_str());
@@ -86,13 +176,13 @@ VALUE rb_mimetic_build(VALUE self, VALUE options) {
 
     rb_raise(eRuntimeError, "Mimetic boo boo : %s\n", RSTRING_PTR(errors));
 }
-    
-    
+
 extern "C"  {
     void Init_mimetic(void) {
         eRuntimeError  = CONST_GET(rb_mKernel, "RuntimeError");
         eArgumentError = CONST_GET(rb_mKernel, "ArgumentError");
         rb_mMimetic = rb_define_module("Mimetic");
         rb_define_module_function(rb_mMimetic, "build", VALUEFUNC(rb_mimetic_build), 1);
+        rb_define_module_function(rb_mMimetic, "load_mime_types", VALUEFUNC(rb_load_mime_types), 1);
     }
 }

data/lib/pony-express.rb

@@ -6,17 +6,18 @@ module PonyExpress
   TRANSPORTS = [ :smtp, :sendmail ]
   DEFAULT_SMTP_OPTIONS = { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }
 
+  Mimetic.load_mime_types File.dirname(__FILE__) + "/../mime.types"
+
   def self.build options
     # TODO validation.
     Mimetic.build(options)
   end
 
   def self.mail options
-    via = options.delete(:via) || 'sendmail'
+    via = (options.delete(:via) || :smtp).to_sym
     via_options = options.delete(:via_options) || {}
 
-    via = options.delete(:via) || :smtp
-    if TRANSPORTS.include? via.to_sym
+    if TRANSPORTS.include? via
       case via
       when :sendmail then transport_via_sendmail build(options), via_options
       when :smtp     then transport_via_smtp build(options), options[:from], options[:to], via_options
@@ -26,6 +27,8 @@ module PonyExpress
     end
   end
 
+  private
+
   def self.sendmail_binary
     sendmail = `which sendmail`.chomp
     sendmail.empty? ? '/usr/sbin/sendmail' : sendmail
@@ -56,4 +59,5 @@ module PonyExpress
     smtp.send_message content, from, to
     smtp.finish
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pony-express
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.5.0
 platform: ruby
 authors: 
 - Bharanee Rathna