added logic for link

dist/lib/swagger.js

@@ -1,7 +1,5 @@
 // swagger.js
-// version 2.0.41
+// version 2.0.34
-
-(function () {
 
 var __bind = function(fn, me){
   return function(){
@@ -9,7 +7,7 @@
   };
 };
 
-  var log = function () {
+log = function(){
   log.history = log.history || [];
   log.history.push(arguments);
   if(this.console){
@@ -17,16 +15,6 @@
   }
 };
 
-  // if you want to apply conditional formatting of parameter values
-  var parameterMacro = function (value) {
-    return value;
-  }
-
-  // if you want to apply conditional formatting of model property values
-  var modelPropertyMacro = function (value) {
-    return value;
-  }
-
 if (!Array.prototype.indexOf) {
   Array.prototype.indexOf = function(obj, start) {
     for (var i = (start || 0), j = this.length; i < j; i++) {
@@ -91,8 +79,8 @@
     };
 })();
 
+
 var SwaggerApi = function(url, options) {
-    this.isBuilt = false;
   this.url = null;
   this.debug = false;
   this.basePath = null;
@@ -100,8 +88,6 @@
   this.authorizationScheme = null;
   this.info = null;
   this.useJQuery = false;
-    this.modelsArray = [];
-    this.isValid;
 
   options = (options||{});
   if (url)
@@ -123,15 +109,11 @@
 
   this.failure = options.failure != null ? options.failure : function() {};
   this.progress = options.progress != null ? options.progress : function() {};
-    if (options.success != null) {
+  if (options.success != null)
     this.build();
-      this.isBuilt = true;
-    }
 }
 
 SwaggerApi.prototype.build = function() {
-    if (this.isBuilt)
-      return this;
   var _this = this;
   this.progress('fetching resource list: ' + this.url);
   var obj = {
@@ -139,7 +121,7 @@
     url: this.url,
     method: "get",
     headers: {
-        accept: "application/json,application/json;charset=\"utf-8\",*/*"
+      accept: "application/json"
     },
     on: {
       error: function(response) {
@@ -176,7 +158,6 @@
   }
   this.apis = {};
   this.apisArray = [];
-    this.consumes = response.consumes;
   this.produces = response.produces;
   this.authSchemes = response.authorizations;
   if (response.info != null) {
@@ -194,29 +175,28 @@
       }
     }
   }
-    if (response.basePath)
+  if (response.basePath) {
     this.basePath = response.basePath;
-    else if (this.url.indexOf('?') > 0)
+  } else if (this.url.indexOf('?') > 0) {
     this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-    else
+  } else {
     this.basePath = this.url;
-
+  }
   if (isApi) {
     var newName = response.resourcePath.replace(/\//g, '');
     this.resourcePath = response.resourcePath;
-      var res = new SwaggerResource(response, this);
+    res = new SwaggerResource(response, this);
     this.apis[newName] = res;
     this.apisArray.push(res);
   } else {
     var k;
     for (k = 0; k < response.apis.length; k++) {
       var resource = response.apis[k];
-        var res = new SwaggerResource(resource, this);
+      res = new SwaggerResource(resource, this);
       this.apis[res.name] = res;
       this.apisArray.push(res);
     }
   }
-    this.isValid = true;
   if (this.success) {
     this.success();
   }
@@ -259,12 +239,11 @@
   } else {
     for (k = 0; k < response.apis.length; k++) {
       resource = response.apis[k];
-        var res = new SwaggerResource(resource, this);
+      res = new SwaggerResource(resource, this);
       this.apis[res.name] = res;
       this.apisArray.push(res);
     }
   }
-    this.isValid = true;
   if (this.success) {
     this.success();
   }
@@ -297,6 +276,7 @@
 
 SwaggerApi.prototype.setConsolidatedModels = function() {
   var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
+  this.modelsArray = [];
   this.models = {};
   _ref = this.apis;
   for (resource_name in _ref) {
@@ -341,8 +321,8 @@
   var _this = this;
   this.api = api;
   this.api = this.api;
-    var consumes = (this.consumes | []);
+  produces = [];
-    var produces = (this.produces | []);
+  consumes = [];
   this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
   this.description = resourceObj.description;
 
@@ -368,12 +348,12 @@
       this.url = this.api.basePath + this.path.replace('{format}', 'json');
     }
     this.api.progress('fetching resource ' + this.name + ': ' + this.url);
-      var obj = {
+    obj = {
       url: this.url,
       method: "get",
       useJQuery: this.useJQuery,
       headers: {
-          accept: "application/json,application/json;charset=\"utf-8\",*/*"
+        accept: "application/json"
       },
       on: {
         response: function(resp) {
@@ -450,7 +430,7 @@
     }
     var output = [];
     for (var i = 0; i < this.modelsArray.length; i++) {
-        var model = this.modelsArray[i];
+      model = this.modelsArray[i];
       output.push(model.setReferencedModels(this.models));
     }
     return output;
@@ -459,9 +439,9 @@
 
 SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes, produces) {
   if (ops) {
-      var output = [];
+    output = [];
     for (var i = 0; i < ops.length; i++) {
-        var o = ops[i];
+      o = ops[i];
       consumes = this.consumes;
       produces = this.produces;
       if (o.consumes != null)
@@ -473,7 +453,7 @@
         produces = o.produces;
       else
         produces = this.produces;
-        var type = (o.type || o.responseClass);
+      type = (o.type||o.responseClass);
 
       if (type === "array") {
         ref = null;
@@ -481,8 +461,8 @@
           ref = o.items["type"] || o.items["$ref"];
         type = "array[" + ref + "]";
       }
-        var responseMessages = o.responseMessages;
+      responseMessages = o.responseMessages;
-        var method = o.method;
+      method = o.method;
       if (o.httpMethod) {
         method = o.httpMethod;
       }
@@ -498,7 +478,7 @@
         }
       }
       o.nickname = this.sanitize(o.nickname);
-        var op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
+      op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
       this.operations[op.nickname] = op;
       output.push(this.operationsArray.push(op));
     }
@@ -544,7 +524,7 @@
         }
       }
     }
-      var prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
+    prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
     this.properties.push(prop);
   }
 }
@@ -567,7 +547,7 @@
 SwaggerModel.prototype.getMockSignature = function(modelsToIgnore) {
   var propertiesStr = [];
   for (var i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i];
+    prop = this.properties[i];
     propertiesStr.push(prop.toString());
   }
 
@@ -582,7 +562,7 @@
   modelsToIgnore.push(this.name);
 
   for (var i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i];
+    prop = this.properties[i];
     if ((prop.refModel != null) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
       returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
     }
@@ -599,7 +579,7 @@
     var modelsToIgnore = (modelsToIgnore||[])
     modelsToIgnore.push(this.name);
     for (var i = 0; i < this.properties.length; i++) {
-        var prop = this.properties[i];
+      prop = this.properties[i];
       result[prop.name] = prop.getSampleValue(modelsToIgnore);
     }
     modelsToIgnore.pop(this.name);
@@ -613,7 +593,6 @@
   this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
   this.descr = obj.description;
   this.required = obj.required;
-    this.defaultValue = modelPropertyMacro(obj.defaultValue);
   if (obj.items != null) {
     if (obj.items.type != null) {
       this.refDataType = obj.items.type;
@@ -641,7 +620,7 @@
 
 SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
   var result;
-    if ((this.refModel != null) && (modelsToIgnore.indexOf(this.refModel.name) === -1)) {
+  if ((this.refModel != null) && (modelsToIgnore.indexOf(prop.refModel.name) === -1)) {
     result = this.refModel.createJSONSample(modelsToIgnore);
   } else {
     if (this.isCollection) {
@@ -659,9 +638,7 @@
 
 SwaggerModelProperty.prototype.toSampleValue = function(value) {
   var result;
-    if ((typeof this.defaultValue !== 'undefined') && this.defaultValue !== null) {
+  if (value === "integer") {
-      result = this.defaultValue;
-    } else if (value === "integer") {
     result = 0;
   } else if (value === "boolean") {
     result = false;
@@ -709,10 +686,8 @@
   this.authorizations = authorizations;
   this["do"] = __bind(this["do"], this);
 
-    if (errors.length > 0) {
+  if (errors.length > 0)
-      console.error('SwaggerOperation errors', errors, arguments);
     this.resource.api.fail(errors);
-    }
 
   this.path = this.path.replace('{format}', 'json');
   this.method = this.method.toLowerCase();
@@ -793,7 +768,6 @@
         }
       }
     }
-      param.defaultValue = parameterMacro(param.defaultValue);
   }
   this.resource[this.nickname] = function(args, callback, error) {
     return _this["do"](args, callback, error);
@@ -914,7 +888,7 @@
   if (possibleParams) {
     var key;
     for (key in possibleParams) {
-        var value = possibleParams[key];
+      value = possibleParams[key];
       if (args[value.name]) {
         params[value.name] = args[value.name];
       }
@@ -961,7 +935,7 @@
     if (param.paramType === 'path') {
       if(args[param.name]) {
         // apply path params and remove from args
-          var reg = new RegExp('\\{\\s*?' + param.name + '.*?\\}(?=\\s*?(\\/|$))', 'gi');
+        var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
         url = url.replace(reg, this.encodePathParam(args[param.name]));
         delete args[param.name];
       }
@@ -1130,19 +1104,18 @@
   var body = params.body;
 
   // encode the body for form submits
-    if (headers["Content-Type"]) {
+  if (headers["Accept"] && headers["Accept"].indexOf("application/x-www-form-urlencoded") === 0) {
+    var fields = {};
+    var possibleParams = {};
     var values = {};
-      var i;
+    var key;
-      var operationParams = this.operation.parameters;
+    for(key in formParams){
-      for (i = 0; i < operationParams.length; i++) {
+      var param = formParams[key];
-        var param = operationParams[i];
-        if (param.paramType === "form")
       values[param.name] = param;
     }
 
-      if (headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
     var encoded = "";
-        var key, value;
+    var key;
     for(key in values) {
       value = this.params[key];
       if(typeof value !== 'undefined'){
@@ -1153,27 +1126,7 @@
     }
     body = encoded;
   }
-      else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
-        // encode the body for form submits
-        var data = "";
-        var boundary = "----SwaggerFormBoundary" + Date.now();
-        var key, value;
-        for (key in values) {
-          value = this.params[key];
-          if (typeof value !== 'undefined') {
-            data += '--' + boundary + '\n';
-            data += 'Content-Disposition: form-data; name="' + key + '"';
-            data += '\n\n';
-            data += value + "\n";
-          }
-        }
-        data += "--" + boundary + "--\n";
-        headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
-        body = data;
-      }
-    }
 
-    var obj;
   if (!((this.headers != null) && (this.headers.mock != null))) {
     obj = {
       url: this.url,
@@ -1202,7 +1155,7 @@
     } else {
       e = exports;
     }
-      var status = e.authorizations.apply(obj, this.operation.authorizations);
+    status = e.authorizations.apply(obj, this.operation.authorizations);
     if (opts.mock == null) {
       if (status !== false) {
         new SwaggerHttp().execute(obj);
@@ -1213,13 +1166,12 @@
       return obj;
     }
   }
-    return obj;
 };
 
 SwaggerRequest.prototype.setHeaders = function(params, operation) {
   // default type
   var accepts = "application/json";
-    var consumes = "application/json";
+  var contentType = null;
 
   var allDefinedParams = this.operation.parameters;
   var definedFormParams = [];
@@ -1246,25 +1198,25 @@
   // if there's a body, need to set the accepts header via requestContentType
   if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
     if (this.opts.requestContentType)
-        consumes = this.opts.requestContentType;
+      accepts = this.opts.requestContentType;
   } else {
     // if any form params, content type must be set
     if(definedFormParams.length > 0) {
       if(definedFileParams.length > 0)
-          consumes = "multipart/form-data";
+        accepts = "multipart/form-data";
       else
-          consumes = "application/x-www-form-urlencoded";
+        accepts = "application/x-www-form-urlencoded";
     }
-      else if (this.type === "DELETE")
+    else if (this.type == "DELETE")
       body = "{}";
     else if (this.type != "DELETE")
       accepts = null;
   }
 
-    if (consumes && this.operation.consumes) {
+  if (contentType && this.operation.consumes) {
-      if (this.operation.consumes.indexOf(consumes) === -1) {
+    if (this.operation.consumes.indexOf(contentType) === -1) {
-        log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
+      log("server doesn't consume " + contentType + ", try " + JSON.stringify(this.operation.consumes));
-        consumes = this.operation.consumes[0];
+      contentType = this.operation.consumes[0];
     }
   }
 
@@ -1279,11 +1231,33 @@
       accepts = this.operation.produces[0];
     }
   }
+  if (contentType && contentType.indexOf("application/x-www-form-urlencoded") === 0) {
+    var fields = {};
+    var possibleParams = {};
+    var values = {};
+    var key;
+    for(key in formParams){
+      var param = formParams[key];
+      values[param.name] = param;
+    }
 
-    if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
+    var encoded = "";
-      headers["Content-Type"] = consumes;
+    var key;
+    for(key in values) {
+      value = this.params[key];
+      if(typeof value !== 'undefined'){
+        if(encoded !== "")
+          encoded += "&";
+        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+      }
+    }
+    body = encoded;
+  }
+  if ((contentType && body !== "") || (contentType === "application/x-www-form-urlencoded"))
+    headers["Content-Type"] = contentType;
   if (accepts)
     headers["Accept"] = accepts;
+
   return headers;
 }
 
@@ -1489,36 +1463,11 @@
     return out;
   };
 
-    // Transform an error into a usable response-like object
+  res = {
-    var transformError = function (error) {
-      var out = {
-        // Default to a status of 0 - The client will treat this as a generic permissions sort of error
-        status: 0,
-        data: error.message || error
-      };
-
-      if (error.code) {
-        out.obj = error;
-
-        if (error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED') {
-          // We can tell the client that this should be treated as a missing resource and not as a permissions thing
-          out.status = 404;
-        }
-      }
-
-      return out;
-    };
-
-    var res = {
     error: function(response) {
       if (obj)
         return cb.error(transform(response));
     },
-      // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
-      request_error: function (err) {
-        if (obj)
-          return cb.error(transformError(err));
-      },
     redirect: function(response) {
       if (obj)
         return cb.redirect(transform(response));
@@ -1556,7 +1505,7 @@
 
 SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
   var status = null;
-    var key, value, result;
+  var key;
 
   // if the "authorizations" key is undefined, or has an empty array, add all keys
   if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
@@ -1586,11 +1535,10 @@
 /**
  * ApiKeyAuthorization allows a query param or header to be injected
  */
-  var ApiKeyAuthorization = function (name, value, type, delimiter) {
+var ApiKeyAuthorization = function(name, value, type) {
   this.name = name;
   this.value = value;
   this.type = type;
-    this.delimiter = delimiter;
 };
 
 ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
@@ -1601,11 +1549,6 @@
       obj.url = obj.url + "?" + this.name + "=" + this.value;
     return true;
   } else if (this.type === "header") {
-      if (typeof obj.headers[this.name] !== 'undefined') {
-        if (typeof this.delimiter !== 'undefined')
-          obj.headers[this.name] = obj.headers[this.name] + this.delimiter + this.value;
-      }
-      else
     obj.headers[this.name] = this.value;
     return true;
   }
@@ -1660,6 +1603,3 @@
 e.SwaggerModelProperty = SwaggerModelProperty;
 e.SwaggerResource = SwaggerResource;
 e.SwaggerApi = SwaggerApi;
-  e.log = log;
-
-})();

dist/swagger-ui.js

@@ -1073,6 +1073,17 @@ function program1(depth0,data) {
   return " : ";
   }
 
+function program3(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "<li>\n      <a href='";
+  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "'>Raw</a>\n    </li>";
+  return buffer;
+  }
+
   buffer += "<div class='heading'>\n  <h2>\n    <a href='#!/";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
@@ -1114,11 +1125,13 @@ function program1(depth0,data) {
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + ">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
+    + ">\n        Expand Operations\n      </a>\n    </li>\n    ";
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data};
+  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, options); }
   else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
+  if (!helpers.url) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-    + "'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </ul>\n</div>\n<ul class='endpoints' id='";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)

src/main/template/resource.handlebars

@@ -16,9 +16,9 @@
         Expand Operations
       </a>
     </li>
-    <li>
+    {{#url}}<li>
       <a href='{{url}}'>Raw</a>
-    </li>
+    </li>{{/url}}
   </ul>
 </div>
 <ul class='endpoints' id='{{id}}_endpoint_list' style='display:none'>