lib: update to nan 2.x

Author: LinusU

package.json

@@ -22,6 +22,6 @@
     "url": "https://github.com/LinusU/node-alias.git"
   },
   "dependencies": {
-    "nan": "^1.9.0"
+    "nan": "^2.0.5"
   }
 }

src/impl-apple-cheetah.cc

@@ -3,9 +3,6 @@
 #include <CoreFoundation/CFURL.h>
 #include <CoreFoundation/CFString.h>
 
-using v8::String;
-using v8::Local;
-
 const char* OSErrDescription(OSErr err) {
   switch (err) {
     case nsvErr: return "Volume not found";
@@ -24,9 +21,7 @@ const char* OSErrDescription(OSErr err) {
 }
 
 NAN_METHOD(MethodGetVolumeName) {
-  NanScope();
-
-  NanAsciiString aPath(args[0]);
+  Nan::Utf8String aPath(info[0]);
 
   CFStringRef volumePath = CFStringCreateWithCString(NULL, *aPath, kCFStringEncodingUTF8);
   CFURLRef url = CFURLCreateWithFileSystemPath(NULL, volumePath, kCFURLPOSIXPathStyle, true);
@@ -35,22 +30,18 @@ NAN_METHOD(MethodGetVolumeName) {
   FSRef urlFS;
   FSCatalogInfo urlInfo;
   HFSUniStr255 outString;
-  Local<String> errorDesc;
 
   if (CFURLGetFSRef(url, &urlFS) == false) {
-    NanThrowError("Failed to convert URL to file or directory object");
-    NanReturnUndefined();
+    return Nan::ThrowError("Failed to convert URL to file or directory object");
   }
 
   if ((err = FSGetCatalogInfo(&urlFS, kFSCatInfoVolume, &urlInfo, NULL, NULL, NULL)) != noErr) {
-    NanThrowError(OSErrDescription(err));
-    NanReturnUndefined();
+    return Nan::ThrowError(OSErrDescription(err));
   }
 
   if ((err = FSGetVolumeInfo(urlInfo.volume, 0, NULL, kFSVolInfoNone, NULL, &outString, NULL)) != noErr) {
-    NanThrowError(OSErrDescription(err));
-    NanReturnUndefined();
+    return Nan::ThrowError(OSErrDescription(err));
   }
 
-  NanReturnValue(NanNew(outString.unicode, outString.length));
+  info.GetReturnValue().Set(Nan::New<v8::String>(outString.unicode, outString.length).ToLocalChecked());
 }

src/impl-apple-lion.cc

@@ -9,39 +9,35 @@ using v8::Value;
 
 Local<String> MYCFStringGetV8String(CFStringRef aString) {
   if (aString == NULL) {
-    return NanNew("");
+    return Nan::EmptyString();
   }
 
   CFIndex length = CFStringGetLength(aString);
   CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
   char *buffer = (char *) malloc(maxSize);
 
   if (!CFStringGetCString(aString, buffer, maxSize, kCFStringEncodingUTF8)) {
-    return NanNew("");
+    return Nan::EmptyString();
   }
 
-  Local<String> result = NanNew(buffer);
+  Local<String> result = Nan::New(buffer).ToLocalChecked();
   free(buffer);
 
   return result;
 }
 
 NAN_METHOD(MethodGetVolumeName) {
-  NanScope();
-
-  NanAsciiString aPath(args[0]);
+  Nan::Utf8String aPath(info[0]);
 
   CFStringRef out;
   CFErrorRef error;
 
   CFStringRef volumePath = CFStringCreateWithCString(NULL, *aPath, kCFStringEncodingUTF8);
   CFURLRef url = CFURLCreateWithFileSystemPath(NULL, volumePath, kCFURLPOSIXPathStyle, true);
 
-  if(CFURLCopyResourcePropertyForKey(url, kCFURLVolumeNameKey, &out, &error)) {
-    Local<String> result = MYCFStringGetV8String(out);
-    NanReturnValue(result);
-  } else {
-    NanThrowError(MYCFStringGetV8String(CFErrorCopyDescription(error)));
-    NanReturnUndefined();
+  if(!CFURLCopyResourcePropertyForKey(url, kCFURLVolumeNameKey, &out, &error)) {
+    return Nan::ThrowError(MYCFStringGetV8String(CFErrorCopyDescription(error)));
   }
+
+  info.GetReturnValue().Set(MYCFStringGetV8String(out));
 }

src/volume.cc

@@ -11,8 +11,9 @@
 
 using v8::FunctionTemplate;
 
-void Initialize(v8::Handle<v8::Object> exports) {
-  exports->Set(NanNew("getVolumeName"), NanNew<FunctionTemplate>(MethodGetVolumeName)->GetFunction());
+NAN_MODULE_INIT(Initialize) {
+  Nan::Set(target, Nan::New("getVolumeName").ToLocalChecked(),
+    Nan::GetFunction(Nan::New<FunctionTemplate>(MethodGetVolumeName)).ToLocalChecked());
 }
 
 NODE_MODULE(volume, Initialize)