merged with master

Author: fehguy

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-js",
-  "version": "2.1.11",
+  "version": "2.1.22",
   "main": "browser/swagger-client.js",
   "ignore": [
     "gulpfile.js",

browser/swagger-client.js

@@ -136,6 +136,7 @@ SwaggerClient.prototype.initialize = function (url, options) {
   this.defaultSuccessCallback = options.defaultSuccessCallback || null;
   this.defaultErrorCallback = options.defaultErrorCallback || null;
   this.modelPropertyMacro = options.modelPropertyMacro || null;
+  this.connectionAgent = options.connectionAgent || null;
   this.parameterMacro = options.parameterMacro || null;
   this.usePromise = options.usePromise || null;
 
@@ -201,6 +202,7 @@ SwaggerClient.prototype.build = function (mock) {
   var obj = {
     useJQuery: this.useJQuery,
     jqueryAjaxCache: this.jqueryAjaxCache,
+    connectionAgent: this.connectionAgent,
     url: this.url,
     method: 'get',
     headers: {
@@ -352,11 +354,21 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
     } else if (typeof this.scheme === 'undefined') {
       if(typeof window !== 'undefined') {
         var scheme = window.location.protocol.replace(':','');
-        if(this.schemes.indexOf(scheme) !== -1) {
+        if(scheme === 'https' && this.schemes.indexOf(scheme) === -1) {
+          // can't call http from https served page in a browser!
+          helpers.log('Cannot call a http server from https inside a browser!');
+          this.scheme = 'http';
+        }
+        else if(this.schemes.indexOf(scheme) !== -1) {
           this.scheme = scheme;
         }
         else {
-          this.scheme = 'http';
+          if(this.schemes.indexOf('https') !== -1) {
+            this.scheme = 'https';
+          }
+          else {
+            this.scheme = 'http';
+          }
         }
       }
       else {

browser/swagger-client.min.js

@@ -207,6 +207,7 @@ JQueryHttpClient.prototype.execute = function (obj) {
 };
 
 SuperagentHttpClient.prototype.execute = function (obj) {
+  var connectionAgent = obj.connectionAgent;
   var method = obj.method.toLowerCase();
   var timeout = obj.timeout;
 
@@ -216,6 +217,10 @@ SuperagentHttpClient.prototype.execute = function (obj) {
   var headers = obj.headers || {};
   var r = request[method](obj.url);
 
+  if (connectionAgent) {
+    r.agent(connectionAgent);
+  }
+  
   if (timeout) {
     r.timeout(timeout);
   }
@@ -240,7 +245,7 @@ SuperagentHttpClient.prototype.execute = function (obj) {
       if (contentType.indexOf('multipart/form-data') === 0) {
         delete headers['Content-Type'];
         if({}.toString.apply(obj.body) === '[object FormData]') {
-          var itr = obj.body.keys();
+          var itr = _.keys(obj);
           var p = [];
           while(true) {
             var v = itr.next();

lib/client.js

@@ -8,7 +8,7 @@
     }
   ],
   "description": "swagger-client is a javascript client for use with swaggering APIs.",
-  "version": "2.1.21",
+  "version": "2.1.22",
   "homepage": "http://swagger.io",
   "repository": {
     "type": "git",

lib/http.js

@@ -1439,7 +1439,6 @@ describe('SwaggerClient', function () {
     }).then(function(client) {
       client.test.getBlob({})
         .then(function (response) {
-          console.log('horray');
           var filename = './file.tmp';
           fs.writeFile(filename, response.data, function(err) {
             if(err) {
@@ -1459,6 +1458,36 @@ describe('SwaggerClient', function () {
     });
   });
 
+  it('should honor schemes', function(done) {
+    var spec = {
+      schemes: ['https'],
+      paths: {
+        '/v2/nada': {
+          get: {
+            operationId: 'getNothing',
+            tags: [ 'test' ],
+            parameters: [],
+            responses: {
+              default: {
+                description: 'ok'
+              }
+            }
+          }
+        }
+      }
+    };
+
+    var output = new SwaggerClient({
+      url: 'http://localhost:8000',
+      spec: spec,
+      usePromise: true
+    }).then(function(client) {
+      var mock = client.test.getNothing({},{mock: true});
+      expect(mock.url).toEqual('https://localhost:8000/v2/nada');
+      done();
+    });
+  });
+
   it('should read vendor extensions', function(done) {
     new SwaggerClient({
       url: 'http://localhost:8000/v2/extensions.yaml',

package.json

@@ -20,7 +20,7 @@
   "host": "localhost:8000",
   "basePath": "/v2/api",
   "schemes": [
-    "http"
+    "https"
   ],
   "tags": [
     {