Changeset 15172 for trunk/FACT++/src

Timestamp:

03/27/13 18:00:31 (12 years ago)

Author:

tbretz

Message:

Changed the Mail class a bit to have the arrays as data members ReadOnly.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (4 diffs)
• InterpreterV8.h (modified) (1 diff)

trunk/FACT++/src/InterpreterV8.cc

@@ -775 +775 @@
         return ThrowException(String::New("Mail must be called as constructor"));
 
+    if (args.Length()!=1 || !args[0]->IsString())
+        return ThrowException(String::New("Constructor must be called with a single string as argument"));
+
     HandleScope handle_scope;
 
+    Handle<Array> rec = Array::New();
+    Handle<Array> att = Array::New();
+    Handle<Array> bcc = Array::New();
+    Handle<Array> cc  = Array::New();
+    Handle<Array> txt = Array::New();
+    if (rec.IsEmpty() || att.IsEmpty() || bcc.IsEmpty() || cc.IsEmpty() || txt.IsEmpty())
+        return Undefined();
+
     Handle<Object> self = args.This();
+
+    self->Set(String::New("subject"),     args[0]->ToString(), ReadOnly);
+    self->Set(String::New("recipients"),  rec, ReadOnly);
+    self->Set(String::New("attachments"), att, ReadOnly);
+    self->Set(String::New("bcc"),         bcc, ReadOnly);
+    self->Set(String::New("cc"),          cc,  ReadOnly);
+    self->Set(String::New("text"),        txt, ReadOnly);
+
     self->Set(String::New("send"), FunctionTemplate::New(WrapSendMail)->GetFunction(), ReadOnly);
+
     return handle_scope.Close(self);
 }
 
-vector<string> InterpreterV8::ValueToArray(const Handle<Value> &val)
+vector<string> InterpreterV8::ValueToArray(const Handle<Value> &val, bool only)
 {
     vector<string> rc;
-    if (val->IsString())
-    {
-        rc.push_back(*String::AsciiValue(val->ToString()));
-        return rc;
-    }
-
-    if (val->IsArray())
-    {
-        Handle<Array> arr = Handle<Array>::Cast(val);
-        for (uint32_t i=0; i<arr->Length(); i++)
-        {
-            Handle<Value> obj = arr->Get(i);
-            if (obj.IsEmpty())
-                continue;
-
-            if (!obj->IsString())
-                return vector<string>();
-
-            rc.push_back(*String::AsciiValue(obj->ToString()));
-        }
+
+    Handle<Array> arr = Handle<Array>::Cast(val);
+    for (uint32_t i=0; i<arr->Length(); i++)
+    {
+        Handle<Value> obj = arr->Get(i);
+        if (obj.IsEmpty())
+            continue;
+
+        if (obj->IsNull() || obj->IsUndefined())
+            continue;
+
+        if (only && !obj->IsString())
+            continue;
+
+        rc.push_back(*String::AsciiValue(obj->ToString()));
     }
 
@@ -823 +838 @@
 
     const Handle<Value> sub = args.This()->Get(String::New("subject"));
-    const Handle<Value> rec = args.This()->Get(String::New("recipient"));
+    const Handle<Value> rec = args.This()->Get(String::New("recipients"));
     const Handle<Value> txt = args.This()->Get(String::New("text"));
-    const Handle<Value> att = args.This()->Get(String::New("attachment"));
+    const Handle<Value> att = args.This()->Get(String::New("attachments"));
     const Handle<Value> bcc = args.This()->Get(String::New("bcc"));
     const Handle<Value> cc  = args.This()->Get(String::New("cc"));
 
-    if (sub->IsUndefined())
-        return ThrowException(String::New("Required property 'subject' missing."));
-
     const vector<string> vrec = ValueToArray(rec);
-    const vector<string> vtxt = ValueToArray(txt);
+    const vector<string> vtxt = ValueToArray(txt, false);
     const vector<string> vatt = ValueToArray(att);
     const vector<string> vbcc = ValueToArray(bcc);
@@ -839 +851 @@
 
     if (vrec.size()==0)
-        return ThrowException(String::New("Required property 'recipient' must be a string or an array of strings."));
+        return ThrowException(String::New("At least one valid string is required in 'recipients'."));
     if (vtxt.size()==0)
-        return ThrowException(String::New("Required property 'text' must be a string or an array of strings."));
-    if (vatt.size()==0 && !att->IsUndefined())
-        return ThrowException(String::New("Property 'attachment' must be a string or an array of strings."));
-    if (vbcc.size()==0 && !bcc->IsUndefined())
-        return ThrowException(String::New("Property 'bcc' must be a string or an array of strings."));
-    if (vcc.size()==0 && !cc->IsUndefined())
-        return ThrowException(String::New("Property 'cc' must be a string or an array of strings."));
-
-    if (!sub->IsString())
-        return ThrowException(String::New("Property 'subject' must be a string."));
+        return ThrowException(String::New("At least one valid string is required in 'text'."));
 
     const string subject = *String::AsciiValue(sub->ToString());
-
 
     FILE *pipe = popen(("from=no-reply@fact-project.org mailx -~ "+vrec[0]).c_str(), "w");
@@ -2389 +2391 @@
     fTemplateDescription = desc;
 
-#ifdef HAVE_MAIL
+#ifdef HAVE_MAILX
     Handle<FunctionTemplate> mail = FunctionTemplate::New(ConstructorMail);
     mail->SetClassName(String::New("Mail"));

trunk/FACT++/src/InterpreterV8.h

@@ -64 +64 @@
     void Thread(int &id, v8::Persistent<v8::Function> func, uint32_t ms);
 
-    std::vector<std::string> ValueToArray(const v8::Handle<v8::Value> &val);
+    std::vector<std::string> ValueToArray(const v8::Handle<v8::Value> &val, bool only=true);
 
     v8::Handle<v8::Value> FuncWait(const v8::Arguments& args);