xml-smart 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5bdaa76b04eb422f59648a1387a106751fbd78
-  data.tar.gz: c782e442fc1e57a81a6e516bf5d73ba29652c24f
+  metadata.gz: 6d05696d426518de0bfd9786c6409993a8bda165
+  data.tar.gz: 9be92beef9e765e91b72b8afffda5f79cf694122
 SHA512:
-  metadata.gz: 76bdff5b7e342a74293bbd7c799907cd027abaf222b06e2eb70f800457ae6d956401655218bec49f680adf9c5e29014c8113a12bea3cae7f7767628aeb83b23f
-  data.tar.gz: f9f5c313c4d6afdae809cae090ac81ac392ad5f0397569024f9c543e2c6f097aeb5d570a7ee51c40030a0c34574cd9d35329032b5ee72af543224213a9410776
+  metadata.gz: 88aee8b8411d3b91a40373e5befe6897446f88960f0aa0453969f142f761a3ac41fe224729a003154b66b7f2b1a432025f703902e057b0dcc74a930b4bbad03d
+  data.tar.gz: 4570b4d8d349747b80be0e66a56c50904316786749ba57b782cb11da919447e6ffc3d713e42eee59d9d4c1299bb14dbecde067ef9213760156f5f6c494313b20

data/lib/xml/smart.rb

