Merge branch 'master' into stable

README.md

@@ -9,12 +9,18 @@ NPM status:
 [![NPM version](https://badge.fury.io/js/paypal-rest-sdk.png)](http://badge.fury.io/js/paypal-rest-sdk)
 [![Dependency Status](https://david-dm.org/paypal/PayPal-node-SDK.png)](https://david-dm.org/paypal/PayPal-node-SDK)
 
-Repository for PayPal's Node SDK (node.js version >=0.6.x) and Node samples for REST API. Refer [Node.js Sample Reference App ](https://github.com/paypal/rest-api-sample-app-nodejs) for a sample web app implementing the REST APIs.
+Repository for PayPal's Node SDK (node.js version >=0.6.x) and Node samples for REST API. For a full working app and documentation, have a look at the [PayPal Node SDK Page](http://paypal.github.io/PayPal-node-SDK/).
 
 > **v1.0.0 notice**: If upgrading from paypal rest sdk 0.*, Please view Breaking Changes in release_notes.md
 
 > **Before starting to use the sdk, please be aware of the [existing issues and currently unavailable or upcoming features](https://github.com/paypal/PayPal-Python-SDK/wiki/Existing-Issues-and-Unavailable%5CUpcoming-features) for the REST APIs. (which the sdks are based on)** 
 
+## Installation
+
+```sh
+npm install paypal-rest-sdk
+```
+
 ## Usage
 To write an app using the SDK
 
@@ -129,8 +135,8 @@ grunt test (timeout is specified in milliseconds eg: 15000ms)
 
 ## Debugging
 
-   * It is recommended to provide Paypal-Debug-Id if requesting PayPal Merchant Technical Services for support. You can get access to the debug id by setting environment variable NODE_ENV=development
-   * The error object returned for any bad request has error.response populated with [details](https://developer.paypal.com/webapps/developer/docs/api/#errors)
+   * It is recommended to provide Paypal-Debug-Id if requesting PayPal Merchant Technical Services for support. You can get access to the debug id by setting environment variable NODE_ENV=development.
+   * The error object returned for any bad request has error.response populated with [details](https://developer.paypal.com/webapps/developer/docs/api/#errors). NODE_ENV=development setting also gives you access to stringfied response in error messages.
 
 ## Reference
    [REST API Reference] (https://developer.paypal.com/webapps/developer/docs/api/)

lib/client.js

@@ -85,7 +85,8 @@ var invoke = exports.invoke = function invoke(http_method, path, data, http_opti
                 //Set response to be parsed JSON object if data received is json
                 //expect that content-type header has application/json when it
                 //returns data
-                if (res.headers['content-type'] === "application/json") {
+                if (typeof res.headers['content-type'] === "string" &&
+                    res.headers['content-type'].match(/^application\/json(?:;.*)?$/) !== null) {
                     response = JSON.parse(response);
                 }
                 //Set response to an empty object if no data was received
@@ -98,7 +99,7 @@ var invoke = exports.invoke = function invoke(http_method, path, data, http_opti
                 //for questions to merchant technical services. Similar convention
                 //to express.js
                 if (res.headers['paypal-debug-id'] !== undefined && process.env.NODE_ENV === 'development') {
-                    console.log(res.headers['paypal-debug-id']);
+                    console.log('paypal-debug-id: ' + res.headers['paypal-debug-id']);
                 }
             } catch (e) {
                 err = new Error('Invalid JSON Response Received');
@@ -115,6 +116,9 @@ var invoke = exports.invoke = function invoke(http_method, path, data, http_opti
             if (!err && (res.statusCode < 200 || res.statusCode >= 300)) {
                 err = new Error('Response Status : ' + res.statusCode);
                 err.response = response;
+                if (process.env.NODE_ENV === 'development') {
+                    err.response_stringified = JSON.stringify(response);
+                }
                 err.httpStatusCode = res.statusCode;
                 response = null;
             }

lib/utils.js

@@ -39,7 +39,9 @@ function clone(v) {
 
 /**
  * Merges two Objects recursively, setting property of obj1 to those of obj2
- * and creating property as necessary
+ * and creating property as necessary. 
+ *
+ * Implementation suggested by @kobalicek on https://github.com/paypal/PayPal-node-SDK/issues/69
  * @param  {Object} obj1 
  * @param  {Object} obj2 
  * @return {Object}     
@@ -52,7 +54,7 @@ var merge = exports.merge = function merge(obj1, obj2) {
     }
 
     if (obj2 === null || typeof obj2 !== "object") {
-        throw new TypeError("merge() - first parameter has to be an object, not " + typeof obj1 + ".");
+        throw new TypeError("merge() - first parameter has to be an object, not " + typeof obj2 + ".");
     }
 
     if (isArray(obj1) || isArray(obj2)) {

package.json

@@ -2,7 +2,7 @@
   "author": "PayPal <DL-PP-NODEJS-SDK@ebay.com> (https://developer.paypal.com/)",
   "name": "paypal-rest-sdk",
   "description": "SDK for PayPal REST APIs",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "homepage": "https://github.com/paypal/PayPal-node-SDK",
   "keywords": [
     "paypal",

release_notes.md

@@ -1,6 +1,12 @@
 PayPal Node SDK release notes
 ============================
 
+v1.5.2
+----
+* Content-Type Header parsing fix
+* Merge updated
+* NODE_ENV=development provides stringified response
+
 v1.5.1
 ----
 * utils.merge patch for empty header, fixes #69 and #70