Merge pull request #6 from joshuawarner32/master

lib: integrate nan for broader node version support

Author: LinusU

binding.gyp

@@ -2,7 +2,10 @@
   "targets": [
     {
       "target_name": "volume",
-      "sources": [ "src/volume.cc" ]
+      "sources": [ "src/volume.cc" ],
+      "include_dirs" : [
+        "<!(node -e \"require('nan')\")"
+      ]
     }
   ]
 }

package.json

@@ -6,7 +6,8 @@
   "author": "Linus Unnebäck <[email protected]>",
   "contributors": [
     "Linus Unnebäck <[email protected]>",
-    "Davide Liessi <[email protected]>"
+    "Davide Liessi <[email protected]>",
+    "Joshua Warner <[email protected]>"
   ],
   "devDependencies": {
     "fs-temp": "^0.1.0",
@@ -18,5 +19,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/LinusU/node-alias.git"
+  },
+  "dependencies": {
+    "nan": "^1.4.1"
   }
 }

src/impl-apple-cheetah.cc

@@ -3,30 +3,31 @@
 #include <CoreFoundation/CFURL.h>
 #include <CoreFoundation/CFString.h>
 
-using namespace v8;
+using v8::String;
+using v8::Local;
 
-Local<String> OSErrDescription(OSErr err) {
+const char* OSErrDescription(OSErr err) {
 
   switch (err) {
-    case nsvErr: return String::New("Volume not found");
-    case ioErr: return String::New("I/O error.");
-    case bdNamErr: return String::New("Bad filename or volume name.");
-    case mFulErr: return String::New("Memory full (open) or file won't fit (load)");
-    case tmfoErr: return String::New("Too many files open.");
-    case fnfErr: return String::New("File or directory not found; incomplete pathname.");
-    case volOffLinErr: return String::New("Volume is offline.");
-    case nsDrvErr: return String::New("No such drive.");
-    case dirNFErr: return String::New("Directory not found or incomplete pathname.");
-    case tmwdoErr: return String::New("Too many working directories open.");
+    case nsvErr: return "Volume not found";
+    case ioErr: return "I/O error.";
+    case bdNamErr: return "Bad filename or volume name.";
+    case mFulErr: return "Memory full (open) or file won't fit (load)";
+    case tmfoErr: return "Too many files open.";
+    case fnfErr: return "File or directory not found; incomplete pathname.";
+    case volOffLinErr: return "Volume is offline.";
+    case nsDrvErr: return "No such drive.";
+    case dirNFErr: return "Directory not found or incomplete pathname.";
+    case tmwdoErr: return "Too many working directories open.";
   }
 
-  return String::New("Could not get volume name");
+  return "Could not get volume name";
 }
 
-v8::Handle<Value> MethodGetVolumeName(const Arguments& args) {
-  HandleScope scope;
+NAN_METHOD(MethodGetVolumeName) {
+  NanScope();
 
-  String::AsciiValue aPath(args[0]);
+  NanAsciiString aPath(args[0]);
 
   CFStringRef volumePath = CFStringCreateWithCString(NULL, *aPath, kCFStringEncodingUTF8);
   CFURLRef url = CFURLCreateWithFileSystemPath(NULL, volumePath, kCFURLPOSIXPathStyle, true);
@@ -38,19 +39,19 @@ v8::Handle<Value> MethodGetVolumeName(const Arguments& args) {
   Local<String> errorDesc;
 
   if (CFURLGetFSRef(url, &urlFS) == false) {
-    ThrowException(Exception::Error(String::New("Failed to convert URL to file or directory object"))->ToObject());
-    return scope.Close(Undefined());
+    NanThrowError("Failed to convert URL to file or directory object");
+    NanReturnUndefined();
   }
 
   if ((err = FSGetCatalogInfo(&urlFS, kFSCatInfoVolume, &urlInfo, NULL, NULL, NULL)) != noErr) {
-    ThrowException(Exception::Error(OSErrDescription(err))->ToObject());
-    return scope.Close(Undefined());
+    NanThrowError(OSErrDescription(err));
+    NanReturnUndefined();
   }
 
   if ((err = FSGetVolumeInfo(urlInfo.volume, 0, NULL, kFSVolInfoNone, NULL, &outString, NULL)) != noErr) {
-    ThrowException(Exception::Error(OSErrDescription(err))->ToObject());
-    return scope.Close(Undefined());
+    NanThrowError(OSErrDescription(err));
+    NanReturnUndefined();
   }
 
-  return scope.Close(String::New(outString.unicode, outString.length));
+  NanReturnValue(NanNew(outString.unicode, outString.length));
 }

src/impl-apple-lion.cc

@@ -2,12 +2,15 @@
 #include <CoreFoundation/CFURL.h>
 #include <CoreFoundation/CFString.h>
 
-using namespace v8;
+using v8::String;
+using v8::Exception;
+using v8::Local;
+using v8::Value;
 
 Local<String> MYCFStringGetV8String(CFStringRef aString) {
 
   if (aString == NULL) {
-    return String::New("");
+    return NanNew("");
   }
 
   CFIndex length = CFStringGetLength(aString);
@@ -16,19 +19,19 @@ Local<String> MYCFStringGetV8String(CFStringRef aString) {
 
   if (CFStringGetCString(aString, buffer, maxSize, kCFStringEncodingUTF8)) {
 
-    Local<String> result = String::New(buffer);
+    Local<String> result = NanNew(buffer);
     free(buffer);
 
     return result;
   }
 
-  return String::New("");
+  return NanNew("");
 }
 
-Handle<Value> MethodGetVolumeName(const Arguments& args) {
-  HandleScope scope;
+NAN_METHOD(MethodGetVolumeName) {
+   NanScope();
 
-  String::AsciiValue aPath(args[0]);
+  NanAsciiString aPath(args[0]);
 
   CFStringRef out;
   CFErrorRef error;
@@ -40,12 +43,12 @@ Handle<Value> MethodGetVolumeName(const Arguments& args) {
 
     Local<String> result = MYCFStringGetV8String(out);
 
-    return scope.Close(result);
+    NanReturnValue(result);
   } else {
 
     Local<String> desc = MYCFStringGetV8String(CFErrorCopyDescription(error));
-    ThrowException(Exception::Error(desc)->ToObject());
+    NanThrowError(Exception::Error(desc)->ToObject());
 
-    return scope.Close(Undefined());
+    NanReturnUndefined();
   }
 }

src/volume.cc

@@ -1,4 +1,5 @@
 
+#include <nan.h>
 #include <node.h>
 #include <v8.h>
 
@@ -8,8 +9,10 @@
 #error This platform is not implemented yet
 #endif
 
-void init(v8::Handle<v8::Object> exports) {
-  exports->Set(v8::String::NewSymbol("getVolumeName"), v8::FunctionTemplate::New(MethodGetVolumeName)->GetFunction());
+using v8::FunctionTemplate;
+
+void Initialize(v8::Handle<v8::Object> exports) {
+  exports->Set(NanNew("getVolumeName"), NanNew<FunctionTemplate>(MethodGetVolumeName)->GetFunction());
 }
 
-NODE_MODULE(volume, init)
+NODE_MODULE(volume, Initialize)