Merge pull request #534 from swagger-api/develop_2.0

Prepare for release

Author: fehguy

CONTRIBUTING.md

@@ -1,2 +1,2 @@
 ## Pull Requests
-Plase make your pull requests are made to the [**`develop_2.0`**](https://github.com/swagger-api/swagger-js/tree/develop_2.0) branch at this time.
+Please open your pull requests against the [**`develop_2.0`**](https://github.com/swagger-api/swagger-js/tree/develop_2.0) branch at this time.

browser/swagger-client.js

@@ -77,6 +77,10 @@ gulp.task('build', function (cb) {
       standalone: 'SwaggerClient'
     });
 
+    if (!useDebug) {
+      b.transform({global: true}, 'uglifyify');
+    }
+
     b.transform('brfs')
       .bundle()
       .pipe(source(basename + (!useDebug ? '.min' : '') + '.js'))

browser/swagger-client.min.js

@@ -40,3 +40,4 @@ SwaggerClient.PasswordAuthorization = auth.PasswordAuthorization;
 SwaggerClient.CookieAuthorization = auth.CookieAuthorization;
 SwaggerClient.SwaggerApi = deprecationWrapper;
 SwaggerClient.SwaggerClient = deprecationWrapper;
+SwaggerClient.SchemaMarkup = require('./lib/schema-markup');

gulpfile.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var helpers = require('./helpers');
 var btoa = require('btoa'); // jshint ignore:line
 var CookieJar = require('cookiejar');
 var _ = {
@@ -22,7 +23,7 @@ var SwaggerAuthorizations = module.exports.SwaggerAuthorizations = function (aut
  *
  */
 SwaggerAuthorizations.prototype.add = function (name, auth) {
-  if(name && typeof name === 'object') {
+  if(_.isObject(name)) {
     for (var key in name) {
       this.authz[key] = name[key];
     }
@@ -38,7 +39,7 @@ SwaggerAuthorizations.prototype.remove = function (name) {
 };
 
 SwaggerAuthorizations.prototype.apply = function (obj, securities) {
-  var status = null;
+  var status = true;
   var applyAll = !securities;
   var flattenedSecurities = [];
 
@@ -58,7 +59,8 @@ SwaggerAuthorizations.prototype.apply = function (obj, securities) {
 
   _.each(this.authz, function (auth, authName) {
     if(applyAll || _.includes(flattenedSecurities, authName)) {
-      status = status || !!auth.apply(obj); // logical ORs regarding status
+      var newStatus = auth.apply(obj);
+      status = status && !!newStatus; // logical ORs regarding status
     }
   });
 
@@ -84,7 +86,9 @@ ApiKeyAuthorization.prototype.apply = function (obj) {
 
     return true;
   } else if (this.type === 'header') {
-    obj.headers[this.name] = this.value;
+    if(typeof obj.headers[this.name] === 'undefined') {
+      obj.headers[this.name] = this.value;
+    }
 
     return true;
   }
@@ -104,14 +108,20 @@ CookieAuthorization.prototype.apply = function (obj) {
 /**
  * Password Authorization is a basic auth implementation
  */
-var PasswordAuthorization = module.exports.PasswordAuthorization = function (name, username, password) {
-  this.name = name;
+var PasswordAuthorization = module.exports.PasswordAuthorization = function (username, password) {
+  if (arguments.length === 3) {
+    helpers.log('PasswordAuthorization: the \'name\' argument has been removed, pass only username and password');
+    username = arguments[1];
+    password = arguments[2];
+  }
   this.username = username;
   this.password = password;
 };
 
 PasswordAuthorization.prototype.apply = function (obj) {
-  obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);
+  if(typeof obj.headers.Authorization === 'undefined') {
+    obj.headers.Authorization = 'Basic ' + btoa(this.username + ':' + this.password);
+  }
 
   return true;
 };

index.js

@@ -7,6 +7,7 @@ var _ = {
   forEach: require('lodash-compat/collection/forEach'),
   indexOf: require('lodash-compat/array/indexOf'),
   isArray: require('lodash-compat/lang/isArray'),
+  isObject: require('lodash-compat/lang/isObject'),
   isFunction: require('lodash-compat/lang/isFunction'),
   isPlainObject: require('lodash-compat/lang/isPlainObject'),
   isUndefined: require('lodash-compat/lang/isUndefined')
@@ -92,6 +93,7 @@ var SwaggerClient = module.exports = function (url, options) {
   this.resourceCount = 0;
   this.url = null;
   this.useJQuery = false;
+  this.swaggerObject = {}
 
   this.clientAuthorizations = new auth.SwaggerAuthorizations();
 
@@ -108,7 +110,7 @@ SwaggerClient.prototype.initialize = function (url, options) {
 
   if (typeof url === 'string') {
     this.url = url;
-  } else if (typeof url === 'object') {
+  } else if (_.isObject(url)) {
     options = url;
     this.url = options.url;
   }
@@ -178,6 +180,7 @@ SwaggerClient.prototype.build = function (mock) {
         }
 
         self.swaggerVersion = responseObj.swaggerVersion;
+        self.swaggerObject = responseObj
 
         if (responseObj.swagger && parseInt(responseObj.swagger) === 2) {
           self.swaggerVersion = responseObj.swagger;
@@ -187,8 +190,11 @@ SwaggerClient.prototype.build = function (mock) {
           self.isValid = true;
         } else {
           var converter = new SwaggerSpecConverter();
+          self.oldSwaggerObject = self.swaggerObject
+
           converter.setDocumentationLocation(self.url);
           converter.convert(responseObj, self.clientAuthorizations, function(spec) {
+            self.swaggerObject = spec
             new Resolver().resolve(spec, self.url, self.buildFromSpec, self);
             self.isValid = true;
           });
@@ -198,9 +204,10 @@ SwaggerClient.prototype.build = function (mock) {
   };
 
   if (this.spec) {
+    self.swaggerObject = this.spec
     setTimeout(function () {
       new Resolver().resolve(self.spec, self.buildFromSpec, self);
-   }, 10);
+    }, 10);
   } else {
     this.clientAuthorizations.apply(obj);
 
@@ -470,8 +477,36 @@ SwaggerClient.prototype.idFromOp = function (path, httpMethod, op) {
   return opId;
 };
 
+SwaggerClient.prototype.setHost = function (host) {
+  this.host = host;
+
+  if(this.apis) {
+    _.forEach(this.apis, function(api) {
+      if(api.operations) {
+        _.forEach(api.operations, function(operation) {
+          operation.host = host;
+        });
+      }
+    });
+  }
+};
+
+SwaggerClient.prototype.setBasePath = function (basePath) {
+  this.basePath = basePath;
+
+  if(this.apis) {
+    _.forEach(this.apis, function(api) {
+      if(api.operations) {
+        _.forEach(api.operations, function(operation) {
+          operation.basePath = basePath;
+        });
+      }
+    });
+  }
+};
+
 SwaggerClient.prototype.fail = function (message) {
   this.failure(message);
 
   throw message;
-};
+};

lib/auth.js

@@ -1,7 +1,8 @@
 'use strict';
 
 var _ = {
-  isPlainObject: require('lodash-compat/lang/isPlainObject')
+  isPlainObject: require('lodash-compat/lang/isPlainObject'),
+  indexOf: require('lodash-compat/array/indexOf')
 };
 
 module.exports.__bind = function (fn, me) {
@@ -21,7 +22,7 @@ module.exports.fail = function (message) {
   log(message);
 };
 
-module.exports.optionHtml = function (label, value) {
+var optionHtml = module.exports.optionHtml = function (label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
 };
 
@@ -33,34 +34,6 @@ var resolveSchema = module.exports.resolveSchema = function (schema) {
   return schema;
 };
 
-module.exports.typeFromJsonSchema = function (type, format) {
-  var str;
-
-  if (type === 'integer' && format === 'int32') {
-    str = 'integer';
-  } else if (type === 'integer' && format === 'int64') {
-    str = 'long';
-  } else if (type === 'integer' && typeof format === 'undefined') {
-    str = 'long';
-  } else if (type === 'string' && format === 'date-time') {
-    str = 'date-time';
-  } else if (type === 'string' && format === 'date') {
-    str = 'date';
-  } else if (type === 'number' && format === 'float') {
-    str = 'float';
-  } else if (type === 'number' && format === 'double') {
-    str = 'double';
-  } else if (type === 'number' && typeof format === 'undefined') {
-    str = 'double';
-  } else if (type === 'boolean') {
-    str = 'boolean';
-  } else if (type === 'string') {
-    str = 'string';
-  }
-
-  return str;
-};
-
 var simpleRef = module.exports.simpleRef = function (name) {
   if (typeof name === 'undefined') {
     return null;
@@ -73,46 +46,3 @@ var simpleRef = module.exports.simpleRef = function (name) {
   }
 };
 
-var getStringSignature = module.exports.getStringSignature = function (obj, baseComponent) {
-  var str = '';
-
-  if (typeof obj.$ref !== 'undefined') {
-    str += simpleRef(obj.$ref);
-  } else if (typeof obj.type === 'undefined') {
-    str += 'object';
-  } else if (obj.type === 'array') {
-    if (baseComponent) {
-      str += getStringSignature((obj.items || obj.$ref || {}));
-    } else {
-      str += 'Array[';
-      str += getStringSignature((obj.items || obj.$ref || {}));
-      str += ']';
-    }
-  } else if (obj.type === 'integer' && obj.format === 'int32') {
-    str += 'integer';
-  } else if (obj.type === 'integer' && obj.format === 'int64') {
-    str += 'long';
-  } else if (obj.type === 'integer' && typeof obj.format === 'undefined') {
-    str += 'long';
-  } else if (obj.type === 'string' && obj.format === 'date-time') {
-    str += 'date-time';
-  } else if (obj.type === 'string' && obj.format === 'date') {
-    str += 'date';
-  } else if (obj.type === 'string' && typeof obj.format === 'undefined') {
-    str += 'string';
-  } else if (obj.type === 'number' && obj.format === 'float') {
-    str += 'float';
-  } else if (obj.type === 'number' && obj.format === 'double') {
-    str += 'double';
-  } else if (obj.type === 'number' && typeof obj.format === 'undefined') {
-    str += 'double';
-  } else if (obj.type === 'boolean') {
-    str += 'boolean';
-  } else if (obj.$ref) {
-    str += simpleRef(obj.$ref);
-  } else {
-    str += obj.type;
-  }
-
-  return str;
-};

lib/client.js

@@ -4,6 +4,9 @@ var helpers = require('./helpers');
 var jQuery = require('jquery');
 var request = require('superagent');
 var jsyaml = require('js-yaml');
+var _ = {
+  isObject: require('lodash-compat/lang/isObject')
+};
 
 /*
  * JQueryHttpClient is a light-weight, node or browser HTTP client
@@ -49,7 +52,7 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
   };
 
 
-  if (obj && typeof obj.body === 'object') {
+  if (_.isObject(obj) && _.isObject(obj.body)) {
     // special processing for file uploads via jquery
     if (obj.body.type && obj.body.type === 'formData'){
       obj.contentType = false;