🔥

wcandillon · Aug 11, 2016 · f0817cd · f0817cd
1 parent 7d7f8ee
commit f0817cd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 87 deletions.
diff --git a/lib/codegen.js b/lib/codegen.js
@@ -7,30 +7,6 @@ var lint = require('jshint').JSHINT;
 var _ = require('lodash');
 var ts = require('./typescript');
 
-var replaceCharacterWithCamelCase = function(id, character) {
-    if(id.indexOf(character) === -1) {
-        return id;
-    }
-    var tokens = [];
-    id.split(character).forEach(function(token, index){
-        if(index === 0) {
-            tokens.push(token[0].toLowerCase() + token.substring(1));
-        } else {
-            tokens.push(token[0].toUpperCase() + token.substring(1));
-        }
-    });
-    return tokens.join('');
-};
-
-var camelCase = function(opts, id) {
-    var kebabRemovedId = replaceCharacterWithCamelCase(id, '-');
-    if (opts.convertSnakeCase) {
-        return replaceCharacterWithCamelCase(kebabRemovedId, '_');
-    } else {
-        return kebabRemovedId;
-    }
-};
-
 var normalizeName = function(id) {
     return id.replace(/\.|\-|\{|\}/g, '_');
 };
@@ -50,7 +26,7 @@ var getPathToMethodName = function(opts, m, path){
         }
         result.push(segment);
     });
-    var result = camelCase(opts, segments.join('-'));
+    var result = _.camelCase(segments.join('-'));
     return m.toLowerCase() + result[0].toUpperCase() + result.substring(1);
 };
 
@@ -131,7 +107,7 @@ var getViewForSwagger2 = function(opts, type){
                     var segments = parameter.$ref.split('/');
                     parameter = swagger.parameters[segments.length === 1 ? segments[0] : segments[2] ];
                 }
-                parameter.camelCaseName = camelCase(opts, parameter.name);
+                parameter.camelCaseName = _.camelCase(parameter.name);
                 if(parameter.enum && parameter.enum.length === 1) {
                     parameter.isSingleton = true;
                     parameter.singleton = parameter.enum[0];
@@ -196,7 +172,7 @@ var getViewForSwagger1 = function(opts, type){
 
             op.parameters = op.parameters ? op.parameters : [];
             op.parameters.forEach(function(parameter) {
-                parameter.camelCaseName = camelCase(opts, parameter.name);
+                parameter.camelCaseName = _.camelCase(parameter.name);
                 if(parameter.enum && parameter.enum.length === 1) {
                     parameter.isSingleton = true;
                     parameter.singleton = parameter.enum[0];

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -47,7 +47,7 @@ function convertType(swaggerType) {
     typespec.isRef = typespec.tsType === 'ref';
     typespec.isObject = typespec.tsType === 'object';
     typespec.isArray = typespec.tsType === 'array';
-    typespec.isAtomic = _.contains(['string', 'number', 'boolean', 'any'], typespec.tsType);
+    typespec.isAtomic = _.includes(['string', 'number', 'boolean', 'any'], typespec.tsType);
 
     return typespec;
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "swagger-js-codegen",
   "main": "./lib/codegen.js",
-  "version": "1.6.8",
+  "version": "1.6.7",
   "description": "A Swagger codegen for JavaScript",
   "scripts": {
     "test": "grunt"
@@ -32,7 +32,7 @@
   "dependencies": {
     "js-beautify": "~1.5.1",
     "jshint": "~2.5.1",
-    "lodash": "^2.4.1",
+    "lodash": "4.14.1",
     "mustache": "^2.0.0"
   },
   "devDependencies": {
@@ -44,7 +44,6 @@
     "matchdep": "~0.3.0",
     "vows": "~0.7.0",
     "grunt-jsonlint": "~1.0.4",
-    "request": "~2.40.0",
-    "rewire": "^2.5.1"
+    "request": "~2.40.0"
   }
 }
diff --git a/tests/node-api.js b/tests/node-api.js
@@ -30,7 +30,7 @@ vows.describe('Test Generated API').addBatch({
                 return promise;
             },
             'Should have missing parameter error': function(error){
-                assert.equal(error.message, 'Missing required query parameter: grant_type');
+                assert.equal(error.message, 'Missing required query parameter: grantType');
             }
         },
         'Calling Authenticate method with wrong password': {
@@ -42,7 +42,7 @@ vows.describe('Test Generated API').addBatch({
                 auth.authenticate({
                     email: 'w+test@28.io',
                     password: 'foobartest',
-                    grant_type: 'client_credentials'
+                    grantType: 'client_credentials'
                 }).then(callback, callback);
                 return promise;
             },
@@ -59,7 +59,7 @@ vows.describe('Test Generated API').addBatch({
                 auth.authenticate({
                     email: 'w+test@28.io',
                     password: 'foobar',
-                    grant_type: 'client_credentials'
+                    grantType: 'client_credentials'
                 }).then(function(result){
                     promise.emit('success', result);
                 }, function(result){

diff --git a/tests/node-protected.js b/tests/node-protected.js
@@ -29,7 +29,7 @@ vows.describe('Test Protected').addBatch({
                 protectedAPI.auth({
                     email: 'w+test@28.io',
                     password: 'foobar',
-                    grant_type: 'client_credentials'
+                    grantType: 'client_credentials'
                 }).then(function(result){
                     promise.emit('success', result);
                 }, function(result){

diff --git a/tests/utilities.js b/tests/utilities.js