Refactoring extension registration - abstracting away registration on objects

[fnpeditor.git] / src / wlxml / wlxml.js

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index ee85a03..98d6a10 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -22,7 +22,7 @@ AttributesList.prototype.keys = function() {
 };
 
 var installObject = function(instance, klass) {
-    var methods = instance.document.classMethods[klass];
+    var methods = instance.document.classMethods[klass] || instance.document.classTransformations;
     if(methods) {
         instance.object = Object.create(_.extend({
             transform: function(name, args) {
@@ -169,12 +169,18 @@ var WLXMLDocument = function(xml, options) {
     }
     this.ElementNodeFactory.prototype = Object.create(WLXMLElementNode.prototype);
     this.ElementNodeFactory.prototype.transformations = new transformations.TransformationStorage();
+    this.ElementNodeFactory.prototype.registerTransformation = function(Transformation) {
+        return this.transformations.register(Transformation);
+    };
 
     this.TextNodeFactory = function() {
         smartxml.TextNode.apply(this, arguments);
     }
     this.TextNodeFactory.prototype = Object.create(smartxml.TextNode.prototype);
     this.TextNodeFactory.prototype.transformations = new transformations.TransformationStorage();
+    this.TextNodeFactory.prototype.registerTransformation = function(Transformation) {
+        return this.transformations.register(Transformation);
+    };
 
     this.classMethods = {};
     this.classTransformations = {};
@@ -273,33 +279,24 @@ $.extend(WLXMLDocument.prototype, {
         this.trigger('contentSet');
     },
 
-    registerExtension: function(extension) {
-        //debugger;
-        var doc = this,
-            existingPropertyName = _.values(this);
+    registerTransformation: function(Transformation) {
+        return this.transformations.register(Transformation);
+    },
 
-        [
-            {source: extension.document, target: doc},
-            {source: extension.documentNode, target: [doc.ElementNodeFactory.prototype, doc.TextNodeFactory.prototype]},
+    registerClassTransformation: function(Transformation, className) {
+        var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || new transformations.TransformationStorage());
+        return thisClassTransformations.register(Transformation);
+    },
 
-        ].forEach(function(x) {
-            if(x.source && x.source.methods) {
-                existingPropertyName = _.values(x.target)
-                _.pairs(x.source.methods).forEach(function(pair) {
-                    var methodName = pair[0],
-                        method = pair[1],
-                        targets = _.isArray(x.target) ? x.target : [x.target];
-                    if(_.contains(existingPropertyName, methodName)) {
-                        throw new Error('Cannot extend XXX with method name {methodName}. Name already exists.'.replace('{methodName}', methodName));
-                    }
-                    targets.forEach(function(target) {
-                        target[methodName] = method;
-                    });
-                    
-                });   
-            }
-        });
+    registerClassMethod: function(methodName, method, className) {
+        var thisClassMethods = (this.classMethods[className] = this.classMethods[className] || {});
+        thisClassMethods[methodName] = method;
+    },
 
+    registerExtension: function(extension) {
+        //debugger;
+        var doc = this,
+            existingPropertyNames = _.values(this);
 
         var getTrans = function(desc, methodName) {
             if(typeof desc === 'function') {
@@ -312,34 +309,55 @@ $.extend(WLXMLDocument.prototype, {
             return desc;
         };
 
-        if(extension.document && extension.document.transformations) {
-            _.pairs(extension.document.transformations).forEach(function(pair) {
-                var transformation = getTrans(pair[1], pair[0]);
-                doc.transformations.register(transformations.createContextTransformation(transformation));
-            });   
-        }
+        [
+            {source: extension.document, target: doc},
+            {source: extension.documentNode, target: [doc.ElementNodeFactory.prototype, doc.TextNodeFactory.prototype]},
 
-        if(extension.documentNode && extension.documentNode.transformations) {
-            _.pairs(extension.documentNode.transformations).forEach(function(pair) {
-                var transformation = getTrans(pair[1], pair[0]);
-                
-                doc.ElementNodeFactory.prototype.transformations.register(transformations.createContextTransformation(transformation));
-                doc.TextNodeFactory.prototype.transformations.register(transformations.createContextTransformation(transformation));
-            });   
-        }
+        ].forEach(function(mapping) {
+            if(mapping.source) {
+                if(mapping.source.methods) {
+                    existingPropertyNames = _.values(mapping.target)
+                    _.pairs(mapping.source.methods).forEach(function(pair) {
+                        var methodName = pair[0],
+                            method = pair[1],
+                            targets = _.isArray(mapping.target) ? mapping.target : [mapping.target];
+                        if(_.contains(existingPropertyNames, methodName)) {
+                            throw new Error('Cannot extend {target} with method name {methodName}. Name already exists.'
+                                .replace('{target}', mapping.target)
+                                .replace('{methodName}', methodName)
+                            );
+                        }
+                        targets.forEach(function(target) {
+                            target[methodName] = method;
+                        });
+                    });
+                }
+
+                if(mapping.source.transformations) {
+                    _.pairs(mapping.source.transformations).forEach(function(pair) {
+                        var transformation = getTrans(pair[1], pair[0]),
+                            targets = _.isArray(mapping.target) ? mapping.target : [mapping.target];
+                        targets.forEach(function(target) {
+                            target.registerTransformation(transformations.createContextTransformation(transformation));
+                        });
+                    });
+                }
+            }
+        });
 
         _.pairs(extension.wlxmlClass).forEach(function(pair) {
             var className = pair[0],
-                classExtension = pair[1],
-                thisClassMethods = (doc.classMethods[className] = doc.classMethods[className] || {}),
-                thisClassTransformations = (doc.classTransformations[className] = doc.classTransformations[className] || new transformations.TransformationStorage());
-    
-            _.extend(thisClassMethods, classExtension.methods || {}); //@ warning/throw on override?
-            
+                classExtension = pair[1];
+
+            _.pairs(classExtension.methods || {}).forEach(function(pair) {
+                var name = pair[0],
+                    method = pair[1];
+                doc.registerClassMethod(name, method, className);
+            });
 
             _.pairs(classExtension.transformations || {}).forEach(function(pair) {
                 var transformation = getTrans(pair[1], pair[0]);
-                thisClassTransformations.register(transformations.createContextTransformation(transformation));
+                doc.registerClassTransformation(transformations.createContextTransformation(transformation), className);
             }); 
         });