xml-smart 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811c9bcaf859068540db8993295edf9b5687b8b9
-  data.tar.gz: 2211073f067c264599e7aa7a2ed4ac2abc8ae25a
+  metadata.gz: fa51f760d8fce09fc7eddfbaf80d4069ab53b8c8
+  data.tar.gz: 115c09067901a541d4842d8fbc4489cc955511e3
 SHA512:
-  metadata.gz: fb1ed71badd8282dcb6dd48f26ab1a4d76bd06f4b46307be1f19cb1454dfc14699caada083dfd9b1bcd115ef698c81e3e6e7665688c768594b46ae67f81dfd4f
-  data.tar.gz: 41a91a6914488065fde7d33bb92447bc5d6b045ab753b3edcbec40ed959a932fad37610e003b1dfd7e327f85637dc831b3faf55677f4acfedd1aeaf0f15140aa
+  metadata.gz: 67e997065396f2fe48e9005dff78c60a8389020a52143da2d67413ba073400900f9699584aa69dc83f17df699a255d22b7a52a4c8f0edda21694254494064548
+  data.tar.gz: 22d951fb421146f9688743a50959dc114e49735ccd57e822ad106f9188f9392c29385bf9472d767281d798f1edb4d2e9a18d1feb0f1d413b51a84bc133d2e7a9

data/lib/xml/smart.rb

@@ -34,9 +34,8 @@ module Nokogiri
       def basepath
         @basepath || ''
       end
-      
+
       def xpath_fast(path)
