Merge branch 'master' of github.com:brainflake/node-hubspot

lib/client.js

@@ -116,12 +116,19 @@ function Client() {
       };
       sendRequest(call, cb);
     },
-    getOne: function(id, cb) {
+    getOne: function(id, appId, cb) {
       if (!id || typeof id === "function") { return cb(new Error("id parameter must be provided.")); }
+      if (typeof appId === "function") { cb = appId; appId = null; }
+
       var call = {
         method: 'GET',
         url: self.baseUrl + '/email/public/v1/campaigns/' + id
       };
+      if (appId) {
+        call.qs = {
+          appId: appId
+        }
+      }
       sendRequest(call, cb);
     },
     tracking: campaignTracking
@@ -162,6 +169,7 @@ function Client() {
         } catch (e) {
           console.log(e);
           console.log('error parsing response');
+          return cb(new Error(data)); // sometimes errors are returned as strings.
         }
       }
       //if (data.error) { return cb(new Error(data.error)); }