Merge pull request #3 from Medium/nick-nan

Use nan to make oid compatible with node 0.12

.gitignore

@@ -1,2 +1,3 @@
 build
 oidNative.node
+node_modules

.travis.yml

@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+  - "0.12"
   - "0.10"
   - "0.8"
 

README.md

@@ -1,6 +1,8 @@
 oid
 ===
 
+[![Build Status](https://travis-ci.org/Medium/oid.svg)](https://travis-ci.org/Medium/oid)
+
 This Node module provides a simple utility for object identity hashing
 and two related classes. This can be useful any time you need to do
 triple-equals (`===`) style comparisons across arbitrary numbers of

binding.gyp

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

package.json

@@ -1,14 +1,14 @@
 {
     "name": "oid",
-    "version": "0.5.1",
+    "version": "1.0.0",
     "keywords":
         ["object", "id", "identity", "hash", "hashcode", "objid", "oid"],
     "description":
         "Utilities for object identity and hashing",
-    "homepage": "https://github.com/Obvious/oid",
+    "homepage": "https://github.com/Medium/oid",
     "repository": {
         "type": "git",
-        "url": "https://github.com/Obvious/oid.git"
+        "url": "https://github.com/Medium/oid.git"
     },
     "licenses": [ {
         "type": "Apache 2.0",
@@ -27,7 +27,10 @@
 
     "main": "lib/oid.js",
     "engine": {
-        "node": ">=0.6.0"
+        "node": ">=0.8.0"
+    },
+    "dependencies": {
+        "nan": "1.6.2"
     },
 
     "scripts": {

src/oidNative.cc

@@ -1,31 +1,22 @@
 // Copyright 2012 The Obvious Corporation.
 
 #include <node.h>
+#include <nan.h>
 #include <v8.h>
 
 using namespace v8;
 
-/**
- * Helper to schedule an exception with the given message and return
- * undefined.
- */
-static Handle<Value> scheduleException(const char* message) {
-    Local<Value> exception = Exception::Error(String::New(message));
-    ThrowException(exception);
-    return Undefined();
-}
-
-Handle<Value> ObjectIdHash(const Arguments& args) {
-    HandleScope scope;
+NAN_METHOD(ObjectIdHash) {
+    NanScope();
 
     Local<Value> val = args[0];
     if (val->IsNull()) {
-        return scope.Close(Integer::New(99961)); // A prime number.
+        NanReturnValue(NanNew<Integer>(99961)); // A prime number.
     }
 
     Local<Object> obj = val->ToObject();
     if (obj.IsEmpty()) {
-        return scheduleException("Not an object.");
+        return NanThrowError("Not an object.");
     }
 
     int hash = obj->GetIdentityHash() & 0x7fffffff;
@@ -38,15 +29,15 @@ Handle<Value> ObjectIdHash(const Arguments& args) {
         hash = 1;
     }
 
-    return scope.Close(Integer::New(hash));
+    NanReturnValue(NanNew<Integer>(hash));
 }
 
-Handle<Value> NumberIdHash(const Arguments& args) {
-    HandleScope scope;
+NAN_METHOD(NumberIdHash) {
+    NanScope();
 
     Local<Number> num = args[0]->ToNumber();
     if (num.IsEmpty()) {
-        return scheduleException("Not a number.");
+        return NanThrowError("Not a number.");
     }
 
     union {
@@ -68,14 +59,14 @@ Handle<Value> NumberIdHash(const Arguments& args) {
         hash = 1;
     }
 
-    return scope.Close(Number::New((double) hash));
+    NanReturnValue(NanNew<Number>((double) hash));
 }
 
 void init(Handle<Object> target) {
-    target->Set(String::NewSymbol("objectIdHash"),
-                FunctionTemplate::New(ObjectIdHash)->GetFunction());
-    target->Set(String::NewSymbol("numberIdHash"),
-                FunctionTemplate::New(NumberIdHash)->GetFunction());
+    target->Set(NanNew<String>("objectIdHash"),
+                NanNew<FunctionTemplate>(ObjectIdHash)->GetFunction());
+    target->Set(NanNew<String>("numberIdHash"),
+                NanNew<FunctionTemplate>(NumberIdHash)->GetFunction());
 }
 
 NODE_MODULE(oidNative, init)