xml-smart 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfea354650019ab5f80ac4522562ba55fb0e71b88885a74ada76b3f948c936b8
-  data.tar.gz: bcccdac2fb2eb4492af1301092fcbbb89f7458dea67854d857696586c3042eb7
+  metadata.gz: 97b3d4716521c2db8484f9bcfbfbf3e94f6860fcca2edef1525f5e6bb72e6a06
+  data.tar.gz: 25dfd08f00306769c64fd556d9f589aa649bf2760c32f0acfe07f5dbb7df9e48
 SHA512:
-  metadata.gz: 4cf2e0c62c1f8be0d82a326c2c396e6849ce6670335296cb693168c11c4e8d4f1c239de944af2ab9d560b2d8720c2f7677951d8eb772eb10401d22a5096a60c9
-  data.tar.gz: 452a5dddb8f0235cb3a1d0839b9a72e060165177557fd439736f43d804a1918fa881e4b62c84627c0fd4c429bb626f6bdf3f4cb0db6fab1c5071d6a13caf4f1c
+  metadata.gz: 2764ddbf57f7b2ef45e07da667fa9a4f32fb505633a559e5ef759af9ac7c5b7482a93a367f3d8ab9b08bb82b9350211016d18a2f5fd98cdad8e5f7869424ea9b
+  data.tar.gz: 7a0c5de212141c7e1d86864c1880d1f997aa943cb87adc72f1c8df12000234393d72fef4ef6d04b7fe3953c31716ced533aee44d19557d37c7d73612b93f6909

data/example/xpath_visual

@@ -31,7 +31,7 @@ def prnTree(node,depth,mixed)
 end
 
 def help
-  puts "Usage: xpath_visual.rb FILE \"XPATH\""
+  puts "Usage: xpath_visual FILE \"XPATH\""
   exit
 end
 

data/lib/xml/smart_dom.rb

@@ -13,7 +13,7 @@ module XML
         Element.new(@dom.root)
       end
       def root=(nr)
-        @dom.root.replace(nr.instance_variable_get(:@element)) if nr.instance_of? Element
+        @dom.root.replace(nr.instance_variable_get(:@node)) if nr.instance_of? Element
       end
 
       def find(path)
@@ -70,20 +70,20 @@ module XML
 
       def xinclude!(basedir=nil)
         Element.new(@dom.root).xinclude!(basedir)
-      end  
+      end
 
       def self::smart_helper(node)
         if node.instance_of? Nokogiri::XML::Element
           XML::Smart::Dom::Element.new(node)
         elsif node.instance_of? Nokogiri::XML::Attr
           XML::Smart::Dom::Attribute.new(node)
-        elsif node.instance_of? Nokogiri::XML::NodeSet  
+        elsif node.instance_of? Nokogiri::XML::NodeSet
           XML::Smart::Dom::NodeSet.new(node)
-        elsif node.instance_of?(String) || node.instance_of?(TrueClass) || node.instance_of?(FalseClass) || node.instance_of?(Float)  
+        elsif node.instance_of?(String) || node.instance_of?(TrueClass) || node.instance_of?(FalseClass) || node.instance_of?(Float)
           node
-        elsif node.instance_of? Nokogiri::XML::Text  
+        elsif node.instance_of? Nokogiri::XML::Text
           XML::Smart::Dom::Text.new(node)
-        elsif node.instance_of? Nokogiri::XML::Namespace  
+        elsif node.instance_of? Nokogiri::XML::Namespace
           XML::Smart::Dom::Namespace.new(node)
         elsif node.instance_of? Nokogiri::XML::Document
           XML::Smart::Dom.new(node)
@@ -93,7 +93,7 @@ module XML
           nil
         else
           XML::Smart::Dom::Other.new(node)
-        end  
+        end
       end
 
       def validate_against(doc,&errbl)
@@ -114,9 +114,9 @@ module XML
         res = Nokogiri::XSLT::Stylesheet.parse_stylesheet_doc(doc.instance_variable_get(:@dom)).transform(@dom,params)
         if res.children.length != 0 && res.children.first.class == Nokogiri::XML::Text
           Text.new(res.children.first).text
