updated pagination code to support latest features

Author: mikedeboer

index.js

@@ -507,7 +507,10 @@ var Client = module.exports = function(config) {
 
             var ret;
             try {
-                ret = res.data && JSON.parse(res.data);
+                ret = res.data;
+                var contentType = res.headers["content-type"];
+                if (contentType && contentType.indexOf("application/json") !== -1)
+                    ret = JSON.parse(ret);
             }
             catch (ex) {
                 if (callback)
@@ -517,12 +520,14 @@ var Client = module.exports = function(config) {
 
             if (!ret)
                 ret = {};
-            if (!ret.meta)
-                ret.meta = {};
-            ["x-ratelimit-limit", "x-ratelimit-remaining", "link"].forEach(function(header) {
-                if (res.headers[header])
-                    ret.meta[header] = res.headers[header];
-            });
+            if (typeof ret == "object") {
+                if (!ret.meta)
+                    ret.meta = {};
+                ["x-ratelimit-limit", "x-ratelimit-remaining", "link"].forEach(function(header) {
+                    if (res.headers[header])
+                        ret.meta[header] = res.headers[header];
+                });
+            }
 
             if (callback)
                 callback(null, ret);