fsevents 0.3.7 → 0.3.8

package/fsevents.cc

@@ -16,7 +16,7 @@
 namespace fse {
   class FSEvents : public node::ObjectWrap {
   public:
-    FSEvents(const char *path, NanCallback *handler);
+    FSEvents(const char *path, Nan::Callback *handler);
     ~FSEvents();
 
     // locking.cc
@@ -41,7 +41,7 @@ namespace fse {
     void threadStop();
 
     // methods.cc - internal
-    NanCallback *handler;
+    Nan::Callback *handler;
     void emitEvent(const char *path, UInt32 flags, UInt64 id);
 
     // Common
@@ -59,7 +59,7 @@ namespace fse {
 
 using namespace fse;
 
-FSEvents::FSEvents(const char *path, NanCallback *handler): handler(handler) {
+FSEvents::FSEvents(const char *path, Nan::Callback *handler): handler(handler) {
   CFStringRef dirs[] = { CFStringCreateWithCString(NULL, path, kCFStringEncodingUTF8) };
   paths = CFArrayCreate(NULL, (const void **)&dirs, 1, NULL);
   threadloop = NULL;
@@ -85,15 +85,18 @@ FSEvents::~FSEvents() {
 #include "src/methods.cc"
 
 void FSEvents::Initialize(v8::Handle<v8::Object> exports) {
-  v8::Local<v8::FunctionTemplate> tpl = NanNew<v8::FunctionTemplate>(FSEvents::New);
-  tpl->SetClassName(NanNew<v8::String>("FSEvents"));
+  v8::Local<v8::FunctionTemplate> tpl = Nan::New<v8::FunctionTemplate>(FSEvents::New);
+  tpl->SetClassName(Nan::New<v8::String>("FSEvents").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  NODE_SET_PROTOTYPE_METHOD(tpl, "stop", FSEvents::Stop);
-  NODE_SET_PROTOTYPE_METHOD(tpl, "start", FSEvents::Start);
-
-  exports->Set(NanNew<v8::String>("Constants"), Constants());
-  exports->Set(NanNew<v8::String>("FSEvents"), tpl->GetFunction());
+  tpl->PrototypeTemplate()->Set(
+           Nan::New<v8::String>("start").ToLocalChecked(),
+           Nan::New<v8::FunctionTemplate>(FSEvents::Start)->GetFunction());
+  tpl->PrototypeTemplate()->Set(
+           Nan::New<v8::String>("stop").ToLocalChecked(),
+           Nan::New<v8::FunctionTemplate>(FSEvents::Stop)->GetFunction());
+  exports->Set(Nan::New<v8::String>("Constants").ToLocalChecked(), Constants());
+  exports->Set(Nan::New<v8::String>("FSEvents").ToLocalChecked(),
+               tpl->GetFunction());
 }
 
 NODE_MODULE(fse, FSEvents::Initialize)

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "fsevents",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Native Access to Mac OS-X FSEvents",
   "main": "fsevents.js",
   "dependencies": {
-    "nan": "^1.8.0"
+    "nan": "^2.0.2"
   },
   "os": [
     "darwin"

package/src/constants.cc

@@ -85,27 +85,26 @@
 #endif
 
 static v8::Local<v8::Object> Constants() {
-  NanEscapableScope();
-  v8::Local<v8::Object> object = NanNew<v8::Object>();
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagNone"), NanNew<v8::Integer>(kFSEventStreamEventFlagNone));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagMustScanSubDirs"), NanNew<v8::Integer>(kFSEventStreamEventFlagMustScanSubDirs));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagUserDropped"), NanNew<v8::Integer>(kFSEventStreamEventFlagUserDropped));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagKernelDropped"), NanNew<v8::Integer>(kFSEventStreamEventFlagKernelDropped));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagEventIdsWrapped"), NanNew<v8::Integer>(kFSEventStreamEventFlagEventIdsWrapped));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagHistoryDone"), NanNew<v8::Integer>(kFSEventStreamEventFlagHistoryDone));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagRootChanged"), NanNew<v8::Integer>(kFSEventStreamEventFlagRootChanged));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagMount"), NanNew<v8::Integer>(kFSEventStreamEventFlagMount));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagUnmount"), NanNew<v8::Integer>(kFSEventStreamEventFlagUnmount));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemCreated"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemCreated));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemRemoved"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemRemoved));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemInodeMetaMod"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemInodeMetaMod));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemRenamed"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemRenamed));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemModified"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemModified));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemFinderInfoMod"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemFinderInfoMod));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemChangeOwner"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemChangeOwner));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemXattrMod"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemXattrMod));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemIsFile"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemIsFile));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemIsDir"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemIsDir));
-  object->Set(NanNew<v8::String>("kFSEventStreamEventFlagItemIsSymlink"), NanNew<v8::Integer>(kFSEventStreamEventFlagItemIsSymlink));
-  return NanEscapeScope(object);
+  v8::Local<v8::Object> object = Nan::New<v8::Object>();
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagNone").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagNone));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagMustScanSubDirs").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagMustScanSubDirs));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagUserDropped").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagUserDropped));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagKernelDropped").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagKernelDropped));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagEventIdsWrapped").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagEventIdsWrapped));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagHistoryDone").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagHistoryDone));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagRootChanged").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagRootChanged));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagMount").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagMount));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagUnmount").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagUnmount));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemCreated").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemCreated));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemRemoved").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemRemoved));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemInodeMetaMod").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemInodeMetaMod));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemRenamed").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemRenamed));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemModified").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemModified));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemFinderInfoMod").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemFinderInfoMod));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemChangeOwner").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemChangeOwner));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemXattrMod").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemXattrMod));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemIsFile").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemIsFile));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemIsDir").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemIsDir));
+  object->Set(Nan::New<v8::String>("kFSEventStreamEventFlagItemIsSymlink").ToLocalChecked(), Nan::New<v8::Integer>(kFSEventStreamEventFlagItemIsSymlink));
+  return object;
 }

