Merge branch 'master' of github.com:puritys/nodejs-phplike

puritys · Nov 26, 2014 · 1dcd0e2 · 1dcd0e2
2 parents da426b4 + c101c16
commit 1dcd0e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -145,6 +145,8 @@ Functions will be implemented in the future
 * strval: convert integer to string
 * explode
 * implode
+* urlencode
+* urldecode
 * abs
 * acos
 * strtolower

diff --git a/binding.gyp b/binding.gyp
@@ -41,6 +41,9 @@
           ],
           ['OS=="mac"', {
               "cflags": ["-std=gnu++0x"],
+              "xcode_settings": {
+                  "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
+              },
               "libraries": [
                   '/usr/lib/libcurl.dylib'
               ],

diff --git a/nodejs/curl.js b/nodejs/curl.js
@@ -85,6 +85,6 @@ exports.curl_exec = function (curlInput) {
 
 };
 
-if (UNIT_TEST) {
+if (typeof(UNIT_TEST) != "undefined" && UNIT_TEST === true) {
     exports.reformatCurlData = reformatCurlData;
 }
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.0.2",
+    "version": "2.0.5",
     "description": "Implement php function to nodejs ",
     "main": "phplike",
     "contributors": "pipi00000@gmail.com",
@@ -11,6 +11,6 @@
       "install": "node-gyp rebuild"
     },
     "gypfile": true,
-    "os" : ["linux" ],
+    "os" : ["linux", "mac", "darwin" ],
     "cpu" : [ "x64", "ia32", "arm" ]
 }