Tests refactoring

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 04449cf..96fcdfe 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -7,19 +7,9 @@ define([
 
 var TEXT_NODE = Node.TEXT_NODE, ELEMENT_NODE = Node.ELEMENT_NODE;
 
 
 var TEXT_NODE = Node.TEXT_NODE, ELEMENT_NODE = Node.ELEMENT_NODE;
 

-var parseXML = function(xml) {
-    return $(xml)[0];
-};
-
-var Document = function(nativeNode) {
-    var $document = $(nativeNode);
-
-
-    Object.defineProperty(this, 'root', {get: function() { return new ElementNode($document[0]);}});
-};
-

 
 

-var DocumentNode = function(nativeNode) {
+var DocumentNode = function(nativeNode, document) {
+    this.document = document;

     this.nativeNode = nativeNode;
     this._$ = $(nativeNode);
 };
     this.nativeNode = nativeNode;
     this._$ = $(nativeNode);
 };


@@ -29,7 +19,21 @@ $.extend(DocumentNode.prototype, {
 
     sameNode: function(otherNode) {
         return this.nativeNode === otherNode.nativeNode;
 
     sameNode: function(otherNode) {
         return this.nativeNode === otherNode.nativeNode;

-    }
+    },
+
+    parent: function() {
+        return this.nativeNode.parentNode ? this.document.createElementNode(this.nativeNode.parentNode) : null;
+    },
+
+    before: function(node) {
+        this._$.before(node.nativeNode);
+    },
+
+    wrapWith: function(node) {
+        if(this.parent())
+            this.before(node);
+        node.append(this);
+    },

 });
 
 var ElementNode = function(nativeNode) {
 });
 
 var ElementNode = function(nativeNode) {


@@ -44,12 +48,13 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
     },
 
     contents: function() {
     },
 
     contents: function() {

-        var toret = [];
+        var toret = [],
+            document = this.document;

         this._$.contents().each(function() {
             if(this.nodeType === Node.ELEMENT_NODE)
         this._$.contents().each(function() {
             if(this.nodeType === Node.ELEMENT_NODE)

-                toret.push(new ElementNode(this));
+                toret.push(document.createElementNode(this));

             else if(this.nodeType === Node.TEXT_NODE)
             else if(this.nodeType === Node.TEXT_NODE)

-                toret.push(new TextNode(this));
+                toret.push(document.createTextNode(this));

         });
         return toret;
     },
         });
         return toret;
     },


@@ -58,10 +63,6 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
         return this._$.contents().index(node._$);
     },
 
         return this._$.contents().index(node._$);
     },
 

-    parent: function() {
-        return new ElementNode(this._$.parent());
-    },
-

     getAttr: function(name) {
         return this._$.attr(name);
     },
     getAttr: function(name) {
         return this._$.attr(name);
     },


@@ -70,12 +71,16 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
         this._$.attr(name, value);
     },
 
         this._$.attr(name, value);
     },
 

-    append: function(documentNode) {
-        this._$.append(documentNode.nativeNode);
+    getAttrs: function() {
+        var toret = [];
+        for(var i = 0; i < this.nativeNode.attributes.length; i++) {
+            toret.push(this.nativeNode.attributes[i]);
+        }
+        return toret;

     },
 
     },
 

-    before: function(node) {
-        this._$.before(node.nativeNode);
+    append: function(documentNode) {
+        this._$.append(documentNode.nativeNode);

     },
 
     unwrapContent: function() {
     },
 
     unwrapContent: function() {


@@ -145,14 +150,44 @@ $.extend(TextNode.prototype, DocumentNode.prototype, {
 });
 
 
 });
 
 

+var parseXML = function(xml) {
+    return $(xml)[0];
+};
+
+var Document = function(xml) {
+    var $document = $(parseXML(xml));
+
+    var doc = this;
+    Object.defineProperty(this, 'root', {get: function() {
+        return doc.createElementNode($document[0]);
+    }});
+};
+$.extend(Document.prototype, {
+    ElementNodeFactory: ElementNode,
+    TextNodeFactory: TextNode,
+
+    createElementNode: function(nativeNode) {
+        return new this.ElementNodeFactory(nativeNode, this);
+    },
+
+    createTextNode: function(nativeNode) {
+        return new this.TextNodeFactory(nativeNode, this);
+    }
+});
+
+

 return {
     documentFromXML: function(xml) {
         return new Document(parseXML(xml));
     },
 
     elementNodeFromXML: function(xml) {
 return {
     documentFromXML: function(xml) {
         return new Document(parseXML(xml));
     },
 
     elementNodeFromXML: function(xml) {

-        return new ElementNode(parseXML(xml));
-    }
+        return this.documentFromXML(xml).root;
+    },
+
+    Document: Document,
+    DocumentNode: DocumentNode,
+    ElementNode: ElementNode

 };
 
 });
\ No newline at end of file
 };
 
 });
\ No newline at end of file