pony-express 0.6.5 → 0.6.6

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/ext/extconf.rb

@@ -7,10 +7,7 @@ $CFLAGS = "-DHAVE_INTTYPES_H"
 Config::CONFIG['CC']  = 'g++'
 Config::CONFIG['CPP'] = 'g++'
 
-headers_mimetic = [ 'stdio.h', 'mimetic/mimetic.h' ]
-headers_pcrecpp = [ 'stdio.h', 'pcre++.h' ]
-
-if !have_library('mimetic',  nil, headers_mimetic)
+if !have_library('mimetic')
   puts <<-ERROR
 
     Cannot find mimetic headers or libraries.
@@ -20,11 +17,11 @@ if !have_library('mimetic',  nil, headers_mimetic)
   exit 1
 end
 
-if !have_library('pcre++',  nil, headers_pcrecpp)
+if !have_library('pcrecpp')
   puts <<-ERROR
 
-    Cannot find pcre++ headers or libraries.
-    Try sudo apt-get install libpcre++-dev on debian flavors of linux.
+    Cannot find pcrecpp headers or libraries from pcre3.
+    Try sudo apt-get install libpcre3-dev on debian flavors of linux.
 
   ERROR
   exit 1

data/ext/mimetic.cxx

@@ -7,8 +7,9 @@ extern "C" {
 #include <sstream>
 #include <exception>
 #include <algorithm>
-#include <pcre++.h>
+#include <pcrecpp.h>
 #include <mimetic/mimetic.h>
+#include <map>
 
 #define ID_CONST_GET rb_intern("const_get")
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
@@ -23,7 +24,7 @@ static VALUE rb_UTF8, rb_ASCII;
 
 using namespace std;
 using namespace mimetic;
-using namespace pcrepp;
+using namespace pcrecpp;
 
 map<string, string> MimeTypes;
 
@@ -49,8 +50,8 @@ string message_id(int n) {
 }
 
 string file_mime_type(string file) {
-    Pcre regex("\\.");
-    string extn = regex.split(file).back();
+    string extn;
+    RE("(?:.*)\\.([^\\.]+)$").FullMatch(file, &extn);
     transform(extn.begin(), extn.end(), extn.begin(), ::tolower);
     string mime = MimeTypes[extn];
     return mime.length() > 0 ? mime : "application/octet-stream";
@@ -79,12 +80,9 @@ bool mimetic_attach_file(MimeEntity *m, char* filename) {
 }
 
 string safe_rfc2047(string v) {
-    Pcre re1("\\?");
-    Pcre re2("_");
-    Pcre re3(" ");
-    v = re1.replace(v, "=3F");
-    v = re2.replace(v, "=5F");
-    v = re3.replace(v, "_");
+    RE("\\?").GlobalReplace("=3F", &v);
+    RE("_").GlobalReplace("=5F", &v);
+    RE(" ").GlobalReplace("_", &v);
     return v;
 }
 
@@ -109,16 +107,19 @@ string quoted_printable(VALUE str) {
 // Exposed API
 
 void rb_load_mime_types(VALUE self, VALUE filename) {
+    string piece;
     char buffer[4096];
     vector<string> data;
-    Pcre regex("[\\r\\n\\t]+");
+    RE 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);
+            StringPiece input(buffer);
+            while (regex.Consume(&input, &piece)) data.push_back(piece);
             for (int i = 1; i < data.size(); i++)
                 MimeTypes[data[i]] = data[0];
+            data.clear();
         }
         file.close();
     }

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pony-express
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Bharanee Rathna
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +10:00
+date: 2010-07-13 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +36,7 @@ files:
 - lib/pony-express/test.rb
 - mime.types
 - README.rdoc
+- ext/extconf.rb
 has_rdoc: true
 homepage: http://github.com/deepfryed/pony-express
 licenses: []
@@ -40,21 +47,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A fast and lightweight mailer