Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to nan 2.x for nodejs 4.x #79

Merged
merged 1 commit into from
May 6, 2016
Merged

Update to nan 2.x for nodejs 4.x #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 55 additions & 59 deletions node-stringprep.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ class UnknownProfileException : public std::exception {
};

// protect constructor from GC
static Persistent<FunctionTemplate> stringprep_constructor;
static Nan::Persistent<FunctionTemplate> stringprep_constructor;

class StringPrep : public ObjectWrap {
class StringPrep : public Nan::ObjectWrap {
public:
static void Initialize(Handle<Object> target)
{
NanScope();
Local<FunctionTemplate> t = NanNew<FunctionTemplate>(New);
NanAssignPersistent(stringprep_constructor, t);
Nan::HandleScope scope;
Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
stringprep_constructor.Reset(t);
t->InstanceTemplate()->SetInternalFieldCount(1);
NODE_SET_PROTOTYPE_METHOD(t, "prepare", Prepare);
Nan::SetPrototypeMethod(t, "prepare", Prepare);

target->Set(NanNew<String>("StringPrep"), t->GetFunction());
target->Set(Nan::New<String>("StringPrep").ToLocalChecked(), t->GetFunction());
}

bool good() const
Expand All @@ -43,39 +43,38 @@ class StringPrep : public ObjectWrap {

static NAN_METHOD(New)
{
NanScope();

if (args.Length() >= 1 && args[0]->IsString())
if (info.Length() >= 1 && info[0]->IsString())
{
String::Utf8Value arg0(args[0]->ToString());
Nan::Utf8String arg0(info[0]->ToString());
UStringPrepProfileType profileType;
try
{
profileType = parseProfileType(arg0);
}
catch (UnknownProfileException &)
{
NanThrowTypeError("Unknown StringPrep profile");
NanReturnUndefined();
Nan::ThrowTypeError("Unknown StringPrep profile");
return;
}

StringPrep *self = new StringPrep(profileType);
if (self->good())
{
self->Wrap(args.This());
NanReturnValue(args.This());
self->Wrap(info.This());
info.GetReturnValue().Set(info.This());
return;
}
else
{
const char* err = self->errorName();
delete self;
NanThrowError(err);
NanReturnUndefined();
Nan::ThrowError(err);
return;
}
}
else {
NanThrowTypeError("Bad argument.");
NanReturnUndefined();
Nan::ThrowTypeError("Bad argument.");
return;
}
}

Expand All @@ -97,22 +96,22 @@ class StringPrep : public ObjectWrap {

static NAN_METHOD(Prepare)
{
NanScope();

if (args.Length() >= 1 && args[0]->IsString())
if (info.Length() >= 1 && info[0]->IsString())
{
StringPrep *self = ObjectWrap::Unwrap<StringPrep>(args.This());
String::Value arg0(args[0]->ToString());
NanReturnValue(self->prepare(arg0));
StringPrep *self = Nan::ObjectWrap::Unwrap<StringPrep>(info.This());
String::Value arg0(info[0]->ToString());
info.GetReturnValue().Set(self->prepare(arg0));
return;
}
else {
NanThrowTypeError("Bad argument.");
NanReturnUndefined();
Nan::ThrowTypeError("Bad argument.");
return;
}
}

Handle<Value> prepare(String::Value &str)
Local<Value> prepare(String::Value &str)
{
Nan::EscapableHandleScope scope;
size_t destLen = str.length() + 1;
UChar *dest = NULL;
while(!dest)
Expand All @@ -135,23 +134,23 @@ class StringPrep : public ObjectWrap {
{
// other error, just bail out
delete[] dest;
NanThrowError(errorName());
return NanUndefined();
Nan::ThrowError(errorName());
return scope.Escape(Nan::Undefined());
}
else
destLen = w;
}

Local<String> result = NanNew<String>(dest, destLen);
Local<Value> result = Nan::New<String>(dest, destLen).ToLocalChecked();
delete[] dest;
return result;
return scope.Escape(result);
}

private:
UStringPrepProfile *profile;
UErrorCode error;

static enum UStringPrepProfileType parseProfileType(String::Utf8Value &profile)
static enum UStringPrepProfileType parseProfileType(Nan::Utf8String &profile)
throw(UnknownProfileException)
{
if (strcasecmp(*profile, "nameprep") == 0)
Expand Down Expand Up @@ -192,12 +191,10 @@ class StringPrep : public ObjectWrap {

NAN_METHOD(ToUnicode)
{
NanScope();

if (args.Length() >= 2 && args[0]->IsString() && args[1]->IsInt32())
if (info.Length() >= 2 && info[0]->IsString() && info[1]->IsInt32())
{
String::Value str(args[0]->ToString());
int32_t options = args[1]->ToInt32()->Value();
String::Value str(info[0]->ToString());
int32_t options = info[1]->ToInt32()->Value();

// ASCII encoding (xn--*--*) should be longer than Unicode
size_t destLen = str.length() + 1;
Expand All @@ -222,31 +219,30 @@ NAN_METHOD(ToUnicode)
{
// other error, just bail out
delete[] dest;
NanThrowError(u_errorName(error));
NanReturnUndefined();
Nan::ThrowError(u_errorName(error));
return;
}
else
destLen = w;
}

Local<String> result = NanNew<String>(dest, destLen);
Local<String> result = Nan::New<String>(dest, destLen).ToLocalChecked();
delete[] dest;
NanReturnValue(result);
info.GetReturnValue().Set(result);
return;
}
else {
NanThrowTypeError("Bad argument.");
NanReturnUndefined();
Nan::ThrowTypeError("Bad argument.");
return;
}
}

NAN_METHOD(ToASCII)
{
NanScope();

if (args.Length() >= 2 && args[0]->IsString() && args[1]->IsInt32())
if (info.Length() >= 2 && info[0]->IsString() && info[1]->IsInt32())
{
String::Value str(args[0]->ToString());
int32_t options = args[1]->ToInt32()->Value();
String::Value str(info[0]->ToString());
int32_t options = info[1]->ToInt32()->Value();

// find out length first
UErrorCode error = U_ZERO_ERROR;
Expand All @@ -270,28 +266,28 @@ NAN_METHOD(ToASCII)
{
// other error, just bail out
delete[] dest;
NanThrowError(u_errorName(error));
NanReturnUndefined();
Nan::ThrowError(u_errorName(error));
return;
}

Local<String> result = NanNew<String>(dest, destLen);
Local<String> result = Nan::New<String>(dest, destLen).ToLocalChecked();
delete[] dest;
NanReturnValue(result);
info.GetReturnValue().Set(result);
return;
}
else {
NanThrowTypeError("Bad argument.");
NanReturnUndefined();
Nan::ThrowTypeError("Bad argument.");
return;
}
}

/*** Initialization ***/

extern "C" void init(Handle<Object> target)
NAN_MODULE_INIT(init)
{
NanScope();
StringPrep::Initialize(target);
NODE_SET_METHOD(target, "toUnicode", ToUnicode);
NODE_SET_METHOD(target, "toASCII", ToASCII);
Nan::SetMethod(target, "toUnicode", ToUnicode);
Nan::SetMethod(target, "toASCII", ToASCII);
}

NODE_MODULE(node_stringprep, init)
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"bindings": "~1.2.1",
"debug": "~2.2.0",
"nan": "~1.8.4"
"nan": "^2.1.0"
},
"devDependencies": {
"grunt": "~0.4.2",
Expand Down