Bug fixes

Author: wcandillon

Gruntfile.js

@@ -28,7 +28,7 @@ module.exports = function (grunt) {
         },
         jsonlint: {
             all: {
-                src: ['package.json', '.jshintrc']
+                src: ['package.json', 'tests/apis/*.json', '.jshintrc']
             }
         }
     });

lib/codegen.js

@@ -5,13 +5,8 @@ var Mustache = require('mustache');
 var beautify = require('js-beautify').js_beautify;
 var lint = require('jshint').JSHINT;
 
-var keywordMap = {
-    'default': 'difault'
-};
-
 var camelCase = function(id) {
     var tokens = [];
-    id = keywordMap[id] ? keywordMap[id] : id;
     id.split('-').forEach(function(token, index){
         if(index === 0) {
             tokens.push(token[0].toLowerCase() + token.substring(1));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "swagger-js-codegen",
   "main": "./lib/codegen.js",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A Swagger codegen for JavaScript",
   "scripts": {
     "test": "grunt"

templates/method.mustache

@@ -18,7 +18,7 @@
 
     {{#parameters}}
         {{#required}}
-        if(parameters.{{&camelCaseName}} === undefined){
+        if(parameters['{{&camelCaseName}}'] === undefined){
             deferred.reject(new Error('Missing required {{&paramType}} parameter: {{&camelCaseName}}'));
             return deferred.promise;
         }
@@ -29,14 +29,14 @@
                 queryParameters['{{&name}}'] = '{{&singleton}}';
             {{/isSingleton}}
             {{^isSingleton}}
-                if(parameters.{{&camelCaseName}} !== undefined){
-                    queryParameters['{{&name}}'] = parameters.{{&camelCaseName}};
+                if(parameters['{{&camelCaseName}}'] !== undefined){
+                    queryParameters['{{&name}}'] = parameters['{{&camelCaseName}}'];
                 }
             {{/isSingleton}}
         {{/isQueryParameter}}
 
         {{#isPathParameter}}
-            path = path.replace('{{=<% %>=}}{<%&name%>}<%={{ }}=%>', parameters.{{&camelCaseName}});
+            path = path.replace('{{=<% %>=}}{<%&name%>}<%={{ }}=%>', parameters['{{&camelCaseName}}']);
         {{/isPathParameter}}
 
         {{#isHeaderParameter}}
@@ -45,14 +45,14 @@
             {{/isSingleton}}
             {{^isSingleton}}
                 if(parameters.{{&camelCaseName}} !== undefined){
-                    headers['{{&name}}'] = parameters.{{&camelCaseName}};
+                    headers['{{&name}}'] = parameters['{{&camelCaseName}}'];
                 }
             {{/isSingleton}}
         {{/isHeaderParameter}}
 
         {{#isBodyParameter}}
             if(parameters.{{&camelCaseName}} !== undefined){
-                body = parameters.{{&camelCaseName}};
+                body = parameters['{{&camelCaseName}}'];
             }
         {{/isBodyParameter}}
     {{/parameters}}

tests/apis/_batch tests/apis/_batch.json

@@ -10,7 +10,7 @@ var CodeGen = require('../lib/codegen').CodeGen;
 vows.describe('Test Generated API').addBatch({
     'Test Generated code for the 28.io Auth API': {
         topic: function(){
-            var swagger = JSON.parse(fs.readFileSync('tests/apis/auth', 'UTF-8'));
+            var swagger = JSON.parse(fs.readFileSync('tests/apis/auth.json', 'UTF-8'));
             /*jshint evil:true*/
             var Auth = eval(CodeGen.getNodeCode({ className: 'Auth', swagger: swagger }));
             return new Auth('https://portal.28.io/api');