Skip to content

Commit 7362080

Browse files
committed
fix(gen): camelCase endpoint name when used in variable name
Closes angular-fullstack#540
1 parent 3536b45 commit 7362080

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

Diff for: endpoint/templates/index.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var proxyquire = require('proxyquire').noPreserveCache();
44

55
/* <%= name %>.controller stub */
6-
var <%= name %>Ctrl = {
6+
var <%= cameledName %>Ctrl = {
77
index: '<%= name %>Ctrl.index'<% if(filters.mongoose) { %>,
88
show: '<%= name %>Ctrl.show',
99
create: '<%= name %>Ctrl.create',
@@ -25,7 +25,7 @@ var <%= name %>Ctrl = {
2525
return router;
2626
}
2727
},
28-
'./<%= name %>.controller': <%= name %>Ctrl
28+
'./<%= name %>.controller': <%= cameledName %>Ctrl
2929
});
3030

3131
describe('<%= classedName %> API Router:', function() {

Diff for: endpoint/templates/name.controller.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,49 @@ var <%= classedName %> = require('./<%= name %>.model');<% } %>
66
// Get list of <%= name %>s
77
exports.index = function(req, res) {<% if (!filters.mongoose) { %>
88
res.json([]);<% } %><% if (filters.mongoose) { %>
9-
<%= classedName %>.find(function (err, <%= name %>s) {
9+
<%= classedName %>.find(function (err, <%= cameledName %>s) {
1010
if(err) { return handleError(res, err); }
11-
return res.json(200, <%= name %>s);
11+
return res.json(200, <%= cameledName %>s);
1212
});<% } %>
1313
};<% if (filters.mongoose) { %>
1414

1515
// Get a single <%= name %>
1616
exports.show = function(req, res) {
17-
<%= classedName %>.findById(req.params.id, function (err, <%= name %>) {
17+
<%= classedName %>.findById(req.params.id, function (err, <%= cameledName %>) {
1818
if(err) { return handleError(res, err); }
19-
if(!<%= name %>) { return res.send(404); }
20-
return res.json(<%= name %>);
19+
if(!<%= cameledName %>) { return res.send(404); }
20+
return res.json(<%= cameledName %>);
2121
});
2222
};
2323

2424
// Creates a new <%= name %> in the DB.
2525
exports.create = function(req, res) {
26-
<%= classedName %>.create(req.body, function(err, <%= name %>) {
26+
<%= classedName %>.create(req.body, function(err, <%= cameledName %>) {
2727
if(err) { return handleError(res, err); }
28-
return res.json(201, <%= name %>);
28+
return res.json(201, <%= cameledName %>);
2929
});
3030
};
3131

3232
// Updates an existing <%= name %> in the DB.
3333
exports.update = function(req, res) {
3434
if(req.body._id) { delete req.body._id; }
35-
<%= classedName %>.findById(req.params.id, function (err, <%= name %>) {
35+
<%= classedName %>.findById(req.params.id, function (err, <%= cameledName %>) {
3636
if (err) { return handleError(res, err); }
37-
if(!<%= name %>) { return res.send(404); }
38-
var updated = _.merge(<%= name %>, req.body);
37+
if(!<%= cameledName %>) { return res.send(404); }
38+
var updated = _.merge(<%= cameledName %>, req.body);
3939
updated.save(function (err) {
4040
if (err) { return handleError(res, err); }
41-
return res.json(200, <%= name %>);
41+
return res.json(200, <%= cameledName %>);
4242
});
4343
});
4444
};
4545

4646
// Deletes a <%= name %> from the DB.
4747
exports.destroy = function(req, res) {
48-
<%= classedName %>.findById(req.params.id, function (err, <%= name %>) {
48+
<%= classedName %>.findById(req.params.id, function (err, <%= cameledName %>) {
4949
if(err) { return handleError(res, err); }
50-
if(!<%= name %>) { return res.send(404); }
51-
<%= name %>.remove(function(err) {
50+
if(!<%= cameledName %>) { return res.send(404); }
51+
<%= cameledName %>.remove(function(err) {
5252
if(err) { return handleError(res, err); }
5353
return res.send(204);
5454
});
@@ -57,4 +57,4 @@ exports.destroy = function(req, res) {
5757

5858
function handleError(res, err) {
5959
return res.send(500, err);
60-
}<% } %>
60+
}<% } %>

Diff for: endpoint/templates/name.e2e.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var new<%= classedName %>;<% } %>
88
describe('<%= classedName %> API:', function() {
99

1010
describe('GET <%= route %>', function() {
11-
var <%= name %>s;
11+
var <%= cameledName %>s;
1212

1313
beforeEach(function(done) {
1414
request(app)
@@ -17,13 +17,13 @@ describe('<%= classedName %> API:', function() {
1717
.expect('Content-Type', /json/)
1818
.end(function(err, res) {
1919
if (err) return done(err);
20-
<%= name %>s = res.body;
20+
<%= cameledName %>s = res.body;
2121
done();
2222
});
2323
});
2424

2525
it('should respond with JSON array', function() {
26-
<%= name %>s.should.be.instanceOf(Array);
26+
<%= cameledName %>s.should.be.instanceOf(Array);
2727
});
2828

2929
});<% if(filters.mongoose) { %>
@@ -53,7 +53,7 @@ describe('<%= classedName %> API:', function() {
5353
});
5454

5555
describe('GET <%= route %>/:id', function() {
56-
var <%= name %>;
56+
var <%= cameledName %>;
5757

5858
beforeEach(function(done) {
5959
request(app)
@@ -62,18 +62,18 @@ describe('<%= classedName %> API:', function() {
6262
.expect('Content-Type', /json/)
6363
.end(function(err, res) {
6464
if (err) return done(err);
65-
<%= name %> = res.body;
65+
<%= cameledName %> = res.body;
6666
done();
6767
});
6868
});
6969

7070
afterEach(function() {
71-
<%= name %> = {};
71+
<%= cameledName %> = {};
7272
});
7373

7474
it('should respond with the requested <%= name %>', function() {
75-
<%= name %>.name.should.equal('New <%= classedName %>');
76-
<%= name %>.info.should.equal('This is the brand new <%= name %>!!!');
75+
<%= cameledName %>.name.should.equal('New <%= classedName %>');
76+
<%= cameledName %>.info.should.equal('This is the brand new <%= name %>!!!');
7777
});
7878

7979
});

0 commit comments

Comments
 (0)