kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated swagger-js per https://github.com/swagger-api/swagger-js/issues/167

Browse Source
This commit is contained in:
Tony Tam
2014-11-26 08:06:56 -10:00
parent 114add9287
commit bdcae38831
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.npmignore
View File

@@ -4,4 +4,6 @@ example.html
.classpath .classpath
.project .project
.npmignore .npmignore
dist/sample.html
dist/spec.js
node_modules node_modules

22
dist/lib/swagger-client.js vendored
View File

@@ -1,5 +1,5 @@
// swagger-client.js // swagger-client.js
// version 2.1.0-alpha.2 // version 2.1.0-alpha.3
/** /**
* Array Model * Array Model
**/ **/
@@ -840,7 +840,7 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi'); var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
requestUrl = requestUrl.replace(reg, this.encodePathParam(args[param.name])); requestUrl = requestUrl.replace(reg, this.encodePathParam(args[param.name]));
} }
else if (param.in === 'query') { else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {
if(querystring === '') if(querystring === '')
querystring += '?'; querystring += '?';
else else
@@ -1103,14 +1103,11 @@ Model.prototype.getMockSignature = function(modelsToIgnore) {
var Property = function(name, obj, required) { var Property = function(name, obj, required) {
this.schema = obj; this.schema = obj;
this.required = required; this.required = required;
if(obj['$ref']) { if(obj['$ref'])
var refType = obj['$ref']; this['$ref'] = simpleRef(obj['$ref']);
refType = refType.indexOf('#/definitions') === -1 ? refType : refType.substring('#/definitions').length;
this['$ref'] = refType;
}
else if (obj.type === 'array') { else if (obj.type === 'array') {
if(obj.items['$ref']) if(obj.items['$ref'])
this['$ref'] = obj.items['$ref']; this['$ref'] = simpleRef(obj.items['$ref']);
else else
obj = obj.items; obj = obj.items;
} }
@@ -1141,7 +1138,8 @@ Property.prototype.sampleValue = function(isArray, ignoredModels) {
var output; var output;
if(this['$ref']) { if(this['$ref']) {
var refModel = models[this['$ref']]; var refModelName = simpleRef(this['$ref']);
var refModel = models[refModelName];
if(refModel && typeof ignoredModels[type] === 'undefined') { if(refModel && typeof ignoredModels[type] === 'undefined') {
ignoredModels[type] = this; ignoredModels[type] = this;
output = refModel.getSampleValue(ignoredModels); output = refModel.getSampleValue(ignoredModels);
@@ -1200,14 +1198,18 @@ getStringSignature = function(obj) {
str += 'double'; str += 'double';
else if(obj.type === 'boolean') else if(obj.type === 'boolean')
str += 'boolean'; str += 'boolean';
else if(obj['$ref'])
str += simpleRef(obj['$ref']);
else else
str += obj.type || obj['$ref']; str += obj.type;
if(obj.type === 'array') if(obj.type === 'array')
str += ']'; str += ']';
return str; return str;
} }
simpleRef = function(name) { simpleRef = function(name) {
if(typeof name === 'undefined')
return null;
if(name.indexOf("#/definitions/") === 0) if(name.indexOf("#/definitions/") === 0)
return name.substring('#/definitions/'.length) return name.substring('#/definitions/'.length)
else else

22
lib/swagger-client.js
View File

@@ -1,5 +1,5 @@
// swagger-client.js // swagger-client.js
// version 2.1.0-alpha.2 // version 2.1.0-alpha.3
/** /**
* Array Model * Array Model
**/ **/
@@ -840,7 +840,7 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi'); var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
requestUrl = requestUrl.replace(reg, this.encodePathParam(args[param.name])); requestUrl = requestUrl.replace(reg, this.encodePathParam(args[param.name]));
} }
else if (param.in === 'query') { else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {
if(querystring === '') if(querystring === '')
querystring += '?'; querystring += '?';
else else
@@ -1103,14 +1103,11 @@ Model.prototype.getMockSignature = function(modelsToIgnore) {
var Property = function(name, obj, required) { var Property = function(name, obj, required) {
this.schema = obj; this.schema = obj;
this.required = required; this.required = required;
if(obj['$ref']) { if(obj['$ref'])
var refType = obj['$ref']; this['$ref'] = simpleRef(obj['$ref']);
refType = refType.indexOf('#/definitions') === -1 ? refType : refType.substring('#/definitions').length;
this['$ref'] = refType;
}
else if (obj.type === 'array') { else if (obj.type === 'array') {
if(obj.items['$ref']) if(obj.items['$ref'])
this['$ref'] = obj.items['$ref']; this['$ref'] = simpleRef(obj.items['$ref']);
else else
obj = obj.items; obj = obj.items;
} }
@@ -1141,7 +1138,8 @@ Property.prototype.sampleValue = function(isArray, ignoredModels) {
var output; var output;
if(this['$ref']) { if(this['$ref']) {
var refModel = models[this['$ref']]; var refModelName = simpleRef(this['$ref']);
var refModel = models[refModelName];
if(refModel && typeof ignoredModels[type] === 'undefined') { if(refModel && typeof ignoredModels[type] === 'undefined') {
ignoredModels[type] = this; ignoredModels[type] = this;
output = refModel.getSampleValue(ignoredModels); output = refModel.getSampleValue(ignoredModels);
@@ -1200,14 +1198,18 @@ getStringSignature = function(obj) {
str += 'double'; str += 'double';
else if(obj.type === 'boolean') else if(obj.type === 'boolean')
str += 'boolean'; str += 'boolean';
else if(obj['$ref'])
str += simpleRef(obj['$ref']);
else else
str += obj.type || obj['$ref']; str += obj.type;
if(obj.type === 'array') if(obj.type === 'array')
str += ']'; str += ']';
return str; return str;
} }
simpleRef = function(name) { simpleRef = function(name) {
if(typeof name === 'undefined')
return null;
if(name.indexOf("#/definitions/") === 0) if(name.indexOf("#/definitions/") === 0)
return name.substring('#/definitions/'.length) return name.substring('#/definitions/'.length)
else else