ensuring transformed nodes are not given parents namespace when replace/insert

Author: zappy-shu

lib/puppet_x/transforms/xdt_transform_insert.rb

@@ -8,6 +8,8 @@ def initialize(transform_arguments)
 
     def transform(source_node, transform_node)
         XdtTransformLogger.log_action('Insert', source_node, transform_node, @transform_arguments)
+        transform_node_namespace = transform_node.namespace
         source_node.add_child(transform_node)
+        transform_node.namespace = nil if transform_node_namespace.nil?
     end
 end

lib/puppet_x/transforms/xdt_transform_insert_after.rb

@@ -8,24 +8,28 @@ def initialize(transform_arguments)
 
     def transform(source_node, transform_node)
         XdtTransformLogger.log_action('InsertAfter', source_node, transform_node, @transform_arguments)
+        transform_node_namespace = transform_node.namespace
+
         unless @transform_arguments.length == 1
             warn 'InsertAfter must have 1 argument that is the xpath of the node to insert before'
             return
         end
 
         xpath = @transform_arguments[0]
-        insert_before_nodes = source_node.xpath(@transform_arguments[0])
-        if insert_before_nodes.length == 0
+        insert_after_nodes = source_node.xpath(@transform_arguments[0])
+        puts insert_after_nodes
+        if insert_after_nodes.length == 0
             warn "Cannot find xpath '#{xpath}'"
             return
         end
 
-        insert_before_node = insert_before_nodes[0]
-        if insert_before_node == source_node.document.root
+        insert_after_node = insert_after_nodes[0]
+        if insert_after_node == source_node.document.root
             warn 'Cannot InsertAfter root'
             return
         end
 
-        insert_before_node.after(transform_node)
+        insert_after_node.after(transform_node)
+        transform_node.namespace = nil if transform_node_namespace.nil?
     end
 end

lib/puppet_x/transforms/xdt_transform_insert_before.rb

@@ -8,6 +8,7 @@ def initialize(transform_arguments)
 
     def transform(source_node, transform_node)
         XdtTransformLogger.log_action('InsertBefore', source_node, transform_node, @transform_arguments)
+        transform_node_namespace = transform_node.namespace
         unless @transform_arguments.length == 1
             warn 'InsertBefore must have 1 argument that is the xpath of the node to insert before'
             return
@@ -27,5 +28,6 @@ def transform(source_node, transform_node)
         end
 
         insert_before_node.before(transform_node)
+        transform_node.namespace = nil if transform_node_namespace.nil?
     end
 end

lib/puppet_x/transforms/xdt_transform_replace.rb

@@ -8,6 +8,8 @@ def initialize(transform_arguments)
 
     def transform(source_node, transform_node)
         XdtTransformLogger.log_action('Replace', source_node, transform_node, @transform_arguments)
+        transform_node_namespace = transform_node.namespace
         source_node.replace(transform_node)
+        transform_node.namespace = nil if transform_node_namespace.nil?
     end
 end

lib/puppet_x/xdt_transformer.rb

@@ -7,15 +7,17 @@ class XdtTransformer
     def initialize(source_doc, transform_doc)
         @source_doc = source_doc
         @transform_doc = transform_doc
-
+        @doc_to_transform = source_doc.clone
+        #puts @doc_to_transform
+        
         @xdt_namespace = XdtNamespace.new
         @locator_factory = XdtLocatorFactory.new
         @transform_factory = XdtTransformFactory.new
     end
 
     def transform
-        walk_tree(@source_doc.root, @transform_doc.root) if @xdt_namespace.has_xdt_namespace?(@transform_doc)
-        return @source_doc
+        walk_tree(@doc_to_transform.root, @transform_doc.root) if @xdt_namespace.has_xdt_namespace?(@transform_doc)
+        return @doc_to_transform
     end
 
     private

spec/unit/puppet_x/transforms/xdt_transform_insert_after_spec.rb

@@ -62,5 +62,34 @@
                 expect(source_doc.root.elements[2].to_s).to eql('<c/>')
             end
         end
