Commit c22d94b9 authored by Tony Tam's avatar Tony Tam
Browse files

updated swagger-js client, support for IE8

parent e7b95259
......@@ -2,7 +2,7 @@
<html>
<head>
<title>Swagger UI</title>
<link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
<link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
<link href='css/highlight.default.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
<script type="text/javascript" src="lib/shred.bundle.js"></script>
......@@ -23,25 +23,20 @@
dom_id: "swagger-ui-container",
supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
onComplete: function(swaggerApi, swaggerUi){
if(console) {
console.log("Loaded SwaggerUI")
}
log("Loaded SwaggerUI")
$('pre code').each(function(i, e) {hljs.highlightBlock(e)});
},
onFailure: function(data) {
if(console) {
console.log("Unable to Load SwaggerUI");
console.log(data);
}
log("Unable to Load SwaggerUI");
},
docExpansion: "none"
});
$('#input_apiKey').change(function() {
var key = $('#input_apiKey')[0].value;
console.log("key: " + key);
log("key: " + key);
if(key && key.trim() != "") {
console.log("added key " + key);
log("added key " + key);
window.authorizations.add("key", new ApiKeyAuthorization("api_key", key, "query"));
}
})
......
// Generated by CoffeeScript 1.6.3
(function() {
var ApiKeyAuthorization, PasswordAuthorization, SwaggerApi, SwaggerAuthorizations, SwaggerHttp, SwaggerModel, SwaggerModelProperty, SwaggerOperation, SwaggerRequest, SwaggerResource,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
SwaggerApi = (function() {
SwaggerApi.prototype.url = "http://api.wordnik.com/v4/resources.json";
......@@ -16,6 +17,8 @@
SwaggerApi.prototype.info = null;
SwaggerApi.prototype.useJQuery = null;
function SwaggerApi(url, options) {
if (options == null) {
options = {};
......@@ -47,6 +50,7 @@
_this = this;
this.progress('fetching resource list: ' + this.url);
obj = {
useJQuery: this.useJQuery,
url: this.url,
method: "get",
headers: {},
......@@ -62,14 +66,14 @@
return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
}
},
response: function(rawResponse) {
var response;
response = JSON.parse(rawResponse.content.data);
_this.swaggerVersion = response.swaggerVersion;
response: function(response) {
var responseObj;
responseObj = JSON.parse(response.data);
_this.swaggerVersion = responseObj.swaggerVersion;
if (_this.swaggerVersion === "1.2") {
return _this.buildFromSpec(response);
return _this.buildFromSpec(responseObj);
} else {
return _this.buildFrom1_1Spec(response);
return _this.buildFrom1_1Spec(responseObj);
}
}
}
......@@ -139,7 +143,7 @@
SwaggerApi.prototype.buildFrom1_1Spec = function(response) {
var api, isApi, newName, operation, res, resource, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
console.log("This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info");
log("This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info");
if (response.apiVersion != null) {
this.apiVersion = response.apiVersion;
}
......@@ -241,15 +245,15 @@
_ref = this.apis;
for (resource_name in _ref) {
resource = _ref[resource_name];
console.log(resource_name);
log(resource_name);
_ref1 = resource.operations;
for (operation_name in _ref1) {
operation = _ref1[operation_name];
console.log(" " + operation.nickname);
log(" " + operation.nickname);
_ref2 = operation.parameters;
for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
parameter = _ref2[_i];
console.log(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
log(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
}
}
}
......@@ -283,6 +287,7 @@
this.operationsArray = [];
this.modelsArray = [];
this.models = {};
this.rawModels = {};
if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
this.addApiDeclaration(resourceObj);
} else {
......@@ -298,15 +303,16 @@
obj = {
url: this.url,
method: "get",
useJQuery: this.useJQuery,
headers: {},
on: {
error: function(response) {
return _this.api.fail("Unable to read api '" + _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
},
response: function(rawResponse) {
var response;
response = JSON.parse(rawResponse.content.data);
return _this.addApiDeclaration(response);
response: function(response) {
var responseObj;
responseObj = JSON.parse(response.data);
return _this.addApiDeclaration(responseObj);
}
}
};
......@@ -372,6 +378,7 @@
swaggerModel = new SwaggerModel(modelName, models[modelName]);
this.modelsArray.push(swaggerModel);
this.models[modelName] = swaggerModel;
this.rawModels[modelName] = models[modelName];
}
}
_ref = this.modelsArray;
......@@ -522,7 +529,7 @@
_ref1 = this.properties;
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
prop = _ref1[_j];
if ((prop.refModel != null) && (modelsToIgnore.indexOf(prop.refModel)) === -1) {
if ((prop.refModel != null) && (modelsToIgnore[prop.refModel] !== 'undefined') === -1) {
returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
}
}
......@@ -581,7 +588,7 @@
SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
var result;
if ((this.refModel != null) && (modelsToIgnore.indexOf(this.refModel.name) === -1)) {
if ((this.refModel != null) && (modelsToIgnore[this.refModel.name] === 'undefined')) {
result = this.refModel.createJSONSample(modelsToIgnore);
} else {
if (this.isCollection) {
......@@ -776,19 +783,19 @@
}
if (error == null) {
error = function(xhr, textStatus, error) {
return console.log(xhr, textStatus, error);
return log(xhr, textStatus, error);
};
}
if (callback == null) {
callback = function(data) {
callback = function(response) {
var content;
content = null;
if (data.content != null) {
content = data.content.data;
if (response != null) {
content = response.data;
} else {
content = "no data";
}
return console.log("default callback: " + content);
return log("default callback: " + content);
};
}
params = {};
......@@ -1005,8 +1012,8 @@
}
}
if (requestContentType && this.operation.consumes) {
if (this.operation.consumes.indexOf(requestContentType) === -1) {
console.log("server doesn't consume " + requestContentType + ", try " + JSON.stringify(this.operation.consumes));
if (this.operation.consumes[requestContentType] === 'undefined') {
log("server doesn't consume " + requestContentType + ", try " + JSON.stringify(this.operation.consumes));
if (this.requestContentType === null) {
requestContentType = this.operation.consumes[0];
}
......@@ -1023,8 +1030,8 @@
responseContentType = null;
}
if (responseContentType && this.operation.produces) {
if (this.operation.produces.indexOf(responseContentType) === -1) {
console.log("server can't produce " + responseContentType);
if (this.operation.produces[responseContentType] === 'undefined') {
log("server can't produce " + responseContentType);
}
}
if (requestContentType && requestContentType.indexOf("application/x-www-form-urlencoded") === 0) {
......@@ -1073,6 +1080,7 @@
method: this.type,
headers: myHeaders,
body: body,
useJQuery: this.useJQuery,
on: {
error: function(response) {
return _this.errorCallback(response, _this.opts.parent);
......@@ -1102,7 +1110,6 @@
obj.canceled = true;
}
} else {
console.log(obj);
return obj;
}
}
......@@ -1128,13 +1135,15 @@
})();
SwaggerHttp = (function() {
function SwaggerHttp() {}
SwaggerHttp.prototype.Shred = null;
SwaggerHttp.prototype.shred = null;
SwaggerHttp.prototype.content = null;
function SwaggerHttp() {
SwaggerHttp.prototype.initShred = function() {
var identity, toString,
_this = this;
if (typeof window !== 'undefined') {
......@@ -1151,22 +1160,147 @@
};
if (typeof window !== 'undefined') {
this.content = require("./shred/content");
this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
return this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
parser: identity,
stringify: toString
});
} else {
this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
return this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
parser: identity,
stringify: toString
});
}
}
};
SwaggerHttp.prototype.execute = function(obj) {
if (this.isIE() || obj.useJQuery) {
return this.executeWithJQuery(obj);
} else {
return this.executeWithShred(obj);
}
};
SwaggerHttp.prototype.executeWithShred = function(obj) {
var cb, res,
_this = this;
if (!this.Shred) {
this.initShred();
}
cb = obj.on;
res = {
error: function(response) {
if (obj) {
return cb.error(response);
}
},
redirect: function(response) {
if (obj) {
return cb.redirect(response);
}
},
307: function(response) {
if (obj) {
return cb.redirect(response);
}
},
response: function(raw) {
var headers, out;
if (obj) {
headers = raw._headers;
out = {
headers: headers,
url: raw.request.url,
method: raw.request.method,
status: raw.status,
data: raw.content.data
};
return cb.response(out);
}
}
};
if (obj) {
obj.on = res;
}
return this.shred.request(obj);
};
SwaggerHttp.prototype.executeWithJQuery = function(obj) {
var beforeSend, cb, request,
_this = this;
cb = obj.on;
request = obj;
obj.type = obj.method;
obj.cache = false;
beforeSend = function(xhr) {
var key, _results;
if (obj.headers) {
_results = [];
for (key in obj.headers) {
if (key.toLowerCase() === "content-type") {
_results.push(obj.contentType = obj.headers[key]);
} else if (key.toLowerCase() === "accept") {
_results.push(obj.accepts = obj.headers[key]);
} else {
_results.push(xhr.setRequestHeader(key, obj.headers[key]));
}
}
return _results;
}
};
obj.beforeSend = beforeSend;
obj.data = obj.body;
obj.complete = function(response, textStatus, opts) {
var headerArray, headers, i, out, _i, _j, _k, _ref, _ref1, _ref2, _ref3, _results, _results1;
headers = {};
headerArray = response.getAllResponseHeaders().split(":");
for (i = _i = 0, _ref = headerArray.length / 2, _ref1 = 2.; _ref1 > 0 ? _i <= _ref : _i >= _ref; i = _i += _ref1) {
headers[headerArray[i]] = headerArray[i + 1];
}
out = {
headers: headers,
url: request.url,
method: request.method,
status: response.status,
data: response.responseText,
headers: headers
};
if (_ref2 = response.status, __indexOf.call((function() {
_results = [];
for (_j = 200; _j <= 299; _j++){ _results.push(_j); }
return _results;
}).apply(this), _ref2) >= 0) {
cb.response(out);
}
if ((_ref3 = response.status, __indexOf.call((function() {
_results1 = [];
for (_k = 400; _k <= 599; _k++){ _results1.push(_k); }
return _results1;
}).apply(this), _ref3) >= 0) || response.status === 0) {
cb.error(out);
}
return cb.response(out);
};
$.support.cors = true;
return $.ajax(obj);
};
SwaggerHttp.prototype.isIE = function() {
var isIE, nav, version;
({
isIE: false
});
if (typeof navigator !== 'undefined' && navigator.userAgent) {
nav = navigator.userAgent.toLowerCase();
if (nav.indexOf('msie') !== -1) {
version = parseInt(nav.split('msie')[1]);
if (version <= 8) {
isIE = true;
}
}
}
return isIE;
};
return SwaggerHttp;
})();
......@@ -1286,6 +1420,8 @@
this.PasswordAuthorization = PasswordAuthorization;
this.SwaggerHttp = SwaggerHttp;
this.authorizations = new SwaggerAuthorizations();
}).call(this);
......@@ -1282,7 +1282,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
SwaggerUi.prototype.buildUrl = function(base, url) {
var parts;
console.log("base is " + base);
log("base is " + base);
parts = base.split("/");
base = parts[0] + "//" + parts[2];
if (url.indexOf("/") === 0) {
......@@ -1435,7 +1435,6 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
ResourceView.prototype.render = function() {
var operation, _i, _len, _ref4;
console.log(this.model.description);
$(this.el).html(Handlebars.templates.resource(this.model));
this.number = 0;
_ref4 = this.model.operationsArray;
......@@ -1513,7 +1512,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
type = param.type || param.dataType;
if (type.toLowerCase() === 'file') {
if (!contentTypeModel.consumes) {
console.log("set content type ");
log("set content type ");
contentTypeModel.consumes = 'multipart/form-data';
}
}
......@@ -1624,7 +1623,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
OperationView.prototype.handleFileUpload = function(map, form) {
var bodyParam, el, headerParams, o, obj, param, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
_this = this;
console.log("it's a file upload");
log("it's a file upload");
_ref5 = form.serializeArray();
for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
o = _ref5[_i];
......@@ -1648,13 +1647,13 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
headerParams[param.name] = map[param.name];
}
}
console.log(headerParams);
log(headerParams);
_ref8 = form.find('input[type~="file"]');
for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
el = _ref8[_l];
bodyParam.append($(el).attr('name'), el.files[0]);
}
console.log(bodyParam);
log(bodyParam);
this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
$(".request_url", $(this.el)).html("<pre>" + this.invocationUrl + "</pre>");
obj = {
......@@ -1690,7 +1689,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
o.content.data = data.responseText;
o.getHeaders = function() {
return {
"Content-Type": data.getResponseHeader("Content-Type")
"Content-Type": data.headers("Content-Type")
};
};
o.request = {};
......@@ -1815,16 +1814,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
return formatted;
};
OperationView.prototype.showStatus = function(data) {
OperationView.prototype.showStatus = function(response) {
var code, content, contentType, headers, pre, response_body;
content = data.content.data;
headers = data.getHeaders();
content = response.data;
headers = response.headers;
contentType = headers["Content-Type"] ? headers["Content-Type"].split(";")[0].trim() : null;
if (!content) {
code = $('<code />').text("no content");
pre = $('<pre class="json" />').append(code);
} else if (contentType === "application/json" || /\+json$/.test(contentType)) {
code = $('<code />').text(JSON.stringify(JSON.parse(content), null, 2));
code = $('<code />').text(JSON.stringify(JSON.parse(content), null, " "));
pre = $('<pre class="json" />').append(code);
} else if (contentType === "application/xml" || /\+xml$/.test(contentType)) {
code = $('<code />').text(this.formatXml(content));
......@@ -1833,16 +1832,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
code = $('<code />').html(content);
pre = $('<pre class="xml" />').append(code);
} else if (/^image\//.test(contentType)) {
pre = $('<img>').attr('src', data.request.url);
pre = $('<img>').attr('src', response.url);
} else {
code = $('<code />').text(content);
pre = $('<pre class="json" />').append(code);
}
response_body = pre;
$(".request_url", $(this.el)).html("<pre>" + data.request.url + "</pre>");
$(".response_code", $(this.el)).html("<pre>" + data.status + "</pre>");
$(".request_url", $(this.el)).html("<pre>" + response.url + "</pre>");
$(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
$(".response_body", $(this.el)).html(response_body);
$(".response_headers", $(this.el)).html("<pre>" + JSON.stringify(data.getHeaders(), null, " ").replace(/\n/g, "<br>") + "</pre>");
$(".response_headers", $(this.el)).html("<pre>" + JSON.stringify(response.headers, null, " ").replace(/\n/g, "<br>") + "</pre>");
$(".response", $(this.el)).slideDown();
$(".response_hider", $(this.el)).show();
$(".response_throbber", $(this.el)).hide();
......
This diff is collapsed.
// Generated by CoffeeScript 1.6.3
(function() {
var ApiKeyAuthorization, PasswordAuthorization, SwaggerApi, SwaggerAuthorizations, SwaggerHttp, SwaggerModel, SwaggerModelProperty, SwaggerOperation, SwaggerRequest, SwaggerResource,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
SwaggerApi = (function() {
SwaggerApi.prototype.url = "http://api.wordnik.com/v4/resources.json";
......@@ -16,6 +17,8 @@
SwaggerApi.prototype.info = null;
SwaggerApi.prototype.useJQuery = null;
function SwaggerApi(url, options) {
if (options == null) {
options = {};
......@@ -47,6 +50,7 @@
_this = this;
this.progress('fetching resource list: ' + this.url);
obj = {
useJQuery: this.useJQuery,
url: this.url,
method: "get",
headers: {},
......@@ -62,14 +66,14 @@
return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
}
},
response: function(rawResponse) {
var response;
response = JSON.parse(rawResponse.content.data);
_this.swaggerVersion = response.swaggerVersion;
response: function(response) {
var responseObj;
responseObj = JSON.parse(response.data);
_this.swaggerVersion = responseObj.swaggerVersion;
if (_this.swaggerVersion === "1.2") {
return _this.buildFromSpec(response);
return _this.buildFromSpec(responseObj);
} else {
return _this.buildFrom1_1Spec(response);
return _this.buildFrom1_1Spec(responseObj);
}
}
}
......@@ -139,7 +143,7 @@
SwaggerApi.prototype.buildFrom1_1Spec = function(response) {
var api, isApi, newName, operation, res, resource, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
console.log("This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info");
log("This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info");
if (response.apiVersion != null) {
this.apiVersion = response.apiVersion;
}
......@@ -241,15 +245,15 @@
_ref = this.apis;
for (resource_name in _ref) {
resource = _ref[resource_name];
console.log(resource_name);
log(resource_name);
_ref1 = resource.operations;
for (operation_name in _ref1) {
operation = _ref1[operation_name];
console.log(" " + operation.nickname);
log(" " + operation.nickname);
_ref2 = operation.parameters;
for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
parameter = _ref2[_i];
console.log(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
log(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
}
}
}
......@@ -283,6 +287,7 @@
this.operationsArray = [];
this.modelsArray = [];
this.models = {};
this.rawModels = {};
if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
this.addApiDeclaration(resourceObj);
} else {
......@@ -298,15 +303,16 @@
obj = {
url: this.url,
method: "get",
useJQuery: this.useJQuery,
headers: {},
on: {
error: function(response) {
return _this.api.fail("Unable to read api '" + _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
},