smartxml: wrapping sibling nodes

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 91dd8bb..28a88ee 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -26,7 +26,10 @@ $.extend(DocumentNode.prototype, {
         this._$ = $(nativeNode);
     },
 
         this._$ = $(nativeNode);
     },
 

-    detach: function() { this._$.detach(); },
+    detach: function() {
+        this._$.detach();
+        return this;
+    },

 
     sameNode: function(otherNode) {
         return otherNode && this.nativeNode === otherNode.nativeNode;
 
     sameNode: function(otherNode) {
         return otherNode && this.nativeNode === otherNode.nativeNode;


@@ -313,6 +316,42 @@ $.extend(Document.prototype, Backbone.Events, {
         return this.root.toXML();
     },
 
         return this.root.toXML();
     },
 

+    wrapNodes: function(params) {
+        if(!(params.element1.parent().sameNode(params.element2.parent()))) {
+            throw new Error('Wrapping non-sibling nodes not supported.');
+        }
+
+        var parent = params.element1.parent(),
+            parentContents = parent.contents(),
+            wrapper = this.createElementNode({
+                tagName: params._with.tagName,
+                attrs: params._with.attrs}),
+            idx1 = parent.indexOf(params.element1),
+            idx2 = parent.indexOf(params.element2);
+
+        if(idx1 > idx2) {
+            var tmp = idx1;
+            idx1 = idx2;
+            idx2 = tmp;
+        }
+
+        var insertingMethod, insertingTarget;
+        if(idx1 === 0) {
+            insertingMethod = 'prepend';
+            insertingTarget = parent;
+        } else {
+            insertingMethod = 'after';
+            insertingTarget = parentContents[idx1-1];
+        }
+
+        for(var i = idx1; i <= idx2; i++) {
+            wrapper.append(parentContents[i].detach());
+        }
+
+        insertingTarget[insertingMethod](wrapper);
+        return wrapper;
+    },
+

     _wrapText: function(params) {
         params = _.extend({textNodeIdx: 0}, params);
         if(typeof params.textNodeIdx === 'number') {
     _wrapText: function(params) {
         params = _.extend({textNodeIdx: 0}, params);
         if(typeof params.textNodeIdx === 'number') {

diff --git a/src/smartxml/smartxml.test.js b/src/smartxml/smartxml.test.js
index b12f127..0826458 100644 (file)
--- a/src/smartxml/smartxml.test.js
+++ b/src/smartxml/smartxml.test.js
@@ -317,6 +317,55 @@ describe('smartxml', function() {
                 expect(wrapperContents[1].contents()[0].getText()).to.equal('small');
             });
         });
                 expect(wrapperContents[1].contents()[0].getText()).to.equal('small');
             });
         });

+
+        describe('Wrapping Nodes', function() {
+            it('wraps multiple sibling nodes', function() {
+                var section = elementNodeFromXML('<section>Alice<div>has</div><div>a cat</div></section>'),
+                    aliceText = section.contents()[0],
+                    firstDiv = section.contents()[1],
+                    lastDiv = section.contents()[section.contents().length -1];
+
+                var returned = section.document.wrapNodes({
+                        element1: aliceText,
+                        element2: lastDiv,
+                        _with: {tagName: 'header'}
+                    });
+
+                var sectionContents = section.contents(),
+                    header = sectionContents[0],
+                    headerContents = header.contents();
+
+                expect(sectionContents).to.have.length(1);
+                expect(header.sameNode(returned)).to.equal(true, 'wrapper returned');
+                expect(header.parent().sameNode(section)).to.be.true;
+                expect(headerContents).to.have.length(3);
+                expect(headerContents[0].sameNode(aliceText)).to.equal(true, 'first node wrapped');
+                expect(headerContents[1].sameNode(firstDiv)).to.equal(true, 'second node wrapped');
+                expect(headerContents[2].sameNode(lastDiv)).to.equal(true, 'third node wrapped');
+            });
+
+            it('wraps multiple sibling Elements - middle case', function() {
+                var section = elementNodeFromXML('<section><div></div><div></div><div></div><div></div></section>'),
+                    div2 = section.contents()[1],
+                    div3 = section.contents()[2];
+
+                section.document.wrapNodes({
+                        element1: div2,
+                        element2: div3,
+                        _with: {tagName: 'header'}
+                    });
+
+                var sectionContents = section.contents(),
+                    header = sectionContents[1],
+                    headerChildren = header.contents();
+
+                expect(sectionContents).to.have.length(3);
+                expect(headerChildren).to.have.length(2);
+                expect(headerChildren[0].sameNode(div2)).to.equal(true, 'first node wrapped');
+                expect(headerChildren[1].sameNode(div3)).to.equal(true, 'second node wrapped');
+            });
+        });
+

     });
 
     describe('Serializing document to WLXML', function() {
     });
 
     describe('Serializing document to WLXML', function() {