xml-smart 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fffa4518ad68d20fdc2381150cf1f4fa46db4ee
-  data.tar.gz: fcbb8255ce7608914eb9e7e099e53cecb4b436b5
+  metadata.gz: be39705fa3c69647ef581c26f96bc40df8073474
+  data.tar.gz: daf048cf47a87e78342788896a3844fb6f8f22b3
 SHA512:
-  metadata.gz: b26670924bfb214004dd18279929e2775d84525441cab41833c47c1316fccf0e3d9e42f14cdd24c3948413bf38ddacdf0c7ed47d81d8b4f6dcc281ed272fb1a8
-  data.tar.gz: f7ae7468bccd4692b79ffb3e7a71b020bd9ced789452346252094d902c858207782ddb9768f9841730e7f92623686c4b336607adedb20a0c23996564cff19bd4
+  metadata.gz: 2288bb3cd7925f304dc175890c0eccc3637fcd51feff4692e04774f731bc98eae2535d30056cfe83c51ab711b48c2cdd36ca6c2e2b03afc9346a459e0c484c64
+  data.tar.gz: 7d72f428e5393033c3c353625fcebb56d6fab8f14144e49d06e43eb12101f80f35c137f177002a5341fd322378b270271e43205b8b3b9984bfcb614752ae62ff

data/lib/xml/smart.rb

@@ -36,35 +36,26 @@ module Nokogiri
 
       def custom_namespace_prefixes_update
         result = {}
-
-        diffs = []
-        self.xpath('//namespace::*')
-        ns = self.xpath('//namespace::*').to_a.delete_if do |n| 
-          if diffs.include? n.href
-            true
-          else  
-            diffs.push(n.href).uniq!
-            false
-          end  
+        nsall = {}
+        nsde = {}
+        
+        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 
 
-        de = ns.find_all{|n| n.prefix.nil?}
-        if de.length == 1
-          result['xmlns'] = de[0].href
-        end
-        if de.length > 1
-          i = 0
-          de.each do |n|
-            unless result.has_value? n.href
-              result["xmlns#{i}"] = n.href
-              i += 1
-            end  
+        count = -1
+        nsall.each do |k,v|
+          if v.nil? && nsde.length == 1
+            result['xmlns'] = k
+          elsif v.nil? && nsde.length > 1
+            result["xmlns#{count+=1}"] = k
+          else
+            result[v] = k
           end
         end
-
-        ns.find_all{|n| !n.prefix.nil? && !(n.prefix == 'xml')}.each do |n|
-          result[n.prefix] = n.href
-        end
         @custom_namespace_prefixes = result
       end
       def custom_namespace_prefixes

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">2014-09-05 02:20:31 +0200</name>
+    <name team="0" a="3">2015-03-13 11:04:34 +0100</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/tc_create.rb

@@ -13,11 +13,11 @@ class TestCreate < Minitest::Test
     t1 = Thread.new do
       XML::Smart.modify(::File.dirname(__FILE__) + "/EXAMPLE.tmp.xml","<elements/>") { |doc|
         node = doc.root.add("element","Thread 1")
+        sleep 1
       }
-      sleep 1
     end
     t2 = Thread.new do
-      Thread.pass
+      sleep 0.5
       XML::Smart.modify(::File.dirname(__FILE__) + "/EXAMPLE.tmp.xml","<elements/>") { |doc|
         node = doc.root.add("element","Thread 2")
       }  

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = "xml-smart"
-  s.version               = "0.3.11"
+  s.version               = "0.3.12"
   s.platform              = Gem::Platform::RUBY
   s.license               = "LGPL-3"
   s.summary               = "An xml library that doesn't suck - since 2004."
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=1.9.3'
 
-  s.add_runtime_dependency 'nokogiri'
-  s.add_runtime_dependency 'term-ansicolor'
-  s.add_runtime_dependency 'minitest', '>= 5.0.0'
+  s.add_runtime_dependency 'nokogiri', '~> 1', '>= 1.6.6'
+  s.add_runtime_dependency 'term-ansicolor', '~> 1', '>= 1.3'
+  s.add_runtime_dependency 'minitest', '~> 5', '>= 5.0.0'
 end

