added obj parsing for json response

Author: fehguy

lib/swagger.js

@@ -4,9 +4,12 @@ var __bind = function(fn, me){
   };
 };
 
-log = function() {
-  if (window.console)
-    return console.log(console, arguments);
+log = function(){
+  log.history = log.history || [];
+  log.history.push(arguments);
+  if(this.console){
+    console.log( Array.prototype.slice.call(arguments) );
+  }
 };
 
 var SwaggerApi = function(url, options) {
@@ -16,7 +19,6 @@ var SwaggerApi = function(url, options) {
   this.authorizations = null;
   this.authorizationScheme = null;
   this.info = null;
-  this.useJQuery = true;
 
   options = (options||{});
   if (url)
@@ -62,8 +64,7 @@ SwaggerApi.prototype.build = function() {
         }
       },
       response: function(resp) {
-        var responseObj;
-        responseObj = JSON.parse(resp.data);
+        var responseObj = resp.obj;
         _this.swaggerVersion = responseObj.swaggerVersion;
         if (_this.swaggerVersion === "1.2") {
           return _this.buildFromSpec(responseObj);
@@ -73,7 +74,7 @@ SwaggerApi.prototype.build = function() {
       }
     }
   };
-  var e = typeof window !== 'undefined' ? window : exports;
+  var e = (typeof window !== 'undefined' ? window : exports);
   e.authorizations.apply(obj);
   new SwaggerHttp().execute(obj);
   return this;
@@ -284,8 +285,7 @@ var SwaggerResource = function(resourceObj, api) {
           return _this.api.fail("Unable to read api '" + _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
         },
         response: function(response) {
-          var responseObj;
-          responseObj = JSON.parse(response.data);
+          var responseObj = response.obj;
           return _this.addApiDeclaration(responseObj);
         }
       }
@@ -406,6 +406,7 @@ SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes,
 SwaggerResource.prototype.sanitize = function(nickname) {
   var op;
   op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|./?,\\'""-]/g, '_');
+  //'
   op = op.replace(/((_){2,})/g, '_');
   op = op.replace(/^(_)*/g, '');
   op = op.replace(/([_])*$/g, '');
@@ -875,7 +876,7 @@ SwaggerOperation.prototype.help = function() {
   return msg;
 };
 
-var SwaggerRequest = function(type,   url,               params, opts, successCallback, errorCallback, operation, execution) {
+var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
   var _this = this;
   var errors = [];
   this.useJQuery = (typeof operation.useJQuery !== 'undefined' ? operation.useJQuery : null);
@@ -1031,7 +1032,7 @@ SwaggerRequest.prototype.asCurl = function() {
   return "curl " + (results.join(" ")) + " " + this.url;
 };
 
-/*
+/**
  * SwaggerHttp is a wrapper for executing requests
  */
 var SwaggerHttp = function() {};
@@ -1108,6 +1109,10 @@ JQueryHttpClient.prototype.execute = function(obj) {
       headers: headers
     };
 
+    if(response._headers["Content-Type"] && response._headers["Content-Type"].indexOf("application/json") == 0 && response.content.data !== "") {
+      out.obj = JSON.parse(response.responseText);
+    }
+
     if(response.status >= 200 && response.status < 300)
       cb.response(out);
     else if(response.status === 0 || (response.status >= 400 && response.status < 599))
@@ -1171,35 +1176,41 @@ ShredHttpClient.prototype.execute = function(obj) {
   var cb = obj.on, res;
 
   var transform = function(response) {
-    return {
+    var out = {
       headers: response._headers,
       url: response.request.url,
       method: response.request.method,
       status: response.status,
       data: response.content.data
     };
+
+    if(response._headers["Content-Type"]) {
+      if(response._headers["Content-Type"].indexOf("application/json") == 0) {
+        if(response.content.data !== "")
+          out.obj = JSON.parse(response.content.data);
+        else
+          out.obj = {}
+      }
+    }
+    return out;
   };
 
   res = {
     error: function(response) {
-      if (obj) {
+      if (obj)
         return cb.error(transform(response));
-      }
     },
     redirect: function(response) {
-      if (obj) {
+      if (obj)
         return cb.redirect(transform(response));
-      }
     },
     307: function(response) {
-      if (obj) {
+      if (obj)
         return cb.redirect(transform(response));
-      }
     },
     response: function(response) {
-      if (obj) {
+      if (obj)
         return cb.response(transform(response));
-      }
     }
   };
   if (obj) {
@@ -1279,7 +1290,7 @@ PasswordAuthorization.prototype.apply = function(obj, authorizations) {
   return true;
 };
 
-var e = typeof exports !== 'undefined' ? e : window;
+var e = (typeof window !== 'undefined' ? window : exports);
 
 e.SwaggerHttp = SwaggerHttp;
 e.SwaggerRequest = SwaggerRequest;