refactoring

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

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 01ab869..13522ba 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) {
@@ -137,15 +137,15 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, {
     }
 });
 
-WLXMLElementNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'wlxml.setMetaAttribute',
-    impl: function(args) {
-        this.setMetaAttribute(args.name, args.value);
-    },
-    getChangeRoot: function() {
-        return this.context;
-    }
-}));
+// WLXMLElementNode.prototype.transformations.register(transformations.createContextTransformation({
+//     name: 'wlxml.setMetaAttribute',
+//     impl: function(args) {
+//         this.setMetaAttribute(args.name, args.value);
+//     },
+//     getChangeRoot: function() {
+//         return this.context;
+//     }
+// }));
 
 
 
@@ -158,24 +158,6 @@ var WLXMLDocument = function(xml, options) {
     smartxml.Document.call(this, xml);
     this.options = options;
 
-    // this.DocumentNodeFactory = function() {
-    //     WLXMLDocumentNode.apply(this, arguments);
-    // };
-
-    // this.DocumentNodeFactory.prototype = Object.create(WLXMLDocumentNode.prototype);    
-    
-    this.ElementNodeFactory = function() {
-        WLXMLElementNode.apply(this, arguments);
-    }
-    this.ElementNodeFactory.prototype = Object.create(WLXMLElementNode.prototype);
-    this.ElementNodeFactory.prototype.transformations = new transformations.TransformationStorage();
-
-    this.TextNodeFactory = function() {
-        smartxml.TextNode.apply(this, arguments);
-    }
-    this.TextNodeFactory.prototype = Object.create(smartxml.TextNode.prototype);
-    this.TextNodeFactory.prototype.transformations = new transformations.TransformationStorage();
-
     this.classMethods = {};
     this.classTransformations = {};
 };
@@ -273,70 +255,35 @@ $.extend(WLXMLDocument.prototype, {
         this.trigger('contentSet');
     },
 
-    registerExtension: function(extension) {
-        //debugger;
-        var doc = this,
-            existingPropertyNames = _.values(this);
+    registerClassTransformation: function(Transformation, className) {
+        var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || new transformations.TransformationStorage());
+        return thisClassTransformations.register(Transformation);
+    },
 
-        var getTrans = function(desc, methodName) {
-            if(typeof desc === 'function') {
-                desc = {impl: desc};
-            }
-            if(!desc.impl) {
-                throw new Error('Got transformation description without implementation.')
-            }
-            desc.name = desc.name || methodName;
-            return desc;
-        };
-
-        [
-            {source: extension.document, target: doc},
-            {source: extension.documentNode, target: [doc.ElementNodeFactory.prototype, doc.TextNodeFactory.prototype]},
-
-        ].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;
-                        });
-                    });
-                }
+    registerClassMethod: function(methodName, method, className) {
+        var thisClassMethods = (this.classMethods[className] = this.classMethods[className] || {});
+        thisClassMethods[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.transformations.register(transformations.createContextTransformation(transformation));
-                        });
-                    });
-                }
-            }
-        });
+    registerExtension: function(extension) {
+        //debugger;
+        smartxml.Document.prototype.registerExtension.call(this, extension);
+        var doc = this;
 
         _.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));
+                var name = pair[0],
+                    desc = pair[1];
+                doc.registerClassTransformation(transformations.createContextTransformation(desc, name), className);
             }); 
         });
 
@@ -350,7 +297,6 @@ var wlxmlClasses = {
     }
 };
 
-var classMethods = {};
 
 return {
     WLXMLDocumentFromXML: function(xml, options) {
@@ -360,32 +306,7 @@ return {
 
     WLXMLElementNodeFromXML: function(xml) {
         return this.WLXMLDocumentFromXML(xml).root;
-    },
-
-    registerExtension: function(extension) {
-        // @@ depracated
-        if(extension.documentTransformations) {
-            extension.documentTransformations.forEach(function(method) {
-                WLXMLDocument.prototype.transformations.register(transformations.createContextTransformation(method));
-            });
-        }
-
-        _.pairs(extension.classMethods).forEach(function(pair) {
-            var className = pair[0],
-                methods = pair[1];
-            _.pairs(methods).forEach(function(pair) {
-                var methodName = pair[0],
-                    method = pair[1];
-                classMethods[className] = classMethods[className] || {};
-                classMethods[className][methodName] = method;
-            });
-            
-        });
-
-        _.extend(WLXMLDocument.prototype, extension.documentMethods);
-
     }
-
 };
 
 });
\ No newline at end of file