metadata

@@ -1,47 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -49,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -60,71 +78,71 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- lib/xml/smart_domattributeset.rb
+- AUTHORS
+- COPYING
+- README.rdoc
+- Rakefile
+- example/EXAMPLE.xml
+- example/xpath_visual.rb
+- lib/xml/XSDtoRNG.xsl
+- lib/xml/smart.rb
+- lib/xml/smart_dom.rb
 - lib/xml/smart_domattribute.rb
-- lib/xml/smart_domother.rb
+- lib/xml/smart_domattributeset.rb
 - lib/xml/smart_domelement.rb
-- lib/xml/smart_domtext.rb
 - lib/xml/smart_domnamespace.rb
-- lib/xml/smart_domnodeset.rb
-- lib/xml/smart.rb
-- lib/xml/XSDtoRNG.xsl
-- lib/xml/smart_dom.rb
 - lib/xml/smart_domnamespaceset.rb
-- lib/xml/smart_qname.rb
+- lib/xml/smart_domnodeset.rb
+- lib/xml/smart_domother.rb
+- lib/xml/smart_domtext.rb
 - lib/xml/smart_processinginstruction.rb
-- example/EXAMPLE.xml
-- example/xpath_visual.rb
-- COPYING
-- Rakefile
-- xml-smart.gemspec
-- README.rdoc
-- AUTHORS
-- test/tc_xpath_attrs.rb
-- test/tc_pi.rb
+- lib/xml/smart_qname.rb
+- minitest/performancereporter_plugin.rb
+- test/1.xml
+- test/2.xml
+- test/3.xml
+- test/EXAMPLE-NS.xml
+- test/EXAMPLE-NSE.xml
+- test/EXAMPLE.str.xml
+- test/EXAMPLE.tmp.xml
+- test/EXAMPLE.xml
+- test/HELLO-MORE.xml
+- test/HELLO.rng
+- test/HELLO.xml
+- test/HELLO.xsd
+- test/XSL_BASE.xml
+- test/XSL_DOCUMENT.xml
+- test/concurrent.xml
+- test/smartrunner.rb
 - test/tc_add.rb
-- test/tc_relaxng.rb
-- test/tc_delete.rb
+- test/tc_basic.rb
+- test/tc_concurrent.rb
 - test/tc_copy.rb
-- test/tc_string.rb
-- test/tc_sort.rb
 - test/tc_create.rb
-- test/tc_namespace_find.rb
-- test/tc_xsl.rb
-- test/tc_nested.rb
-- test/tc_todoc.rb
+- test/tc_delete.rb
 - test/tc_move_elements.rb
 - test/tc_namespace_default.rb
+- test/tc_namespace_detailed.rb
+- test/tc_namespace_find.rb
+- test/tc_nested.rb
+- test/tc_pi.rb
+- test/tc_qname.rb
+- test/tc_relaxng.rb
 - test/tc_root.rb
-- test/tc_xpath_functions.rb
 - test/tc_set_or_replace.rb
-- test/tc_concurrent.rb
-- test/tc_xmlschema.rb
-- test/tc_qname.rb
+- test/tc_sort.rb
+- test/tc_string.rb
+- test/tc_todoc.rb
+- test/tc_version.rb
 - test/tc_write.rb
 - test/tc_xinclude.rb
-- test/tc_basic.rb
+- test/tc_xmlschema.rb
 - test/tc_xpath.rb
-- test/tc_version.rb
+- test/tc_xpath_attrs.rb
+- test/tc_xpath_functions.rb
 - test/tc_xpath_root.rb
-- test/tc_namespace_detailed.rb
-- 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/EXAMPLE.xml
-- test/concurrent.xml
-- test/EXAMPLE-NS.xml
-- test/HELLO.xml
-- test/HELLO.rng
-- test/HELLO.xsd
-- test/smartrunner.rb
-- minitest/performancereporter_plugin.rb
+- test/tc_xsl.rb
+- xml-smart.gemspec
 homepage: http://www.wst.univie.ac.at/~mangler/xml-smart/
 licenses:
 - LGPL-3
@@ -145,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An xml library that doesn't suck - since 2004.