Updated for new v8

package.json

@@ -37,7 +37,7 @@
     },
     "dependencies": {
         "node-pre-gyp": "0.5.x",
-	"nan": "~0.8.0"
+	"nan": "git://github.com/rvagg/nan.git#0.9-wip"
     },
     "bundledDependencies": [
         "node-pre-gyp"

src/database.h

@@ -40,11 +40,11 @@ public:
                 db(db_), status(SQLITE_OK) {
             db->Ref();
             request.data = this;
-            NanAssignPersistent(Function, callback, cb_);
+            NanAssignPersistent(callback, cb_);
         }
         virtual ~Baton() {
             db->Unref();
-            callback.Dispose();
+            NanDisposePersistent(callback);
         }
     };
 

src/macros.h

@@ -57,54 +57,54 @@ const char* sqlite_authorizer_string(int type);
 
 #define DEFINE_CONSTANT_INTEGER(target, constant, name)                        \
     (target)->Set(                                                             \
-        String::NewSymbol(#name),                                              \
-        Integer::New(constant),                                                \
+        NanSymbol(#name),                                                      \
+        NanNew<Integer>(constant),                                             \
         static_cast<PropertyAttribute>(ReadOnly | DontDelete)                  \
     );
 
 #define DEFINE_CONSTANT_STRING(target, constant, name)                         \
     (target)->Set(                                                             \
-        String::NewSymbol(#name),                                              \
-        String::NewSymbol(constant),                                           \
+        NanSymbol(#name),                                                      \
+        NanSymbol(constant),                                                   \
         static_cast<PropertyAttribute>(ReadOnly | DontDelete)                  \
     );
 
 
 #define NODE_SET_GETTER(target, name, function)                                \
     (target)->InstanceTemplate()                                               \
-        ->SetAccessor(String::NewSymbol(name), (function));
+        ->SetAccessor(NanSymbol(name), (function));
 
 #define GET_STRING(source, name, property)                                     \
-    String::Utf8Value name((source)->Get(String::NewSymbol(property)));
+    String::Utf8Value name((source)->Get(NanSymbol(property)));
 
 #define GET_INTEGER(source, name, property)                                    \
-    int name = (source)->Get(String::NewSymbol(property))->Int32Value();
+    int name = (source)->Get(NanSymbol(property))->Int32Value();
 
 #define EXCEPTION(msg, errno, name)                                            \
     Local<Value> name = Exception::Error(                                      \
         String::Concat(                                                        \
             String::Concat(                                                    \
-                String::NewSymbol(sqlite_code_string(errno)),                  \
-                String::NewSymbol(": ")                                        \
+                NanSymbol(sqlite_code_string(errno)),                          \
+                NanSymbol(": ")                                                \
             ),                                                                 \
             (msg)                                                              \
         )                                                                      \
     );                                                                         \
     Local<Object> name ##_obj = name->ToObject();                              \
-    name ##_obj->Set(String::NewSymbol("errno"), Integer::New(errno));         \
-    name ##_obj->Set(String::NewSymbol("code"),                                \
-        String::NewSymbol(sqlite_code_string(errno)));
+    name ##_obj->Set(NanSymbol("errno"), NanNew<Integer>(errno));              \
+    name ##_obj->Set(NanSymbol("code"),                                        \
+        NanSymbol(sqlite_code_string(errno)));
 
 
 #define EMIT_EVENT(obj, argc, argv)                                            \
     TRY_CATCH_CALL((obj),                                                      \
-        Local<Function>::Cast((obj)->Get(String::NewSymbol("emit"))),          \
+        Local<Function>::Cast((obj)->Get(NanSymbol("emit"))),                  \
         argc, argv                                                             \
     );
 
 #define TRY_CATCH_CALL(context, callback, argc, argv)                          \
 {   TryCatch try_catch;                                                        \
-    MakeCallback((context), (callback), (argc), (argv));                       \
+    NanMakeCallback((context), (callback), (argc), (argv));                    \
     if (try_catch.HasCaught()) {                                               \
         FatalException(try_catch);                                             \
     }                                                                          }

src/statement.h

@@ -88,7 +88,7 @@ public:
         Baton(Statement* stmt_, Handle<Function> cb_) : stmt(stmt_) {
             stmt->Ref();
             request.data = this;
-            NanAssignPersistent(Function, callback, cb_);
+            NanAssignPersistent(callback, cb_);
         }
         virtual ~Baton() {
             for (unsigned int i = 0; i < parameters.size(); i++) {
@@ -96,7 +96,7 @@ public:
                 DELETE_FIELD(field);
             }
             stmt->Unref();
-            callback.Dispose();
+            NanDisposePersistent(callback);
         }
     };
 
@@ -176,8 +176,8 @@ public:
 
         ~Async() {
             stmt->Unref();
-            item_cb.Dispose();
-            completed_cb.Dispose();
+            NanDisposePersistent(item_cb);
+            NanDisposePersistent(completed_cb);
             NODE_SQLITE3_MUTEX_DESTROY
         }
     };