Merge pull request #1210 from opencomponents/remove-new

remove new references on non-classes

src/cli/domain/local.js

@@ -14,7 +14,7 @@ const strings = require('../../resources');
 const validator = require('../../registry/domain/validators');
 
 module.exports = function() {
-  return _.extend(this, {
+  return {
     clean,
     cleanup: function(compressedPackagePath, callback) {
       return fs.unlink(compressedPackagePath, callback);
@@ -71,5 +71,5 @@ module.exports = function() {
     },
     mock: mock(),
     package: packageComponents()
-  });
+  };
 };

src/cli/domain/registry.js

@@ -26,7 +26,7 @@ module.exports = function(opts) {
     }-${process.arch}`
   };
 
-  return _.extend(this, {
+  return {
     add: function(registry, callback) {
       if (registry.slice(registry.length - 1) !== '/') {
         registry += '/';
@@ -159,5 +159,5 @@ module.exports = function(opts) {
         fs.writeJson(settings.configFile.src, res, callback);
       });
     }
-  });
+  };
 };

src/cli/facade/dev.js

@@ -157,7 +157,7 @@ module.exports = function(dependencies) {
                 return callback(err);
               }
 
-              const registry = new oc.Registry({
+              const registry = oc.Registry({
                 baseUrl,
                 prefix: opts.prefix || '',
                 dependencies: dependencies.modules,

src/cli/index.js

@@ -23,9 +23,9 @@ if (semver.lt(currentNodeVersion, minSupportedVersion)) {
 }
 
 const dependencies = {
-  local: new Local(),
+  local: Local(),
   logger,
-  registry: new Registry()
+  registry: Registry()
 };
 
 function processCommand(command, commandName, cli, level, prefix) {

src/cli/programmatic-api.js

@@ -6,13 +6,13 @@ const Local = require('./domain/local');
 function wrap(cmdScript, withRegistry) {
   return function(options, cb) {
     const dependencies = {
-      local: new Local(),
+      local: Local(),
       logger: options.logger || { log() {}, err() {}, ok() {}, warn() {} }
     };
 
     if (withRegistry) {
       const Registry = require('./domain/registry');
-      dependencies.registry = new Registry({ registry: options.registry });
+      dependencies.registry = Registry({ registry: options.registry });
     }
 
     const opts = _.omit(options, 'logger', 'registry');

src/registry/domain/repository.js

@@ -16,7 +16,7 @@ const versionHandler = require('./version-handler');
 const errorToString = require('../../utils/error-to-string');
 
 module.exports = function(conf) {
-  const cdn = !conf.local && new conf.storage.adapter(conf.storage.options);
+  const cdn = !conf.local && conf.storage.adapter(conf.storage.options);
   const options = !conf.local && conf.storage.options;
   const repositorySource = conf.local
     ? 'local repository'

src/registry/index.js

@@ -25,7 +25,7 @@ module.exports = function(options) {
   const plugins = [];
   const app = middleware.bind(express(), options);
   let server;
-  const repository = new Repository(options);
+  const repository = Repository(options);
 
   const close = callback => {
     if (server && server.listening) {

src/registry/router.js

@@ -15,15 +15,15 @@ const settings = require('../resources/settings');
 
 module.exports.create = function(app, conf, repository) {
   const routes = {
-    component: new ComponentRoute(conf, repository),
-    components: new ComponentsRoute(conf, repository),
-    componentInfo: new ComponentInfoRoute(conf, repository),
-    componentPreview: new ComponentPreviewRoute(conf, repository),
-    index: new IndexRoute(repository),
-    publish: new PublishRoute(repository),
-    staticRedirector: new StaticRedirectorRoute(repository),
-    plugins: new PluginsRoute(conf),
-    dependencies: new DependenciesRoute(conf)
+    component: ComponentRoute(conf, repository),
+    components: ComponentsRoute(conf, repository),
+    componentInfo: ComponentInfoRoute(conf, repository),
+    componentPreview: ComponentPreviewRoute(conf, repository),
+    index: IndexRoute(repository),
+    publish: PublishRoute(repository),
+    staticRedirector: StaticRedirectorRoute(repository),
+    plugins: PluginsRoute(conf),
+    dependencies: DependenciesRoute(conf)
   };
 
   const prefix = conf.prefix;

src/registry/routes/component.js

@@ -7,7 +7,7 @@ const GetComponentHelper = require('./helpers/get-component');
 const strings = require('../../resources');
 
 module.exports = function(conf, repository) {
-  const getComponent = new GetComponentHelper(conf, repository);
+  const getComponent = GetComponentHelper(conf, repository);
 
   return function(req, res) {
     getComponent(

src/registry/routes/components.js

@@ -7,7 +7,7 @@ const GetComponentHelper = require('./helpers/get-component');
 const strings = require('../../resources');
 
 module.exports = function(conf, repository) {
-  const getComponent = new GetComponentHelper(conf, repository);
+  const getComponent = GetComponentHelper(conf, repository);
   const setHeaders = (results, res) => {
     if (!results || results.length !== 1 || !results[0] || !res.set) {
       return;

src/registry/routes/helpers/get-component.js

@@ -22,15 +22,15 @@ const urlBuilder = require('../../domain/url-builder');
 const validator = require('../../domain/validators');
 
 module.exports = function(conf, repository) {
-  const client = new Client({ templates: conf.templates }),
+  const client = Client({ templates: conf.templates }),
     cache = new Cache({
       verbose: !!conf.verbosity,
       refreshInterval: conf.refreshInterval
     });
 
   const renderer = function(options, cb) {
-    const nestedRenderer = new NestedRenderer(renderer, options.conf),
-      retrievingInfo = new GetComponentRetrievingInfo(options);
+    const nestedRenderer = NestedRenderer(renderer, options.conf),
+      retrievingInfo = GetComponentRetrievingInfo(options);
     let responseHeaders = {};
 
     const getLanguage = () => {

tasks/build.js

@@ -41,7 +41,7 @@ ocClientBrowser.getLib((err, libContent) => {
     );
 
     const Local = require('../src/cli/domain/local');
-    const local = new Local();
+    const local = Local();
     const packageOptions = {
       componentPath: path.join(__dirname, clientComponentDir),
       production: true,

test/acceptance/registry-ui.js

@@ -27,7 +27,7 @@ describe('registry (ui interface)', () => {
   };
 
   const initializeRegistry = (configuration, cb) => {
-    registry = new oc.Registry(configuration);
+    registry = oc.Registry(configuration);
     registry.start(cb);
   };
 

test/acceptance/registry.js

@@ -34,7 +34,7 @@ describe('registry', () => {
   };
 
   const initializeRegistry = function(configuration, cb) {
-    registry = new oc.Registry(configuration);
+    registry = oc.Registry(configuration);
     registry.start(cb);
   };
 

test/acceptance/registry/registry-with-fallback.js

@@ -36,14 +36,14 @@ describe('registry', () => {
     }
 
     before(done => {
-      registry = new oc.Registry(
+      registry = oc.Registry(
         retrieveRegistryConfiguration(
           3030,
           'test/fixtures/components',
           'http://localhost:3031'
         )
       );
-      fallbackRegistry = new oc.Registry(
+      fallbackRegistry = oc.Registry(
         retrieveRegistryConfiguration(
           3031,
           'test/fixtures/fallback-registry-components'

test/unit/cli-domain-get-components-by-dir.js

@@ -29,7 +29,7 @@ const initialise = function() {
     { __dirname: '' }
   );
 
-  const local = new GetComponentsByDir();
+  const local = GetComponentsByDir();
 
   return { local: local, fs: fsMock };
 };

test/unit/cli-domain-mock.js

@@ -36,7 +36,7 @@ const initialise = function() {
     { __dirname: '' }
   );
 
-  const local = new Local();
+  const local = Local();
 
   return { local: local, fs: fsMock };
 };

test/unit/cli-domain-registry.js

@@ -29,7 +29,7 @@ const getRegistry = function(dependencies, opts) {
     }
   );
 
-  return new Registry(opts);
+  return Registry(opts);
 };
 
 describe('cli : domain : registry', () => {

test/unit/cli-facade-clean.js

@@ -26,7 +26,7 @@ describe('cli : facade : clean', () => {
       read: readMock
     });
 
-    const cleanFacade = new CleanFacade({ local, logger: logSpy });
+    const cleanFacade = CleanFacade({ local, logger: logSpy });
     cleanFacade(options.params, () => {
       done();
     });

test/unit/cli-facade-dev.js

@@ -7,8 +7,8 @@ describe('cli : facade : dev', () => {
   const logSpy = {},
     DevFacade = require('../../src/cli/facade/dev'),
     Local = require('../../src/cli/domain/local'),
-    local = new Local(),
-    devFacade = new DevFacade({ local, logger: logSpy });
+    local = Local(),
+    devFacade = DevFacade({ local, logger: logSpy });
 
   const execute = function(dirName, port) {
     logSpy.err = sinon.spy();

test/unit/cli-facade-init.js

@@ -15,8 +15,8 @@ describe('cli : facade : init', () => {
   const logSpy = {},
     InitFacade = require('../../src/cli/facade/init'),
     Local = injectr('../../src/cli/domain/local.js', deps, {}),
-    local = new Local({ logger: { log: () => {} } }),
-    initFacade = new InitFacade({ local: local, logger: logSpy });
+    local = Local({ logger: { log: () => {} } }),
+    initFacade = InitFacade({ local: local, logger: logSpy });
 
   const execute = function(componentPath, templateType) {
     logSpy.err = sinon.spy();

test/unit/cli-facade-mock.js

@@ -7,8 +7,8 @@ describe('cli : facade : mock', () => {
   const logSpy = {},
     MockFacade = require('../../src/cli/facade/mock'),
     Local = require('../../src/cli/domain/local'),
-    local = new Local(),
-    mockFacade = new MockFacade({ local: local, logger: logSpy });
+    local = Local(),
+    mockFacade = MockFacade({ local: local, logger: logSpy });
 
   const execute = function() {
     logSpy.ok = sinon.spy();

test/unit/cli-facade-package.js

@@ -7,9 +7,9 @@ const sinon = require('sinon');
 describe('cli : facade : package', () => {
   const logSpy = {},
     Local = require('../../src/cli/domain/local'),
-    local = new Local(),
+    local = Local(),
     PackageFacade = require('../../src/cli/facade/package.js'),
-    packageFacade = new PackageFacade({ local: local, logger: logSpy });
+    packageFacade = PackageFacade({ local: local, logger: logSpy });
 
   const execute = function(compress, cb) {
     logSpy.err = sinon.stub();

test/unit/cli-facade-preview.js

@@ -17,7 +17,7 @@ describe('cli : facade : preview', () => {
     const PreviewFacade = injectr('../../src/cli/facade/preview.js', {
         open: openSpy
       }),
-      previewFacade = new PreviewFacade({
+      previewFacade = PreviewFacade({
         logger: logSpy,
         registry: registryStub
       });

test/unit/cli-facade-publish.js

@@ -9,9 +9,9 @@ const sinon = require('sinon');
 describe('cli : facade : publish', () => {
   const logSpy = {},
     Registry = require('../../src/cli/domain/registry'),
-    registry = new Registry(),
+    registry = Registry(),
     Local = require('../../src/cli/domain/local'),
-    local = new Local(),
+    local = Local(),
     readStub = sinon.stub().yields(null, 'test'),
     mockComponent = {
       name: 'hello-world',
@@ -37,7 +37,7 @@ describe('cli : facade : publish', () => {
         'fs-extra': fsMock,
         read: readStub
       }),
-      publishFacade = new PublishFacade({
+      publishFacade = PublishFacade({
         registry,
         local,
         logger: logSpy

test/unit/cli-facade-registry-add.js

@@ -6,9 +6,9 @@ const sinon = require('sinon');
 describe('cli : facade : registry : add', () => {
   const logSpy = {},
     Registry = require('../../src/cli/domain/registry'),
-    registry = new Registry(),
+    registry = Registry(),
     RegistryFacade = require('../../src/cli/facade/registry-add'),
-    registryFacade = new RegistryFacade({ registry: registry, logger: logSpy });
+    registryFacade = RegistryFacade({ registry: registry, logger: logSpy });
 
   const execute = function() {
     logSpy.err = sinon.spy();

test/unit/cli-facade-registry-ls.js

@@ -6,9 +6,9 @@ const sinon = require('sinon');
 describe('cli : facade : registry : ls', () => {
   const logSpy = {},
     Registry = require('../../src/cli/domain/registry'),
-    registry = new Registry(),
+    registry = Registry(),
     RegistryFacade = require('../../src/cli/facade/registry-ls'),
-    registryFacade = new RegistryFacade({ registry: registry, logger: logSpy });
+    registryFacade = RegistryFacade({ registry: registry, logger: logSpy });
 
   const execute = function() {
     logSpy.err = sinon.spy();

test/unit/cli-facade-registry-remove.js

@@ -6,9 +6,9 @@ const sinon = require('sinon');
 describe('cli : facade : registry : remove', () => {
   const logSpy = {},
     Registry = require('../../src/cli/domain/registry'),
-    registry = new Registry(),
+    registry = Registry(),
     RegistryFacade = require('../../src/cli/facade/registry-remove'),
-    registryFacade = new RegistryFacade({ registry: registry, logger: logSpy });
+    registryFacade = RegistryFacade({ registry: registry, logger: logSpy });
 
   const execute = function() {
     logSpy.err = sinon.spy();

test/unit/registry-domain-nested-renderer.js

@@ -20,7 +20,7 @@ describe('registry : routes : helpers : nested-renderer', () => {
       renderer = sinon.stub().yields(rendererMocks);
     }
 
-    nestedRenderer = new NestedRenderer(renderer, conf || {});
+    nestedRenderer = NestedRenderer(renderer, conf || {});
   };
 
   describe('when rendering nested component', () => {

test/unit/registry-domain-repository.js

@@ -86,7 +86,7 @@ describe('registry : domain : repository', () => {
       components: { 'hello-world': { '1.0.0': { publishDate: 1234567890 } } }
     };
 
-    const repository = new Repository(cdnConfiguration);
+    const repository = Repository(cdnConfiguration);
 
     describe('when getting the list of available components', () => {
       before(done => {
@@ -149,7 +149,7 @@ describe('registry : domain : repository', () => {
           const conf = _.extend(cdnConfiguration, {
             templates: [require('oc-template-jade')]
           });
-          const repository = new Repository(conf);
+          const repository = Repository(conf);
           expect(repository.getTemplatesInfo().length).to.equal(3);
         });
       });
@@ -400,7 +400,7 @@ describe('registry : domain : repository', () => {
       env: { name: 'local' }
     };
 
-    const repository = new Repository(localConfiguration);
+    const repository = Repository(localConfiguration);
 
     describe('when getting the list of available components', () => {
       before(done => {