package/src/methods.cc

@@ -5,44 +5,38 @@
 
 void FSEvents::emitEvent(const char *path, UInt32 flags, UInt64 id) {
   if (!handler) return;
-  NanScope();
+  Nan::HandleScope handle_scope;
   v8::Local<v8::Value> argv[] = {
-    NanNew<v8::String>(path),
-    NanNew<v8::Number>(flags),
-    NanNew<v8::Number>(id)
+    Nan::New<v8::String>(path).ToLocalChecked(),
+    Nan::New<v8::Number>(flags),
+    Nan::New<v8::Number>(id)
   };
   handler->Call(3, argv);
 }
 
 NAN_METHOD(FSEvents::New) {
-  NanScope();
-
-  NanUtf8String *path = new NanUtf8String(args[0]);
-  NanCallback *callback = new NanCallback(args[1].As<v8::Function>());
+  Nan::Utf8String *path = new Nan::Utf8String(info[0]);
+  Nan::Callback *callback = new Nan::Callback(info[1].As<v8::Function>());
 
   FSEvents *fse = new FSEvents(**path, callback);
-  fse->Wrap(args.This());
+  fse->Wrap(info.This());
 
-  NanReturnValue(args.This());
+  info.GetReturnValue().Set(info.This());
 }
 
 NAN_METHOD(FSEvents::Stop) {
-  NanScope();
-
-  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(args.This());
+  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(info.This());
 
   fse->threadStop();
   fse->asyncStop();
 
-  NanReturnValue(args.This());
+  info.GetReturnValue().Set(info.This());
 }
 
 NAN_METHOD(FSEvents::Start) {
-  NanScope();
-
-  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(args.This());
+  FSEvents* fse = node::ObjectWrap::Unwrap<FSEvents>(info.This());
   fse->asyncStart();
   fse->threadStart();
 
-  NanReturnValue(args.This());
+  info.GetReturnValue().Set(info.This());
 }