From: Aleksander Ɓukasz Date: Tue, 11 Feb 2014 13:38:58 +0000 (+0100) Subject: wlxml: inheritance support for WLXML class methods and transformations X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/989364fcf105797896a7172a4c9367f6b07848b2?ds=sidebyside;hp=4b866f317d1e2e774e55127ba6bf598d61b363d8 wlxml: inheritance support for WLXML class methods and transformations --- diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index fe0636d..9fb6a98 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -17,10 +17,26 @@ AttributesList.prototype.keys = function() { return _.keys(this); }; +var getClassLists = function(klassName) { + var toret = [], + classParts = [''].concat(klassName.split('.')), + classCurrent; + + classParts.forEach(function(part) { + classCurrent = classCurrent ? classCurrent + '.' + part : part; + toret.push(classCurrent); + }); + return toret; +}; + var installObject = function(instance, klass) { - var methods = instance.document.classMethods[klass] || {}, - transformations = instance.document.classTransformations[klass] || {}; + var methods = {}, + transformations = {}; + getClassLists(klass).forEach(function(klassName) { + _.extend(methods, instance.document.classMethods[klassName] || {}); + _.extend(methods, instance.document.classTransformations[klassName] || {}); + }); instance.object = Object.create(_.extend({}, methods, transformations)); _.keys(methods).concat(_.keys(transformations)).forEach(function(key) { instance.object[key] = _.bind(instance.object[key], instance); diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js index 18a7332..d3aa912 100644 --- a/src/wlxml/wlxml.test.js +++ b/src/wlxml/wlxml.test.js @@ -263,7 +263,7 @@ describe('WLXMLDocument', function() { var doc, extension, elementNode, textNode, testClassNode; beforeEach(function() { - doc = getDocumentFromXML('
Alice
'); + doc = getDocumentFromXML('
Alice
'); elementNode = doc.root; textNode = doc.root.contents()[0]; testClassNode = doc.root.contents('.test_class'); @@ -292,6 +292,25 @@ describe('WLXMLDocument', function() { expect(testClassNode.object.testTransformation().sameNode(testClassNode)).to.equal(true, '1'); expect(testClassNode.object.testTransformation2().sameNode(testClassNode)).to.equal(true, '1'); }); + + it('added methods are inherited by nodes with subclasses', function() { + extension = {wlxmlClass: {test_class: {methods: { + testMethod: function() { return this; } + }}}}; + doc.registerExtension(extension); + testClassNode = doc.root.contents()[2]; + expect(testClassNode.object.testMethod().sameNode(testClassNode)).to.equal(true); + }); + it('added transformations are inherited by nodes with subclasses', function() { + extension = {wlxmlClass: {test_class: {transformations: { + testTransformation: function() { return this; }, + testTransformation2: {impl: function() { return this; }} + }}}}; + doc.registerExtension(extension); + testClassNode = doc.root.contents()[2]; + expect(testClassNode.object.testTransformation().sameNode(testClassNode)).to.equal(true, '1'); + expect(testClassNode.object.testTransformation2().sameNode(testClassNode)).to.equal(true, '2'); + }); }); });