@@ -102,7 +102,7 @@ module Nokogiri
           name = path + name if name !~ /^(https?:|ftp:)/
           content = open(name,{ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read
           insert = begin 
-            Nokogiri::XML::parse(content){|config| config.noblanks.noent.nsclean.strict }.root
+            Nokogiri::XML::parse(content).root # {|config| config.noblanks.noent.strict }.root
           rescue
             content
           end
@@ -117,6 +117,17 @@ module Nokogiri
         end
       end
 
+      alias __replace replace
+      def replace(node_or_tags)
+        x = __replace(node_or_tags)
+        x.xpath('.|.//*|.//@*').each do |rns|
+          x.namespace_scopes.each do |nss|
+            rns.namespace = nss if rns.namespace && rns.namespace.href == nss.href
+          end
+        end
+        x
+      end
+
       def xpath_experimental
         return NodeSet.new(document) unless document
         @nsc ||= 0

data/lib/xml/smart_domelement.rb

@@ -25,13 +25,13 @@ module XML
                   if @element.document.user_custom_namespace_prefixes[pfx] == v
                     ns = @element.document.user_custom_namespace_prefixes[pfx]
                   end
-                end  
+                end
               end
-              if ns.nil? 
+              if ns.nil?
                 if @element.document.custom_namespace_prefixes.has_key?(pfx)
                   ns = @element.document.custom_namespace_prefixes[pfx]
                 else
-                  raise Error, 'No valid namespace' 
+                  raise Error, 'No valid namespace'
                 end
               end
             end
@@ -86,10 +86,10 @@ module XML
               if attrs[1] == XML::Smart::COPY
                 tnos = nos.map{|e|e.dup}
                 nos = Nokogiri::XML::NodeSet.new(nos.first.document,tnos)
-              end  
+              end
                 return [Nokogiri::XML::NodeSet.new(nos.first.document,tnos), true]
               return [nos, !same]
-            else  
+            else
               return [nos, false]
             end
           elsif attrs.length == 2 && attrs[0].is_a?(String) && attrs[1].is_a?(String) && attrs[0][0] == '?'
@@ -105,7 +105,7 @@ module XML
           if update
             @element.document.custom_namespace_prefixes_update
             @element.document.ns_update
-          end  
+          end
           res
         end
         def append(*attrs)
@@ -121,7 +121,7 @@ module XML
           if update
             @element.document.custom_namespace_prefixes_update
             @element.document.ns_update
-          end  
+          end
           res
         end
         def add_after(*attrs)
@@ -130,11 +130,16 @@ module XML
           if update
             @element.document.custom_namespace_prefixes_update
             @element.document.ns_update
-          end  
+          end
           res
         end
 
-        def dump; @element.to_s; end
+        def dump
+          doc = Nokogiri::XML::Document.new
+          doc.root = @element
+          doc.root.to_s
+        end
+
         def to_s; @element.content; end
         def to_i; @element.content.to_i; end
         def to_f; @element.content.to_f; end
@@ -149,7 +154,7 @@ module XML
               n
             else
               return
-          end  
+          end
           tmp = @element.document.custom_namespace_prefixes[n] || @element.document.user_custom_namespace_prefixes[n]
           unless tmp.nil?
             @element.namespace_scopes.each do |nss|

data/test/EXAMPLE.xml

@@ -1,6 +1,6 @@
 <test xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xml:lang="de">
   <names>
-    <name team="0" a="3">2015-07-23 21:37:19 +0200</name>
+    <name team="0" a="3">2015-07-27 20:41:24 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/concurrent.xml

@@ -1,7 +1 @@
-<solutions>
-  <solution matnr="9906264" name="mangler" secid="1" when="2015-07-23T21:37:19+02:00" assessment="16">
-    <question block="1" question="2"/>
-    <question block="2" question="4"/>
-    <question block="3" question="6"/>
-  </solution>
-</solutions>
+<solutions><solution matnr="9906264" name="mangler" secid="1" assessment="16"><question block="1" question="2"/><question block="2" question="4"/><question block="3" question="6"/></solution></solutions>

data/test/tc_basic.rb

@@ -82,7 +82,7 @@ class TestBasic < MiniTest::Test
 
     doc = XML::Smart.open(::File.dirname(__FILE__) + "/EXAMPLE-NS.xml")
     assert(doc.namespaces == {"xmlns0"=>"http://example.org", "xmlns1"=>"http://example1.org", "soap"=>"http://schemas.xmlsoap.org/wsdl/soap/"})
-    assert(doc.find('//xmlns0:names/xmlns0:name')[2].dump == "<name team=\"1\">Michel</name>")
+    assert(doc.find('//xmlns0:names/xmlns0:name')[2].dump == "<name xmlns=\"http://example.org\" team=\"1\">Michel</name>")
 
     doc = XML::Smart.open(::File.dirname(__FILE__) + "/EXAMPLE-NSE.xml")
     node = doc.find("//soap:hallo")[0]
@@ -94,10 +94,10 @@ class TestBasic < MiniTest::Test
     assert(node.qname.href       == "http://schemas.xmlsoap.org/wsdl/soap/")
 
     node.namespace = 'x'
-    assert(node.dump == "<test:hallo/>")
+    assert(node.dump == "<test:hallo xmlns:test=\"http://xxx.org\"/>")
     assert(doc.root.namespaces.length == 3)
     node.namespace = 'xmlns'
-    assert(node.dump == "<hallo/>");
+    assert(node.dump == "<hallo xmlns=\"http://default.org\"/>")
 
     node = doc.find("/xmlns:test")[0]
     assert(node.qname.prefix == "")

data/test/tc_copy.rb

@@ -32,7 +32,9 @@ class TestCopy < Minitest::Test
     assert(doc.find("/test/*[7]").first.dump          == "<name team=\"2\">Kathrin <b>Fiedler</b></name>")
     assert(doc.find("/test/*[8]").first.dump          == "<name team=\"2\">Kathrin <b>Fiedler</b></name>")
     assert(doc.find("/test/*[9]").first.dump          == "<node id=\"1\">\n  <text xmlns=\"http://aaa\">I am a text</text>\n</node>")
-    assert(doc.find("/test/*[10]").first.dump         == "<soap:node id=\"2\"/>")
+
+
+    assert(doc.find("/test/*[10]").first.dump         == "<soap:node xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" id=\"2\"/>")
 
     assert(soc.root.dump                              == "<root xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\">\n  <node id=\"1\">\n    <text xmlns=\"http://aaa\">I am a text</text>\n  </node>\n  <soap:node id=\"2\"/>\n</root>")
   end

data/test/tc_namespace_default.rb

@@ -27,7 +27,7 @@ class TestNamespaceDefault < Minitest::Test
     n = nsnode.add('x:test') rescue success = false
     assert(success)
 
-    assert(nsnode.dump == "<hallo>\n  <soap:test/>\n</hallo>")
+    assert(nsnode.dump == "<hallo xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\">\n  <soap:test/>\n</hallo>")
 
     assert(nsnode.qname.name                                    == "hallo")
     assert(nsnode.qname.to_s                                    == "hallo")

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = "xml-smart"
-  s.version               = "0.3.15"
+  s.version               = "0.3.16"
   s.platform              = Gem::Platform::RUBY
   s.license               = "LGPL-3"
   s.summary               = "An xml library that doesn't suck - since 2004."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri