Add method #wrap to Nokogiri::XML::Element

Manifest.txt

@@ -335,6 +335,7 @@ test/xml/test_document_encoding.rb
 test/xml/test_document_fragment.rb
 test/xml/test_dtd.rb
 test/xml/test_dtd_encoding.rb
+test/xml/test_element.rb
 test/xml/test_element_content.rb
 test/xml/test_element_decl.rb
 test/xml/test_entity_decl.rb

lib/nokogiri/xml/node.rb

@@ -161,6 +161,18 @@ def prepend_child node_or_tags
         end
       end
 
+
+      ###
+      # Add html around this node
+      #
+      # Returns self
+      def wrap(html)
+        new_parent = document.parse(html).first
+        add_next_sibling(new_parent)
+        new_parent.add_child(self)
+        self
+      end
+
       ###
       # Add +node_or_tags+ as a child of this Node.
       # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.

lib/nokogiri/xml/node_set.rb

@@ -215,14 +215,9 @@ def inner_html *args
       end
 
       ###
-      # Wrap this NodeSet with +html+ or the results of the builder in +blk+
-      def wrap(html, &blk)
-        each do |j|
-          new_parent = document.parse(html).first
-          j.add_next_sibling(new_parent)
-          new_parent.add_child(j)
-        end
-        self
+      # Wrap this NodeSet with +html+
+      def wrap html
+        map { |node| node.wrap html }
       end
 
       ###

test/xml/test_element.rb

@@ -0,0 +1,28 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestElementContent < Nokogiri::TestCase
+
+      def test_wrap
+        xml = '<document>
+                 <thing>
+                   <div class="title">important thing</div>
+                 </thing>
+                 <thing>
+                   <div class="content">stuff</div>
+                 </thing>
+                 <thing>
+                   <p class="blah">more stuff</div>
+                 </thing>
+               </document>'
+        document = Nokogiri::XML(xml)
+        things = document.xpath(".//thing")
+        things[0].wrap("<wrapper/>")
+        assert_equal 'wrapper', things[0].parent.name
+        assert_equal 'thing', document.search("//wrapper").first.children[0].name
+      end
+
+    end
+  end
+end