fix for swagger-api#640

roboconf · Feb 1, 2015 · a9c2b91 · a9c2b91
1 parent 116b487
commit a9c2b91
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
@@ -325,7 +325,6 @@ SwaggerClient.prototype.initialize = function (url, options) {
 
   if (typeof options.success === 'function') {
     this.build();
-    // this.isBuilt = true;
   }
 };
 
@@ -1214,7 +1213,6 @@ Model.prototype.getMockSignature = function(modelsToIgnore) {
     prop = this.properties[i];
     propertiesStr.push(prop.toString());
   }
-
   var strong = '<span class="strong">';
   var stronger = '<span class="stronger">';
   var strongClose = '</span>';
@@ -1326,8 +1324,10 @@ Property.prototype.sampleValue = function(isArray, ignoredModels) {
 
 getStringSignature = function(obj) {
   var str = '';
-  if(typeof obj.type === 'undefined')
-    str += obj;
+  if(typeof obj.$ref !== 'undefined')
+    str += simpleRef(obj.$ref);
+  else if(typeof obj.type === 'undefined')
+    str += 'object';
   else if(obj.type === 'array') {
     str += 'Array[';
     str += getStringSignature((obj.items || obj.$ref || {}));
@@ -1383,9 +1383,27 @@ Property.prototype.toString = function() {
   if(typeof this.description !== 'undefined')
     str += ': ' + this.description;
 
+  if (this['enum']) {
+    str += ' = <span class="propVals">[\'' + this['enum'].join('\' or \'') + '\']</span>';
+  }
+  if (this.descr) {
+    str += ': <span class="propDesc">' + this.descr + '</span>';
+  }
+
+
   var options = ''; 
   var isArray = this.schema.type === 'array';
-  var type = isArray ? this.schema.items.type : this.schema.type;
+  var type;
+
+  if(isArray) {
+    if(this.schema.items)
+      type = this.schema.items.type;
+    else
+      type = '';
+  }
+  else {
+    this.schema.type;
+  }
 
   if (this.default)
     options += optionHtml('Default', this.default);
@@ -1973,7 +1991,7 @@ SwaggerModelProperty.prototype.toString = function () {
   }
   str += ')';
   if (this.values) {
-    str += ' = <span class="propVals">["' + this.values.join('\' or \'') + '\']</span>';
+    str += ' = <span class="propVals">[\'' + this.values.join('\' or \'') + '\']</span>';
   }
   if (this.descr) {
     str += ': <span class="propDesc">' + this.descr + '</span>';

diff --git a/src/main/coffeescript/view/OperationView.coffee b/src/main/coffeescript/view/OperationView.coffee
@@ -91,16 +91,14 @@ class OperationView extends Backbone.View
     if typeof @model.responseMessages is 'undefined'
       @model.responseMessages = []
 
-    $(@el).html(Handlebars.templates.operation(@model))
-
     # 2.0
     signatureModel = null
     if @model.successResponse
       successResponse = @model.successResponse
       for key of successResponse
         value = successResponse[key]
+        @model.successCode = key
         if typeof value is 'object' and typeof value.createJSONSample is 'function'
-          foo = 'bar'
           signatureModel = 
             sampleJSON: JSON.stringify(value.createJSONSample(), undefined, 2)
             isParam: false
@@ -112,6 +110,9 @@ class OperationView extends Backbone.View
         isParam: false
         signature: @model.responseClassSignature
 
+
+    $(@el).html(Handlebars.templates.operation(@model))
+
     if signatureModel
       responseSignatureView = new SignatureView({model: signatureModel, tagName: 'div'})
       $('.model-signature', $(@el)).append responseSignatureView.render().el

diff --git a/src/main/template/operation.handlebars b/src/main/template/operation.handlebars
@@ -41,7 +41,7 @@
         </div>
         {{/oauth}}
         {{#if type}}
-          <h4>Response Class</h4>
+          <h4>Response Class (Status {{successCode}})</h4>
           <p><span class="model-signature" /></p>
           <br/>
           <div class="response-content-type" />