rebuilt

Author: fehguy

browser/swagger-client.js

@@ -78,11 +78,11 @@ SwaggerHttp.prototype.execute = function (obj, opts) {
       data = opts.responseInterceptor.apply(data);
     }
     error(data);
-  }
+  };
 
   obj.on.error = function(data) {
     errorInterceptor(data);
-  }
+  };
 
   obj.on.response = function(data) {
     responseInterceptor(data);
@@ -242,9 +242,10 @@ SuperagentHttpClient.prototype.execute = function (obj) {
           }
         }
         else {
-          for (var key in obj.body) {
-            var value = obj.body[key];
-            r.field(key, value);
+          var keyname;
+          for (var keyname in obj.body) {
+            var value = obj.body[keyname];
+            r.field(keyname, value);
           }
         }
       }

browser/swagger-client.min.js

@@ -981,8 +981,10 @@ Operation.prototype.asCurl = function (args1, args2) {
     } else {
       body = obj.body;
     }
+    // escape @ => %40, ' => \u0027, & => %26
+    body = body.replace(/@/g, '%40').replace(/\'/g, '%27').replace(/&/g, '%26');
 
-    results.push('-d \'' + body.replace(/\'/g, '\\u0027') + '\'');
+    results.push('-d \'' + body + '\'');
   }
 
   return 'curl ' + (results.join(' ')) + ' \'' + obj.url + '\'';

lib/http.js

@@ -131,7 +131,7 @@ describe('help options', function () {
         expect(msg).toBe('curl -X GET --header \'Accept: application/json\' \'http://localhost:8080/foo?name=tony|tam\'');
         done();
       }
-    })
+    });
   });
 
   it('prints a curl statement with an array of query params and auth', function (done) {
@@ -168,7 +168,7 @@ describe('help options', function () {
         expect(msg).toBe("curl -X GET --header 'Accept: application/json' --header 'Authorization: Basic Zm9vOmJhcg==' 'http://localhost:8080/foo?name=tony|tam'");
         done();
       }
-    })
+    });
   });
 
   it('prints a curl statement with html', function (done) {
@@ -202,7 +202,7 @@ describe('help options', function () {
         expect(msg).toBe("curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{\"description\":\"<b>Test</b>\"}' 'http://localhost:8080/foo'");
         done();
       }
-    })
+    });
   });
 
   it('handles post body with html', function (done) {
@@ -233,9 +233,9 @@ describe('help options', function () {
         var msg = client.test.sample.asCurl({body: {
           description: "<h1>hello world<script>alert('test')</script></h1>"
         }});
-        expect(msg).toBe("curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{\"description\":\"<h1>hello world<script>alert(\\u0027test\\u0027)</script></h1>\"}' 'http://localhost:8080/foo'");
+        expect(msg).toBe("curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{\"description\":\"<h1>hello world<script>alert(%27test%27)</script></h1>\"}' 'http://localhost:8080/foo'");
         done();
       }
-    })
+    });
   });
 });

lib/types/operation.js

@@ -353,7 +353,7 @@ describe('swagger request functions', function () {
     var petApi = sample.pet;
     var curl = petApi.addPet.asCurl({body: '{"id":"foo\'bar"}'});
 
-    expect(curl).toBe('curl -X POST --header \'Content-Type: application/json\' --header \'Accept: application/json\' -d \'{"id":"foo\\u0027bar"}\' \'http://localhost:8000/v2/api/pet\'');
+    expect(curl).toBe('curl -X POST --header \'Content-Type: application/json\' --header \'Accept: application/json\' -d \'{"id":"foo%27bar"}\' \'http://localhost:8000/v2/api/pet\'');
   });
 
   it('gets an server side 404, and verifies that the content-type in the response is correct, and different than one in the request', function (done) {

test/help.js

@@ -929,7 +929,7 @@ describe('swagger resolver', function () {
     var opts = opts || {};
     opts.url = opts.url || 'http://localhost:8000/v2/absoluteRef.json';
     opts.success = function () {
-      var response = sample.apis.default.operations['get_linked'].successResponse;
+      var response = sample.apis.default.operations.get_linked.successResponse;
       expect(response).toExist();
       expect(response['200']).toExist();
       done();
@@ -945,9 +945,9 @@ describe('swagger resolver', function () {
     opts.success = function () {
       expect(sample.swaggerObject.definitions).toExist();
       expect(sample.swaggerObject.definitions['error.json']).toExist();
-      expect(sample.apis.Occupations.operations.post_occupations.parameters[0].schema).toEqual(
+      expect(sample.apis.Occupations.operations['post_occupations'].parameters[0].schema).toEqual(
           { '$ref': '#/definitions/error.json' });
-      expect(sample.apis.Occupations.operations.post_occupations.responses['500'].schema).toEqual(
+      expect(sample.apis.Occupations.operations['post_occupations'].responses['500'].schema).toEqual(
           { '$ref': '#/definitions/error.json' }
       );
       done();
@@ -1029,7 +1029,7 @@ describe('swagger resolver', function () {
         }
       }
     };
-    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec, unresolved) {
+    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec) {
       var parameters = spec.paths['/foo'].get.parameters;
       expect(parameters[0].name).toEqual('skip');
       expect(parameters[1].name).toEqual('limit');
@@ -1080,7 +1080,7 @@ describe('swagger resolver', function () {
       },
       definitions : { }
     };
-    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec, unresolved) {
+    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec) {
       var responses = spec.paths['/'].get.responses;
       expect(responses['200'].description).toBe('Success');
       expect(responses['default'].description).toBe('Error');
@@ -1128,7 +1128,7 @@ describe('swagger resolver', function () {
         }
       }
     };
-    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec, unresolved) {
+    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec) {
       var parameters = spec.paths['/foo'].get.parameters;
       expect(parameters[0].name).toEqual('skip');
       expect(parameters[1].name).toEqual('limit');
@@ -1178,7 +1178,7 @@ describe('swagger resolver', function () {
       },
       'definitions' : { }
     };
-    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec, unresolved) {
+    api.resolve(spec, 'http://localhost:8000/v2/swagger.json', function (spec) {
       expect(spec.definitions).toBeAn('object');
       expect(spec.definitions.inline_model).toBeAn('object');
       done();