cleaned up content-type detection

Author: fehguy

lib/swagger.js

@@ -281,12 +281,13 @@ var SwaggerResource = function(resourceObj, api) {
         accept: "application/json"
       },
       on: {
-        error: function(response) {
-          return _this.api.fail("Unable to read api '" + _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
-        },
         response: function(response) {
           var responseObj = response.obj;
           return _this.addApiDeclaration(responseObj);
+        },
+        error: function(response) {
+          return _this.api.fail("Unable to read api '" +
+            _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
         }
       }
     };
@@ -552,7 +553,7 @@ SwaggerModelProperty.prototype.toSampleValue = function(value) {
     result = 0;
   } else if (value === "boolean") {
     result = false;
-  } else if (value === "double") {
+  } else if (value === "double" || value === "number") {
     result = 0.0;
   } else if (value === "string") {
     result = "";
@@ -563,9 +564,8 @@ SwaggerModelProperty.prototype.toSampleValue = function(value) {
 };
 
 SwaggerModelProperty.prototype.toString = function() {
-  var req, str;
-  req = this.required ? 'propReq' : 'propOpt';
-  str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
+  var req = this.required ? 'propReq' : 'propOpt';
+  var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
   if (!this.required) {
     str += ', <span class="propOptKey">optional</span>';
   }
@@ -580,8 +580,7 @@ SwaggerModelProperty.prototype.toString = function() {
 };
 
 var SwaggerOperation = function(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations) {
-  var parameter, v, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3,
-    _this = this;
+  var _this = this;
 
   var errors = [];
   this.nickname = (nickname||errors.push("SwaggerOperations must have a nickname."));
@@ -1184,8 +1183,10 @@ ShredHttpClient.prototype.execute = function(obj) {
       data: response.content.data
     };
 
-    if(response._headers["Content-Type"]) {
-      if(response._headers["Content-Type"].indexOf("application/json") == 0) {
+    var contentType = (response._headers["content-type"]||response._headers["Content-Type"]||null)
+
+    if(contentType != null) {
+      if(contentType.indexOf("application/json") == 0) {
         if(response.content.data !== "")
           out.obj = JSON.parse(response.content.data);
         else