-        ns = self.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes)
         ctx = XPathContext.new(self)
         ctx.register_namespaces(self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
         path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
@@ -47,13 +46,13 @@ module Nokogiri
         result = {}
         nsall = {}
         nsde = {}
-        
-        self.xpath('//namespace::*').each do |n| 
+
+        self.xpath('//namespace::*').each do |n|
           unless n.prefix == 'xml'
             nsde[n.href] = n.prefix if n.prefix.nil?
             nsall[n.href] = n.prefix
           end
-        end 
+        end
 
         count = -1
         nsall.each do |k,v|
@@ -68,6 +67,7 @@ module Nokogiri
         @custom_namespace_prefixes = result
       end
       def custom_namespace_prefixes
+        @custom_namespace_prefixes ||= nil
         @custom_namespace_prefixes || custom_namespace_prefixes_update
       end
       def user_custom_namespace_prefixes
@@ -86,7 +86,6 @@ module Nokogiri
         # return xpath(path,self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
         return NodeSet.new(document) unless document
 
-        ns = self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes)
         ctx = XPathContext.new(self)
         ctx.register_namespaces(self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
         path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
@@ -101,7 +100,7 @@ module Nokogiri
           name = ele.attributes['href'].value
           name = path + name if name !~ /^(https?:|ftp:|\/)/
           content = open(name,{ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read
-          insert = begin 
+          insert = begin
             Nokogiri::XML::parse(content).root # {|config| config.noblanks.noent.strict }.root
           rescue
             content
@@ -159,18 +158,18 @@ module XML
       raise Error, 'a block is mandatory' unless block_given?
       dom = io = nil
       begin
-        if name.is_a?(String) && File.exists?(name)
+        if name.is_a?(String) && File.exist?(name)
           MUTEX.synchronize do
             io = ::Kernel::open(name,'r+')
             io.flock(File::LOCK_EX)
-          end  
+          end
           dom = Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }, name
           io.rewind
-        elsif name.is_a?(String) && !File.exists?(name)
+        elsif name.is_a?(String) && !File.exist?(name)
           MUTEX.synchronize do
             io = ::Kernel::open(name,'w')
             io.flock(File::LOCK_EX)
-          end  
+          end
           dom = Smart::string(default,name)
         elsif name.is_a?(IO) || name.is_a?(Tempfile)
           MUTEX.synchronize do
@@ -203,7 +202,7 @@ module XML
       if dom && block_given?
         yield dom
         nil
-      else  
+      else
         dom
       end
     end
@@ -213,9 +212,9 @@ module XML
       raise Error, 'second parameter has to be an xml string' unless default.is_a?(String) || default.nil?
       dom = begin
         filename = nil
-        io = if name.is_a?(String) 
+        io = if name.is_a?(String)
           filename = name
-          ::Kernel::open(name) 
+          ::Kernel::open(name)
         else
           filename = name.path
           name
@@ -237,7 +236,7 @@ module XML
       if block_given?
         yield dom
         nil
-      else  
+      else
         dom
       end
     end
@@ -248,7 +247,7 @@ module XML
       if block_given?
         yield dom
         nil
-      else  
+      else
         dom
       end
     end

data/lib/xml/smart_domelement.rb

@@ -87,7 +87,6 @@ module XML
                 tnos = nos.map{|e|e.dup}
                 nos = Nokogiri::XML::NodeSet.new(nos.first.document,tnos)
               end
-                return [Nokogiri::XML::NodeSet.new(nos.first.document,tnos), true]
               return [nos, !same]
             else
               return [nos, false]
@@ -216,7 +215,7 @@ module XML
         def to_doc
           doc = Nokogiri::XML::Document.new
           doc.root = @element
-          dom = Dom.new(doc)
+          Dom.new(doc)
         end
       end
 

data/lib/xml/smart_domnamespaceset.rb

@@ -22,16 +22,16 @@ module XML
             name = name.to_s unless name.nil?
             name = nil if name =~ /^xmlns\d*$/
             nd = @node.namespace_definitions.find{|n| n.prefix == name}
-            (name.respond_to?(:to_s) || name.nil?) && nd ? Namespace.new(nd) : nil; 
-          end  
+            (name.respond_to?(:to_s) || name.nil?) && nd ? Namespace.new(nd) : nil;
+          end
         end
-        def []=(name,value) 
+        def []=(name,value)
           name = nil if name == 'xmlns'
           self.add(name,value)
         end
 
         def add(name,value)
-          if (name.respond_to?(:to_s) || name.nil?) && value.respond_to?(:to_s) 
+          if (name.respond_to?(:to_s) || name.nil?) && value.respond_to?(:to_s)
             nnod = Nokogiri::XML::Node.new(@node.name,@node.document)
             nnew = Element.new(nnod)
             nold = Element.new(@node)
@@ -39,17 +39,17 @@ module XML
               nnew.attributes[attr.qname.name] = attr.value
             end
             ns = nnod.add_namespace_definition(name.nil? ? nil : name.to_s,value.to_s)
-            @node.namespace_definitions.each do |ns|
-              nnod.add_namespace_definition(ns.prefix,ns.href)
+            @node.namespace_definitions.each do |nst|
+              nnod.add_namespace_definition(nst.prefix,nst.href)
             end
             nnew.add(nold.children)
             nold.replace_by(nnew)
             @node = nnod
-            @parent.instance_variable_set(:@element,@node) 
+            @parent.instance_variable_set(:@element,@node)
             @node.document.custom_namespace_prefixes_update
             @node.document.ns_update
             Namespace.new(ns)
-          end  
+          end
         end
 
         def length;      @node.namespace_definitions.length; end
@@ -109,7 +109,7 @@ module XML
           nold.attributes.each do |attr|
             nnew.attributes[attr.qname.name] = attr.value
           end
-          @node.namespace_definitions.each do |ns| 
+          @node.namespace_definitions.each do |ns|
             nnod.add_namespace_definition(ns.prefix,ns.href) unless block.call(Dom::smart_helper(ns))
           end
           nnew.add(nold.children)
@@ -120,8 +120,8 @@ module XML
           @node.document.ns_update
           self
         end
-      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">2015-07-28 00:28:53 +0200</name>
+    <name team="0" a="3">2016-08-09 15:37:16 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/tc_basic.rb

@@ -44,8 +44,8 @@ class TestBasic < MiniTest::Test
 
     tmp = doc.find("/test/names/test_node")[3].dump
     assert(tmp == "<test_node second=\"a\" attr=\"14\"/>" || tmp == "<test_node attr=\"14\" second=\"a\"/>")
-                                                            
-    nodes = doc.find("/test/names/test_node")                
+
+    nodes = doc.find("/test/names/test_node")
     assert(nodes.length                                      == 9)
     assert(nodes.empty?                                      == false)
     assert(nodes.delete_all!                                 == true)
@@ -57,10 +57,10 @@ class TestBasic < MiniTest::Test
     count = 0
     nodes = doc.find("/test/colors/*")
     assert(nodes.length == 3)
-    nodes.delete_if do |node|
+    nodes.delete_if do |tnode|
       count += 1
       count % 2 == 0
-    end  
+    end
     assert(nodes.length == 2)
     assert(doc.find("/test/colors/*")[0].dump == "<blue taint=\"true\">Yeah</blue>")
     assert(doc.find("/test/colors/*")[1].dump == "<green taint=\"true\"/>")

data/test/tc_concurrent.rb

@@ -19,16 +19,16 @@ class TestConcurrent < Minitest::Test
       p[i] = Thread.new do
         XML::Smart.modify(::File.dirname(__FILE__) + "/concurrent.xml","<solutions/>") do |xml|
           xml.unformated = true
-          res = xml.find("/solutions/solution[@matnr=\"#{e_matnr}\" or @secid=\"#{e_secid}\"]").delete_all! if exam
+          xml.find("/solutions/solution[@matnr=\"#{e_matnr}\" or @secid=\"#{e_secid}\"]").delete_all! if exam
           node = xml.root.add("solution",{:matnr => e_matnr, :name => e_name, :secid => e_secid, :assessment => id})
           1.upto(3) do |qbi|
             qid = qbi*2
-            ques = node.add("question", :block => qbi, :question => qid)
+            node.add("question", :block => qbi, :question => qid)
           end
 
-          result = xml.to_s 
-        end  
-      end  
+          result = xml.to_s
+        end
+      end
     end
 
     p.each do |t|
@@ -52,19 +52,19 @@ class TestConcurrent < Minitest::Test
     0.upto(nums) do |i|
       p[i] = Thread.new do
         XML::Smart.modify(::File.dirname(__FILE__) + "/concurrent.xml","<solutions/>") do |xml|
-          res = xml.find("/solutions/solution[@matnr=\"#{e_matnr}\" or @secid=\"#{e_secid}\"]").delete_all! if exam
+          xml.find("/solutions/solution[@matnr=\"#{e_matnr}\" or @secid=\"#{e_secid}\"]").delete_all! if exam
           node = xml.root.add("solution",{:matnr => e_matnr, :name => e_name, :secid => e_secid, :when => Time.now.xmlschema, :assessment => id})
           1.upto(3) do |qbi|
             qid = qbi*2
-            ques = node.add("question", :block => qbi, :question => qid)
+            node.add("question", :block => qbi, :question => qid)
           end
-        end  
-      end  
+        end
+      end
     end
 
     p.each do |t|
       t.join
-    end  
+    end
     Minitest::PerformanceReporter::end_timing
   end
 end

data/test/tc_create.rb

@@ -8,19 +8,19 @@ class TestCreate < Minitest::Test
     #
     # XML::Smart.modify(FILE,STRING) {}             ... create file if !exists?
     # XML::Smart.modify(FILE) {}                    ... just open file change and write back (LOCKTIMEOUT defaults to 7)
-    
+
     File.unlink ::File.dirname(__FILE__) + "/EXAMPLE.tmp.xml" rescue nil
     t1 = Thread.new do
       XML::Smart.modify(::File.dirname(__FILE__) + "/EXAMPLE.tmp.xml","<elements/>") { |doc|
-        node = doc.root.add("element","Thread 1")
+        doc.root.add("element","Thread 1")
         sleep 1
       }
     end
     t2 = Thread.new do
       sleep 0.5
       XML::Smart.modify(::File.dirname(__FILE__) + "/EXAMPLE.tmp.xml","<elements/>") { |doc|
-        node = doc.root.add("element","Thread 2")
-      }  
+        doc.root.add("element","Thread 2")
+      }
     end
     t1.join
     t2.join

data/test/tc_nested.rb

@@ -12,8 +12,8 @@ class TestNested < Minitest::Test
       soc.find("/root/node").each do |ele|
         ts = ele.find('text')
         if ts.any?
-          a = ts.first.to_doc
-        end  
+          ts.first.to_doc
+        end
       end
       ts = soc.find("/root/node").first
       ts.add('text','Haller')

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = "xml-smart"
-  s.version               = "0.3.18"
+  s.version               = "0.3.19"
   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.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -163,52 +163,52 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An xml library that doesn't suck - since 2004.
 test_files:
-- test/tc_xpath_attrs.rb
-- test/tc_pi.rb
-- test/tc_add.rb
-- test/tc_relaxng.rb
+- test/tc_qname.rb
 - test/tc_delete.rb
-- test/tc_copy.rb
-- test/tc_string.rb
-- test/tc_sort.rb
-- test/tc_create.rb
+- test/tc_root.rb
+- test/tc_xinclude.rb
+- test/tc_write.rb
 - test/tc_namespace_find.rb
-- test/tc_xsl.rb
+- test/tc_sort.rb
 - test/tc_nested.rb
-- test/tc_todoc.rb
-- test/tc_move_elements.rb
+- test/tc_xmlschema.rb
+- test/tc_xpath_attrs.rb
 - test/tc_namespace_default.rb
-- test/tc_root.rb
-- test/tc_xpath_functions.rb
+- test/tc_version.rb
 - test/tc_set_or_replace.rb
+- test/tc_string.rb
+- test/tc_xsl.rb
 - test/tc_concurrent.rb
-- test/tc_xmlschema.rb
-- test/tc_qname.rb
-- test/tc_write.rb
-- test/tc_xinclude.rb
-- test/tc_basic.rb
-- test/tc_xpath.rb
-- test/tc_version.rb
 - test/tc_xpath_root.rb
 - test/tc_namespace_detailed.rb
+- test/tc_copy.rb
+- test/tc_basic.rb
+- test/tc_move_elements.rb
+- test/tc_create.rb
+- test/tc_xpath.rb
+- test/tc_relaxng.rb
+- test/tc_xpath_functions.rb
+- test/tc_pi.rb
+- test/tc_add.rb
+- test/tc_todoc.rb
+- test/HELLO.xml
+- test/EXAMPLE-NS.xml
+- test/3.xml
 - test/XSL_BASE.xml
-- test/EXAMPLE.tmp.xml
 - test/1.xml
-- test/2.xml
-- test/EXAMPLE-NSE.xml
-- test/XSL_DOCUMENT.xml
-- test/3.xml
 - test/EXAMPLE.str.xml
-- test/HELLO-MORE.xml
+- test/2.xml
 - test/EXAMPLE.xml
+- test/EXAMPLE-NSE.xml
 - test/concurrent.xml
-- test/EXAMPLE-NS.xml
-- test/HELLO.xml
+- test/HELLO-MORE.xml
+- test/XSL_DOCUMENT.xml
+- test/EXAMPLE.tmp.xml
 - test/HELLO.rng
 - test/HELLO.xsd
 - test/smartrunner.rb