+        context 'when inserting to parent with namespace while node has no namespace' do
+            it 'inserted node has no namespace' do
+                source_doc = Nokogiri::XML('<n:root xmlns:n="ns"><a/><c/></n:root>')
+                transform_doc = Nokogiri::XML('<b/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsertAfter.new(['/n:root/a']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<b/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<c/>')
+            end
+        end
+        context 'when inserting to parent with namespace while node has different namespace' do
+            it 'inserted node has own namespace' do
+                source_doc = Nokogiri::XML('<n1:root xmlns:n1="ns1"><a/><c/></n:root>')
+                transform_doc = Nokogiri::XML('<n2:b xmlns:n2="ns2"/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsertAfter.new(['/n1:root/a']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<n2:b xmlns:n2="ns2"/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<c/>')
+                expect(source_doc.root.elements[1].namespace.href).to eql("ns2")
+            end
+        end
     end
 end

spec/unit/puppet_x/transforms/xdt_transform_insert_before_spec.rb

@@ -62,5 +62,34 @@
                 expect(source_doc.root.elements[2].to_s).to eql('<c/>')
             end
         end
+        context 'when inserting to parent with namespace while node has no namespace' do
+            it 'inserted node has no namespace' do
+                source_doc = Nokogiri::XML('<n:root xmlns:n="ns"><a/><c/></n:root>')
+                transform_doc = Nokogiri::XML('<b/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsertBefore.new(['/n:root/c']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<b/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<c/>')
+            end
+        end
+        context 'when inserting to parent with namespace while node has different namespace' do
+            it 'inserted node has own namespace' do
+                source_doc = Nokogiri::XML('<n1:root xmlns:n1="ns1"><a/><c/></n:root>')
+                transform_doc = Nokogiri::XML('<n2:b xmlns:n2="ns2"/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsertBefore.new(['/n1:root/c']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<n2:b xmlns:n2="ns2"/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<c/>')
+                expect(source_doc.root.elements[1].namespace.href).to eql("ns2")
+            end
+        end
     end
 end

spec/unit/puppet_x/transforms/xdt_transform_insert_spec.rb

@@ -31,5 +31,34 @@
                 expect(source_doc.root.elements[2].to_s).to eql('<c/>')
             end
         end
+        context 'when inserting to parent with namespace while node has no namespace' do
+            it 'inserted node has no namespace' do
+                source_doc = Nokogiri::XML('<n:root xmlns:n="ns"><a/><b/></n:root>')
+                transform_doc = Nokogiri::XML('<c/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsert.new(['/n:root']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<b/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<c/>')
+            end
+        end
+        context 'when inserting to parent with namespace while node has different namespace' do
+            it 'inserted node has own namespace' do
+                source_doc = Nokogiri::XML('<n1:root xmlns:n1="ns1"><a/><b/></n:root>')
+                transform_doc = Nokogiri::XML('<n2:c xmlns:n2="ns2"/>')
+                source_node = source_doc.root
+                transform_node = transform_doc.root
+
+                XdtTransformInsert.new(['/n1:root']).transform(source_node, transform_node)
+                expect(source_doc.root.elements.length).to eql(3)
+                expect(source_doc.root.elements[0].to_s).to eql('<a/>')
+                expect(source_doc.root.elements[1].to_s).to eql('<b/>')
+                expect(source_doc.root.elements[2].to_s).to eql('<n2:c xmlns:n2="ns2"/>')
+                expect(source_doc.root.elements[2].namespace.href).to eql("ns2")
+            end
+        end
     end
 end

spec/unit/puppet_x/xdt_xpath_reader_spec.rb

@@ -31,9 +31,9 @@
             end
         end
         context 'when node has namespace' do
-            it 'return prefix:name' do
+            it 'return with local name and namespace uri' do
                 node = Nokogiri::XML('<root xmlns:ns="space"><ns:a/><ns:a/></root>').xpath('/root/ns:a')[0]
-                expect(XdtXpathReader.read_local(node)).to eql('ns:a')
+                expect(XdtXpathReader.read_local(node)).to eql("*[local-name()='a' and namespace-uri()='space']")
             end
         end
     end