Skip to content

Commit

Permalink
Change indexers in registries
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gnucki
Gnucki committed Dec 14, 2014
1 parent a82daab commit 6c6e166
Show file tree
Hide file tree
Showing 20 changed files with 164 additions and 164 deletions.
4 changes: 2 additions & 2 deletions lib/config/object/client/parameters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ define(function(require) {
interfacer: require('danf/object/class-processor/interfacer')
},
classesHandler: require('danf/object/classes-handler'),
classesIndexer: require('danf/object/classes-indexer'),
interfacesIndexer: require('danf/object/interfaces-indexer'),
classesRegistry: require('danf/object/classes-registry'),
interfacesRegistry: require('danf/object/interfaces-registry'),
interfacer: require('danf/object/interfacer'),
configurationSection: {
interfaces: require('danf/object/configuration-section/interfaces'),
Expand Down
4 changes: 2 additions & 2 deletions lib/config/object/interfaces.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define(function(require) {
}
}
},
classesIndexer: {
classesRegistry: {
methods: {
/**
* Index a class.
Expand Down Expand Up @@ -55,7 +55,7 @@ define(function(require) {
}
}
},
interfacesIndexer: {
interfacesRegistry: {
methods: {
/**
* Index an interface.
Expand Down
4 changes: 2 additions & 2 deletions lib/config/object/server/parameters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
interfacer: require('../../../object/class-processor/interfacer')
},
classesHandler: require('../../../object/classes-handler'),
classesIndexer: require('../../../object/classes-indexer'),
interfacesIndexer: require('../../../object/interfaces-indexer'),
classesRegistry: require('../../../object/classes-registry'),
interfacesRegistry: require('../../../object/interfaces-registry'),
interfacer: require('../../../object/interfacer'),
configurationSection: {
interfaces: require('../../../object/configuration-section/interfaces'),
Expand Down
16 changes: 8 additions & 8 deletions lib/config/object/services.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ var define = define ? define : require('amdefine')(module);

define(function(require) {
return {
classesIndexer: {
class: '%danf:object.classes.classesIndexer%',
classesRegistry: {
class: '%danf:object.classes.classesRegistry%',
lock: true
},
interfacesIndexer: {
class: '%danf:object.classes.interfacesIndexer%',
interfacesRegistry: {
class: '%danf:object.classes.interfacesRegistry%',
lock: true
},
classesHandler: {
class: '%danf:object.classes.classesHandler%',
properties: {
classesIndexer: '#danf:object.classesIndexer#',
classesRegistry: '#danf:object.classesRegistry#',
classProcessors: '&danf:object.classProcessor&'
},
lock: true
},
interfacer: {
class: '%danf:object.classes.interfacer%',
properties: {
interfacesIndexer: '#danf:object.interfacesIndexer#'
interfacesRegistry: '#danf:object.interfacesRegistry#'
}
},
classProcessor: {
Expand All @@ -32,13 +32,13 @@ define(function(require) {
extender: {
class: '%danf:object.classes.classProcessor.extender%',
properties: {
classesIndexer: '#danf:object.classesIndexer#'
classesRegistry: '#danf:object.classesRegistry#'
}
},
interfacer: {
class: '%danf:object.classes.classProcessor.interfacer%',
properties: {
interfacesIndexer: '#danf:object.interfacesIndexer#'
interfacesRegistry: '#danf:object.interfacesRegistry#'
}
}
}
Expand Down
48 changes: 24 additions & 24 deletions lib/initializer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ var define = define ? define : require('amdefine')(module);

var utils,
ClassesHandler,
ClassesIndexer,
InterfacesIndexer,
ClassesRegistry,
InterfacesRegistry,
Interfacer,
ExtenderClassProcessor,
InterfacerClassProcessor,
Expand Down Expand Up @@ -35,8 +35,8 @@ var utils,
if (!module.isClient) {
utils = require('./utils');
ClassesHandler = require('./object/classes-handler');
ClassesIndexer = require('./object/classes-indexer');
InterfacesIndexer = require('./object/interfaces-indexer');
ClassesRegistry = require('./object/classes-registry');
InterfacesRegistry = require('./object/interfaces-registry');
Interfacer = require('./object/interfacer');
ExtenderClassProcessor = require('./object/class-processor/extender');
InterfacerClassProcessor = require('./object/class-processor/interfacer');
Expand Down Expand Up @@ -70,8 +70,8 @@ define(function(require) {
if (module.isClient) {
utils = require('danf/utils');
ClassesHandler = require('danf/object/classes-handler');
ClassesIndexer = require('danf/object/classes-indexer');
InterfacesIndexer = require('danf/object/interfaces-indexer');
ClassesRegistry = require('danf/object/classes-registry');
InterfacesRegistry = require('danf/object/interfaces-registry');
Interfacer = require('danf/object/interfacer');
ExtenderClassProcessor = require('danf/object/class-processor/extender');
InterfacerClassProcessor = require('danf/object/class-processor/interfacer');
Expand Down Expand Up @@ -136,8 +136,8 @@ define(function(require) {

framework.set('danf:object.classesHandler', new ClassesHandler());
framework.set('danf:object.interfacer', new Interfacer());
framework.set('danf:object.classesIndexer', new ClassesIndexer());
framework.set('danf:object.interfacesIndexer', new InterfacesIndexer());
framework.set('danf:object.classesRegistry', new ClassesRegistry());
framework.set('danf:object.interfacesRegistry', new InterfacesRegistry());
framework.set('danf:object.classProcessor.interfacer', new InterfacerClassProcessor());
framework.set('danf:object.classProcessor.extender', new ExtenderClassProcessor());

Expand Down Expand Up @@ -179,15 +179,15 @@ define(function(require) {
Initializer.prototype.inject = function(framework) {
var classesHandler = framework.get('danf:object.classesHandler'),
interfacer = framework.get('danf:object.interfacer'),
classesIndexer = framework.get('danf:object.classesIndexer'),
interfacesIndexer = framework.get('danf:object.interfacesIndexer'),
classesRegistry = framework.get('danf:object.classesRegistry'),
interfacesRegistry = framework.get('danf:object.interfacesRegistry'),
interfacerClassProcessor = framework.get('danf:object.classProcessor.interfacer'),
extenderClassProcessor = framework.get('danf:object.classProcessor.extender')
;
classesHandler.classesIndexer = classesIndexer;
interfacer.interfacesIndexer = interfacesIndexer;
interfacerClassProcessor.interfacesIndexer = interfacesIndexer;
extenderClassProcessor.classesIndexer = classesIndexer;
classesHandler.classesRegistry = classesRegistry;
interfacer.interfacesRegistry = interfacesRegistry;
interfacerClassProcessor.interfacesRegistry = interfacesRegistry;
extenderClassProcessor.classesRegistry = classesRegistry;
classesHandler.addClassProcessor(extenderClassProcessor);
classesHandler.addClassProcessor(interfacerClassProcessor);

Expand Down Expand Up @@ -301,13 +301,13 @@ define(function(require) {
// Process danf module.
var servicesContainer = framework.get('danf:dependencyInjection.servicesContainer'),
classesHandler = framework.get('danf:object.classesHandler'),
classesIndexer = framework.get('danf:object.classesIndexer'),
interfacesIndexer = framework.get('danf:object.interfacesIndexer'),
classesRegistry = framework.get('danf:object.classesRegistry'),
interfacesRegistry = framework.get('danf:object.interfacesRegistry'),
interfacerClassProcessor = framework.get('danf:object.classProcessor.interfacer')
;

classesIndexer.processConfiguration(danf.classes);
interfacesIndexer.processConfiguration(danf.interfaces);
classesRegistry.processConfiguration(danf.classes);
interfacesRegistry.processConfiguration(danf.interfaces);

interfacerClassProcessor.process(ServicesContainer);
interfacerClassProcessor.process(AbstractServiceBuilder);
Expand All @@ -324,10 +324,10 @@ define(function(require) {
servicesContainer.processConfiguration(danf.services, danf.config);

// Process configuration for new instantiated services.
classesIndexer = servicesContainer.get('danf:object.classesIndexer');
classesIndexer.processConfiguration(danf.classes);
interfacesIndexer = servicesContainer.get('danf:object.interfacesIndexer');
interfacesIndexer.processConfiguration(danf.interfaces);
classesRegistry = servicesContainer.get('danf:object.classesRegistry');
classesRegistry.processConfiguration(danf.classes);
interfacesRegistry = servicesContainer.get('danf:object.interfacesRegistry');
interfacesRegistry.processConfiguration(danf.interfaces);
classesHandler = servicesContainer.get('danf:object.classesHandler');
classesHandler.process();

Expand All @@ -342,8 +342,8 @@ define(function(require) {
parameters['flattenConfig'] = utils.flatten(config, 1, ':');

// Process classes config.
classesIndexer.processConfiguration(config.classes || {});
interfacesIndexer.processConfiguration(config.interfaces || {});
classesRegistry.processConfiguration(config.classes || {});
interfacesRegistry.processConfiguration(config.interfaces || {});
classesHandler.process();

// Process services config.
Expand Down
20 changes: 10 additions & 10 deletions lib/object/class-processor/extender.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ define(function(require) {
/**
* Initialize a new extender class processor.
*
* @param {danf:object.classesIndexer} classesIndexer The classes indexer.
* @param {danf:object.classesRegistry} classesRegistry The classes registry.
*/
function Extender(classesIndexer) {
if (classesIndexer) {
this.classesIndexer = classesIndexer;
function Extender(classesRegistry) {
if (classesRegistry) {
this.classesRegistry = classesRegistry;
}
}

Extender.defineImplementedInterfaces(['danf:object.classProcessor']);

Extender.defineDependency('_classesIndexer', 'danf:object.classesIndexer');
Extender.defineDependency('_classesRegistry', 'danf:object.classesRegistry');

/**
* Set the classes indexer.
* Set the classes registry.
*
* @param {danf:object.classesIndexer} classesIndexer The classes indexer.
* @param {danf:object.classesRegistry} classesRegistry The classes registry.
* @api public
*/
Object.defineProperty(Extender.prototype, 'classesIndexer', {
set: function(classesIndexer) { this._classesIndexer = classesIndexer; }
Object.defineProperty(Extender.prototype, 'classesRegistry', {
set: function(classesRegistry) { this._classesRegistry = classesRegistry; }
});

/**
Expand All @@ -47,7 +47,7 @@ define(function(require) {
var extendedClassName = class_.__metadata.extends;

if (extendedClassName && !class_.Parent) {
var parent = this._classesIndexer.get(extendedClassName);
var parent = this._classesRegistry.get(extendedClassName);

this.process(parent);

Expand Down
22 changes: 11 additions & 11 deletions lib/object/class-processor/interfacer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ define(function(require) {
/**
* Initialize a new interfacer class processor.
*
* @param {danf:object.interfacesIndexer} interfacesIndexer The interfaces indexer.
* @param {danf:object.interfacesRegistry} interfacesRegistry The interfaces registry.
*/
function Interfacer(interfacesIndexer) {
if (interfacesIndexer) {
this.interfacesIndexer = interfacesIndexer;
function Interfacer(interfacesRegistry) {
if (interfacesRegistry) {
this.interfacesRegistry = interfacesRegistry;
}
}

Interfacer.defineImplementedInterfaces(['danf:object.classProcessor']);

Interfacer.defineDependency('_interfacesIndexer', 'danf:object.interfacesIndexer');
Interfacer.defineDependency('_interfacesRegistry', 'danf:object.interfacesRegistry');

/**
* Set the interfaces indexer.
* Set the interfaces registry.
*
* @param {danf:object.interfacesIndexer} interfacesIndexer The interfaces indexer.
* @param {danf:object.interfacesRegistry} interfacesRegistry The interfaces registry.
* @api public
*/
Object.defineProperty(Interfacer.prototype, 'interfacesIndexer', {
set: function(interfacesIndexer) { this._interfacesIndexer = interfacesIndexer; }
Object.defineProperty(Interfacer.prototype, 'interfacesRegistry', {
set: function(interfacesRegistry) { this._interfacesRegistry = interfacesRegistry; }
});

/**
Expand Down Expand Up @@ -67,7 +67,7 @@ define(function(require) {

for (var i = 0; i < implementedInterfaces.length; i++) {
var interfaceName = implementedInterfaces[i],
interface_ = this._interfacesIndexer.get(interfaceName)
interface_ = this._interfacesRegistry.get(interfaceName)
;

checkMethods(class_, interfaceName, interface_.methods);
Expand All @@ -79,7 +79,7 @@ define(function(require) {
while (interface_.extends) {
extendedInterfaces.push(interface_.extends);

interface_ = this._interfacesIndexer.get(interface_.extends);
interface_ = this._interfacesRegistry.get(interface_.extends);
}

interfaces = interfaces.concat(extendedInterfaces);
Expand Down
22 changes: 11 additions & 11 deletions lib/object/classes-handler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ define(function(require) {
/**
* Initialize a new classes handler.
*
* @param {danf:object.classesIndexer} classesIndexer The classes indexer.
* @param {danf:object.classesRegistry} classesRegistry The classes registry.
*/
function ClassesHandler(classesIndexer) {
if (classesIndexer) {
this.classesIndexer = classesIndexer;
function ClassesHandler(classesRegistry) {
if (classesRegistry) {
this.classesRegistry = classesRegistry;
}
this._classProcessors = [];
this._processedClasses = {};
Expand All @@ -19,17 +19,17 @@ define(function(require) {
ClassesHandler.defineImplementedInterfaces(['danf:object.classesHandler']);

ClassesHandler.defineDependency('_classProcessors', 'danf:object.classProcessor_array');
ClassesHandler.defineDependency('_classesIndexer', 'danf:object.classesIndexer');
ClassesHandler.defineDependency('_classesRegistry', 'danf:object.classesRegistry');

/**
* Set the classes indexer.
* Set the classes registry.
*
* @param {danf:object.classesIndexer} classesIndexer The classes indexer.
* @param {danf:object.classesRegistry} classesRegistry The classes registry.
* @api public
*/
Object.defineProperty(ClassesHandler.prototype, 'classesIndexer', {
set: function(classesIndexer) {
this._classesIndexer = classesIndexer;
Object.defineProperty(ClassesHandler.prototype, 'classesRegistry', {
set: function(classesRegistry) {
this._classesRegistry = classesRegistry;
}
});

Expand Down Expand Up @@ -78,7 +78,7 @@ define(function(require) {
* @interface {danf:object.classesHandler}
*/
ClassesHandler.prototype.process = function () {
var classes = this._classesIndexer.getAll();
var classes = this._classesRegistry.getAll();

for (var name in classes) {
if (!this._processedClasses[name]) {
Expand Down
Loading

0 comments on commit 6c6e166

Please sign in to comment.