s/Repository/Registry/g
This commit is contained in:
parent
d62673bc8a
commit
966f8aa530
|
@ -10,7 +10,7 @@
|
|||
|
||||
var EventEmitter = require('events').EventEmitter;
|
||||
|
||||
var Repository = require('./repository'),
|
||||
var Registry = require('./registry'),
|
||||
Logger = require('./logger'),
|
||||
Utils = require('./utils');
|
||||
|
||||
|
@ -90,19 +90,19 @@ Connection.prototype.disconnect = function(callback) {
|
|||
//
|
||||
// Returns the set-up adaptor
|
||||
Connection.prototype.initAdaptor = function(opts) {
|
||||
var module = Repository.findByAdaptor(opts.adaptor);
|
||||
var module = Registry.findByAdaptor(opts.adaptor);
|
||||
|
||||
opts.connection = this;
|
||||
|
||||
if (!module) {
|
||||
Repository.register('cylon-' + opts.adaptor);
|
||||
module = Repository.findByAdaptor(opts.adaptor);
|
||||
Registry.register('cylon-' + opts.adaptor);
|
||||
module = Registry.findByAdaptor(opts.adaptor);
|
||||
}
|
||||
|
||||
var adaptor = module.adaptor(opts);
|
||||
|
||||
if (testMode) {
|
||||
var testAdaptor = Repository.findByAdaptor('test').adaptor(opts);
|
||||
var testAdaptor = Registry.findByAdaptor('test').adaptor(opts);
|
||||
|
||||
for (var prop in adaptor) {
|
||||
if (typeof adaptor[prop] === 'function' && !testAdaptor[prop]) {
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
var EventEmitter = require('events').EventEmitter;
|
||||
|
||||
var Repository = require('./repository'),
|
||||
var Registry = require('./registry'),
|
||||
Logger = require('./logger'),
|
||||
Utils = require('./utils');
|
||||
|
||||
|
@ -103,19 +103,19 @@ Device.prototype.toJSON = function() {
|
|||
//
|
||||
// Returns the set-up driver
|
||||
Device.prototype.initDriver = function(opts) {
|
||||
var module = Repository.findByDriver(opts.driver);
|
||||
var module = Registry.findByDriver(opts.driver);
|
||||
|
||||
opts.device = this;
|
||||
|
||||
if (!module) {
|
||||
Repository.register('cylon-' + opts.driver);
|
||||
module = Repository.findByDriver(opts.driver);
|
||||
Registry.register('cylon-' + opts.driver);
|
||||
module = Registry.findByDriver(opts.driver);
|
||||
}
|
||||
|
||||
var driver = module.driver(opts);
|
||||
|
||||
if (testMode) {
|
||||
var testDriver = Repository.findByDriver('test').driver(opts);
|
||||
var testDriver = Registry.findByDriver('test').driver(opts);
|
||||
|
||||
for (var prop in driver) {
|
||||
if (typeof driver[prop] === 'function' && !testDriver[prop]) {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Repository
|
||||
* Registry
|
||||
*
|
||||
* The Repository contains references to all Drivers and Adaptors Cylon is aware
|
||||
* The Registry contains references to all Drivers and Adaptors Cylon is aware
|
||||
* of, along with which module they live in (e.g. cylon-firmata).
|
||||
*
|
||||
* cylonjs.com
|
||||
|
@ -21,7 +21,7 @@ var missingModuleError = function(module) {
|
|||
process.emit('SIGINT');
|
||||
};
|
||||
|
||||
var Repository = module.exports = {
|
||||
var Registry = module.exports = {
|
||||
data: {},
|
||||
|
||||
register: function(module) {
|
||||
|
@ -49,7 +49,7 @@ var Repository = module.exports = {
|
|||
|
||||
if (pkg.dependencies && Array.isArray(pkg.dependencies)) {
|
||||
pkg.dependencies.forEach(function(dep) {
|
||||
Repository.register(dep);
|
||||
Registry.register(dep);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
@ -77,5 +77,5 @@ var Repository = module.exports = {
|
|||
|
||||
// Default drivers/adaptors:
|
||||
['loopback', 'ping', 'test-adaptor', 'test-driver'].forEach(function(module) {
|
||||
Repository.register('./test/' + module);
|
||||
Registry.register('./test/' + module);
|
||||
});
|
|
@ -1,30 +1,30 @@
|
|||
"use strict";
|
||||
|
||||
var Repository = source('repository');
|
||||
var Registry = source('registry');
|
||||
|
||||
var path = './../spec/support/mock_module.js';
|
||||
|
||||
var module = require('./../support/mock_module.js')
|
||||
|
||||
describe("Repository", function() {
|
||||
describe("Registry", function() {
|
||||
var original;
|
||||
|
||||
beforeEach(function() {
|
||||
original = Repository.data;
|
||||
Repository.data = {};
|
||||
original = Registry.data;
|
||||
Registry.data = {};
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
Repository.data = original;
|
||||
Registry.data = original;
|
||||
})
|
||||
|
||||
describe("#register", function() {
|
||||
it("adds the supplied module to the Registry", function() {
|
||||
expect(Repository.data).to.be.eql({});
|
||||
expect(Registry.data).to.be.eql({});
|
||||
|
||||
Repository.register(path);
|
||||
Registry.register(path);
|
||||
|
||||
expect(Repository.data).to.be.eql({
|
||||
expect(Registry.data).to.be.eql({
|
||||
"./../spec/support/mock_module.js": {
|
||||
module: module,
|
||||
drivers: ['test-driver'],
|
||||
|
@ -36,21 +36,21 @@ describe("Repository", function() {
|
|||
|
||||
describe("#findByAdaptor", function() {
|
||||
beforeEach(function() {
|
||||
Repository.register(path)
|
||||
Registry.register(path)
|
||||
});
|
||||
|
||||
it("finds the appropriate module containing the adaptor", function() {
|
||||
expect(Repository.findByAdaptor('test-adaptor')).to.be.eql(module);
|
||||
expect(Registry.findByAdaptor('test-adaptor')).to.be.eql(module);
|
||||
});
|
||||
});
|
||||
|
||||
describe("#findByDriver", function() {
|
||||
beforeEach(function() {
|
||||
Repository.register(path)
|
||||
Registry.register(path)
|
||||
});
|
||||
|
||||
it("finds the appropriate module containing the driver", function() {
|
||||
expect(Repository.findByDriver('test-driver')).to.be.eql(module);
|
||||
expect(Registry.findByDriver('test-driver')).to.be.eql(module);
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Reference in New Issue