-        else 
+        else
           Dom::smart_helper(res)
-        end  
+        end
       end
 
     end

data/lib/xml/smart_domelement.rb

@@ -171,6 +171,14 @@ module XML
         end
 
         def replace_by(n)
+          case n
+            when Element; Element.new @node.replace(n.instance_variable_get(:@node))
+            when NodeSet; NodeSet.new @node.replace(n.instance_variable_get(:@nodeset))
+            else
+              nil
+          end
+        end
+        def replace_by_copy(n)
           case n
             when Element; Element.new @node.replace(n.instance_variable_get(:@node).dup)
             when NodeSet; NodeSet.new @node.replace(n.instance_variable_get(:@nodeset).dup)

data/lib/xml/smart_domnamespaceset.rb

@@ -45,7 +45,7 @@ module XML
             nnew.add(nold.children)
             nold.replace_by(nnew)
             @node = nnod
-            @parent.instance_variable_set(:@element,@node)
+            @parent.instance_variable_set(:@node,@node)
             @node.document.custom_namespace_prefixes_update
             @node.document.ns_update
             Namespace.new(ns)
@@ -64,7 +64,7 @@ module XML
           nnew.add(nold.children)
           nold.replace_by(nnew)
           @node = nnod
-          @parent.instance_variable_set(:@element,@node)
+          @parent.instance_variable_set(:@node,@node)
           @node.document.custom_namespace_prefixes_update
           @node.document.ns_update
           nil
@@ -92,7 +92,7 @@ module XML
             nnew.add(nold.children)
             nold.replace_by(nnew)
             @node = nnod
-            @parent.instance_variable_set(:@element,@node)
+            @parent.instance_variable_set(:@node,@node)
             @node.document.custom_namespace_prefixes_update
             @node.document.ns_update
             true
@@ -115,7 +115,7 @@ module XML
           nnew.add(nold.children)
           nold.replace_by(nnew)
           @node = nnod
-          @parent.instance_variable_set(:@element,@node)
+          @parent.instance_variable_set(:@node,@node)
           @node.document.custom_namespace_prefixes_update
           @node.document.ns_update
           self

data/lib/xml/smart_domother.rb

@@ -4,13 +4,13 @@ module XML
 
       class Other < Text
         def otype
-          case @text
+          case @node
             when Nokogiri::XML::Comment; :comment
             else; :unknown
           end
         end
       end
-    
+
     end
   end
-end  
+end

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">2017-12-01 11:51:05 +0100</name>
+    <name team="0" a="3">2020-06-05 23:34:48 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/tc_namespace_default.rb

@@ -12,7 +12,7 @@ class TestNamespaceDefault < Minitest::Test
     assert(doc.namespaces.length == 2)
     assert(doc.namespaces.key? 'soap')
     assert(doc.namespaces.key? 'x')
-    
+
     # add an element hallo to root
     nsnode = doc.root.add("hallo")
 
@@ -50,7 +50,7 @@ class TestNamespaceDefault < Minitest::Test
     nsnode.namespaces.add("aaa","http://heise2")
 
     assert(nsnode.namespaces[nil] == nil)
-    
+
     nsnode.namespaces.add(nil,"http://heise")
     nsnode.namespaces[nil] = "http://heiser"
 
@@ -61,13 +61,13 @@ class TestNamespaceDefault < Minitest::Test
     assert(nsnode.namespaces['xmlns'].href == "http://heiser")
     assert(nsnode.namespaces['aaa'].href == "http://heise2")
     assert(nsnode.namespaces['test'].href == "http://heise1")
-    
+
     assert(doc.namespaces.length == 5)
     nsnode.namespaces.delete_at('aaa')
     assert(nsnode.namespaces['aaa'].nil?)
-    
+
     assert(doc.namespaces.length == 4)
     nsnode.namespaces.delete_all!
     assert(doc.namespaces.length == 2)
-  end  
-end  
+  end
+end

data/xml-smart.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Juergen eTM Mangler