Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions bin/lb-ng.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@ var argv = optimist
.describe('m', g.f('The name for generated {{Angular}} module.'))
.default('m', 'lbServices')
.describe('u', g.f('URL of the REST API end-point'))
.describe('c', g.f('boolean to namespace the common models.'))
.boolean('c')
.describe('d', g.f('namespace delimiter.'))
.default('d', '.')
.describe('s', 'Include schema definition in generated models')
.boolean('s')
.alias({u: 'url', m: 'module-name', s: 'include-schema'})
.alias({u: 'url', m: 'module-name', s: 'include-schema',
c: 'namespace-common-models', d: 'namespace-delimiter'})
.demand(1)
.argv;

Expand All @@ -42,11 +47,14 @@ function runGenerator() {
var ngModuleName = argv['module-name'] || 'lbServices';
var apiUrl = argv['url'] || app.get('restApiRoot') || '/api';
var includeSchema = argv['include-schema'] || false;

var namespaceDelimiter = argv['namespace-delimiter'] || '.';
var namespaceCommonModels = argv['namespace-common-models'] || false;
g.error('Generating %j for the API endpoint %j', ngModuleName, apiUrl);
var result = generator.services(app, {
ngModuleName: ngModuleName,
apiUrl: apiUrl,
namespaceCommonModels: namespaceCommonModels,
namespaceDelimiter: namespaceDelimiter,
includeSchema: includeSchema,
});

Expand Down
7 changes: 7 additions & 0 deletions test/lb-ng.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ describe('lb-ng', function() {
});
});

it('uses the namespacing common modules from command-line', function() {
return runLbNg('-c', 'true', '-d', '_', sampleAppJs)
.spread(function(script, stderr) {
expect(script).to.match(/lbServices_Resource/);
});
});

it('uses the url from command-line', function() {
return runLbNg('-u', 'http://foo/bar', sampleAppJs)
.spread(function(script, stderr) {
Expand Down