Merge pull request #551 from NickNaso/node-addon-api

bcrypt for Node.js with Node addon api

.travis.yml

@@ -8,14 +8,12 @@ os:
   - osx
 
 node_js:
-  - "0.8"
-  - "0.10"
-  - "0.12"
   - "4"
   - "5"
   - "6"
   - "7"
   - "8"
+  - "9"
 
 addons:
   apt:
@@ -29,7 +27,6 @@ before_install:
   - echo Building for Node $TRAVIS_NODE_VERSION
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=$LINUX_CXX; $CXX --version; fi;
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then c++ --version; fi;
-  - if [[ $(echo "$TRAVIS_NODE_VERSION <= 0.12" | bc -l) ]]; then npm install -g npm@2; else npm install -g npm@latest; fi;
 
 install: true
 

README.md

@@ -254,6 +254,7 @@ The code for this comes from a few sources:
 * [Sean McArthur][seanmonstar] - Windows Support
 * [Fanie Oosthuysen][weareu] - Windows Support
 * [Amitosh Swain Mahapatra][agathver] - ES6 Promise Support
+* [Nicola Del Gobbo][NickNaso] - Initial implementation with N-API
 
 ## License
 Unless stated elsewhere, file headers or otherwise, the license as stated in the LICENSE file.
@@ -281,3 +282,4 @@ Unless stated elsewhere, file headers or otherwise, the license as stated in the
 [seanmonstar]:https://github.com/seanmonstar
 [weareu]:https://github.com/weareu
 [agathver]:https://github.com/Agathver
+[NickNaso]: https://github.com/NickNaso

appveyor.yml

@@ -1,13 +1,5 @@
 environment:
   matrix:
-  - nodejs_version: "0.10"
-    platform: x64
-  - nodejs_version: "0.10"
-    platform: x86
-  - nodejs_version: "0.12"
-    platform: x64
-  - nodejs_version: "0.12"
-    platform: x86
   - nodejs_version: "4"
     platform: x64
   - nodejs_version: "4"
@@ -27,7 +19,7 @@ environment:
   - nodejs_version: "8"
     platform: x64
   - nodejs_version: "8"
-    platform: x86
+    platform: x86 
 
 install:
   - where npm

binding.gyp

@@ -7,16 +7,31 @@
         'src/bcrypt.cc',
         'src/bcrypt_node.cc'
       ],
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
       'include_dirs' : [
-          "<!(node -e \"require('nan')\")"
-      ],
+          "<!@(node -p \"require('node-addon-api').include\")"
+      ], 
+      'dependencies': ["<!(node -p \"require('node-addon-api').gyp\")"],
       'conditions': [
-        [ 'OS=="win"', {
+        ['OS=="win"', {
+          "msvs_settings": {
+            "VCCLCompilerTool": {
+              "ExceptionHandling": 1
+            }
+          },
           'defines': [
             'uint=unsigned int',
-          ],
+          ]
         }],
-      ],
+        ['OS=="mac"', {
+          "xcode_settings": {
+            "CLANG_CXX_LIBRARY": "libc++",
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+            'MACOSX_DEPLOYMENT_TARGET': '10.7'
+          }
+        }]
+      ]
     },
     {
       "target_name": "action_after_build",

package.json

@@ -14,7 +14,7 @@
   "version": "1.0.3",
   "author": "Nick Campbell (https://github.com/ncb000gt)",
   "engines": {
-    "node": ">= 0.6.0"
+    "node": ">= 4.0.0"
   },
   "repository": {
     "type": "git",
@@ -29,8 +29,9 @@
     "install": "node-pre-gyp install --fallback-to-build"
   },
   "dependencies": {
-    "nan": "2.6.2",
-    "node-pre-gyp": "0.6.36"
+    "bindings": "1.3.0",
+    "node-addon-api": "1.1.0",
+    "node-pre-gyp": "0.6.39"
   },
   "devDependencies": {
     "nodeunit": "~0.9.1"
@@ -50,7 +51,8 @@
     "Nate Rajlich <[email protected]> (https://github.com/tootallnate)",
     "Sean McArthur <[email protected]> (https://github.com/seanmonstar)",
     "Fanie Oosthuysen <[email protected]> (https://github.com/weareu)",
-    "Amitosh Swain Mahapatra <[email protected]> (https://github.com/Agathver)"
+    "Amitosh Swain Mahapatra <[email protected]> (https://github.com/Agathver)",
+    "Nicola Del Gobbo <[email protected]> (https://github.com/NickNaso)"
   ],
   "binary": {
     "module_name": "bcrypt_lib",