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

merge from develop 2.0 for release

Author: fehguy

bower.json

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

browser/swagger-client.js

@@ -1,6 +1,6 @@
 /**
  * swagger-client - swagger-client is a javascript client for use with swaggering APIs.
- * @version v2.1.7-M2
+ * @version v2.1.0
  * @link http://swagger.io
  * @license apache 2.0
  */
@@ -90,12 +90,11 @@ SwaggerAuthorizations.prototype.remove = function (name) {
 
 SwaggerAuthorizations.prototype.apply = function (obj, securities) {
   var status = null;
-  var key, name, value, result;
   var applyAll = !securities;
   var flattenedSecurities = [];
 
   // Securities could be [ {} ]
-  _.each(securities, function (obj,key) {
+  _.each(securities, function (obj, key) {
 
     // Make sure we account for securities being [ str ]
     if(typeof key === 'string') {
@@ -918,8 +917,6 @@ JQueryHttpClient.prototype.execute = function (obj) {
       headers: headers
     };
 
-    var contentType = (headers['content-type'] || headers['Content-Type'] || null);
-
     try {
       var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);
       out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;
@@ -954,8 +951,6 @@ SuperagentHttpClient.prototype.execute = function (obj) {
   var headers = obj.headers || {};
   var r = request[method](obj.url);
   var name;
-  var accept = headers.accept || headers.Accept;
-
   for (name in headers) {
     r.set(name, headers[name]);
   }
@@ -1256,7 +1251,7 @@ Resolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedR
         segment = '/' + segment;
       }
     }
-    if (typeof location === 'undefined') {
+    if (typeof location === 'undefined' || location === null) {
       break;
     }
     if(segment === '' && j === (parts.length - 1)  && parts.length > 1) {

browser/swagger-client.min.js

@@ -13,7 +13,7 @@ var pkg = require('./package');
 var source = require('vinyl-source-stream');
 // Browser Unit Tests
 var karma = require('karma').server;
-var karma_config = require('./karma.conf');
+var karmaConfig = require('./karma.conf');
 var assign = require('object.assign');
 var connect = require('gulp-connect');
 var cors = require('connect-cors');
@@ -77,10 +77,6 @@ gulp.task('build', function (cb) {
       standalone: 'SwaggerClient'
     });
 
-    // if (!useDebug) {
-    //   b.transform({global: true}, 'uglifyify');
-    // }
-
     b.transform('brfs')
       .bundle()
       .pipe(source(basename + (!useDebug ? '.min' : '') + '.js'))
@@ -111,7 +107,7 @@ gulp.task('watch', ['test'], function () {
 });
 
 gulp.task('browsertest', function(done) {
-  karma.start(karma_config, done);
+  karma.start(karmaConfig, done);
 });
 
 gulp.task('connect', function () {
@@ -126,7 +122,7 @@ gulp.task('connect', function () {
 });
 
 gulp.task('watch-browsertest', function(done){
-  var opts = assign({}, karma_config, {singleRun: false});
+  var opts = assign({}, karmaConfig, {singleRun: false});
   karma.start(opts, done);
 });
 

gulpfile.js

@@ -39,12 +39,11 @@ SwaggerAuthorizations.prototype.remove = function (name) {
 
 SwaggerAuthorizations.prototype.apply = function (obj, securities) {
   var status = null;
-  var key, name, value, result;
   var applyAll = !securities;
   var flattenedSecurities = [];
 
   // Securities could be [ {} ]
-  _.each(securities, function (obj,key) {
+  _.each(securities, function (obj, key) {
 
     // Make sure we account for securities being [ str ]
     if(typeof key === 'string') {

lib/auth.js

@@ -146,8 +146,6 @@ JQueryHttpClient.prototype.execute = function (obj) {
       headers: headers
     };
 
-    var contentType = (headers['content-type'] || headers['Content-Type'] || null);
-
     try {
       var possibleObj =  response.responseJSON || jsyaml.safeLoad(response.responseText);
       out.obj = (typeof possibleObj === 'string') ? {} : possibleObj;
@@ -182,8 +180,6 @@ SuperagentHttpClient.prototype.execute = function (obj) {
   var headers = obj.headers || {};
   var r = request[method](obj.url);
   var name;
-  var accept = headers.accept || headers.Accept;
-
   for (name in headers) {
     r.set(name, headers[name]);
   }

lib/http.js

@@ -233,7 +233,7 @@ Resolver.prototype.resolveItem = function(spec, root, resolutionTable, resolvedR
         segment = '/' + segment;
       }
     }
-    if (typeof location === 'undefined') {
+    if (typeof location === 'undefined' || location === null) {
       break;
     }
     if(segment === '' && j === (parts.length - 1)  && parts.length > 1) {

lib/resolver.js

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

npm-shrinkwrap.json

@@ -20,7 +20,7 @@ describe('swagger resolver', function () {
     instance.close();
     done();
   });
-/*
+
   it('is OK without remote references', function (done) {
     var api = new Resolver();
     var spec = {};
@@ -641,7 +641,7 @@ describe('swagger resolver', function () {
       done();
     });
   });
-*/
+
   it('resolves multiple path refs', function(done) {
     var api = new Resolver();
     var spec = {
@@ -671,16 +671,16 @@ describe('swagger resolver', function () {
             ],
             responses: {
               200: {
-                description: "Users in the system",
+                description: 'Users in the system',
                 schema: {
-                  type: "array",
+                  type: 'array',
                   items: {
-                    $ref: "http://localhost:8000/v2/models.json#/Health"
+                    $ref: 'http://localhost:8000/v2/models.json#/Health'
                   }
                 }
               },
               404: {
-                $ref: "http://localhost:8000/v2/responses.json#/NotFoundError"
+                $ref: 'http://localhost:8000/v2/responses.json#/NotFoundError'
               }
             }
           }