xmlhash 1.3.5 → 1.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 57b370bdc50c90e41133a4e21022f8fd6b5f5fc1
+  data.tar.gz: b834afbf06b454a31617d5f4e798d5f15f11a2f1
+SHA512:
+  metadata.gz: 807cf8ecd2ad560ed1d302f5b4276acca584a9a85ac16bf12d8ef2b2464f78fd9e7e1379d7c351c190162d4a83c317a8dc91f994e7d43e5296d8a82b9dcf7893
+  data.tar.gz: 163da7fe46fd438db9200e113f57a75f37cc6ecad11ebefdfe3401626a49f3822e38d68725350fc30ad947899cc79aa82c3aff0da73fe7fbc78b99f85b03509b

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.6 / 2013-09-11
+
+* Wrap libxml2 parsing in a synchronize block - otherwise the stacking
+  will not work and it's too much work to make it reentrant
+
 === 1.3.5 / 2012-12-21 ("final edition")
 
 * Initialize result so we don't return something random in case of parse error

data/Rakefile

@@ -7,6 +7,7 @@ require 'rake/extensiontask'
 Hoe.spec 'xmlhash' do
   developer('Stephan Kulow', 'coolo@suse.com')
   self.readme_file = 'README.txt'
+  self.license('MIT')
   self.spec_extras = { :extensions => ["ext/xmlhash/extconf.rb"] }
   self.extra_dev_deps << ['rake-compiler', '>= 0']
   self.extra_deps << ['pkg-config']

data/ext/xmlhash/xmlhash.c

@@ -238,7 +238,7 @@ void Init_xmlhash()
   LIBXML_TEST_VERSION
   mXmlhash = rb_define_module("Xmlhash");
   m_xmlClass = rb_define_class_under(mXmlhash, "XMLHash", rb_cHash);
-  rb_define_singleton_method(mXmlhash, "parse", &parse_xml_hash, 1);
+  rb_define_singleton_method(mXmlhash, "parse_int", &parse_xml_hash, 1);
   m_stack = rb_ary_new();
   rb_global_variable(&m_stack);
   m_cstring = rb_ary_new();

data/lib/xmlhash.rb

@@ -1,7 +1,7 @@
 require 'xmlhash/xmlhash'
 
 module Xmlhash
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
   class XMLHash < Hash
     
@@ -61,5 +61,12 @@ module Xmlhash
     def inspect
       "X(#{super})"
     end
+
+  end
+
+  def self.parse(str)
+    @@mutex ||= Mutex.new
+    @@mutex.synchronize { parse_int(str) }
   end
-end 
+
+end

data/test/test_xmlhash.rb

@@ -4,9 +4,7 @@ require "test/unit"
 require "xmlhash"
 require 'json'
 
-class TestXmlhash < Test::Unit::TestCase
-  def test_xml
-    xml = <<eos
+Xml = <<eos
 <request id="93651">
   <action type="submit">
     <source project="server:dns" package="pdns" rev="65"/>
@@ -16,28 +14,7 @@ class TestXmlhash < Test::Unit::TestCase
     <comment/>
   </state>
   <review state="accepted" by_group="legal-auto" who="licensedigger" when="2011-11-25T15:09:55">
-    <comment>{"approve": "preliminary, version number changed"} &lt;!-- {
-  "dest": {
-    "ldb": {
-      "review": "done", 
-      "rpm_license": "GPLv2+", 
-      "status": "production", 
-      "version": "3.0.rc1"
-    }, 
-    "license": "GPLv2+", 
-    "version": "2.9.22"
-  }, 
-  "hint": [
-    "src('3.0') and dest('2.9.22') version numbers differ"
-  ], 
-  "plugin": "0.35", 
-  "src": {
-    "auto-co": "/api.opensuse.org/server:dns/pdns%3.0%r65", 
-    "license": "GPLv2+", 
-    "rev": "65", 
-    "version": "3.0"
-  }
-} --&gt;</comment>
+    <comment>Big comment</comment>
   </review>
   <review state="new" by_group="factory-auto"/>
   <history name="review" who="coolo" when="2011-11-25T15:02:53"/>
@@ -48,30 +25,54 @@ class TestXmlhash < Test::Unit::TestCase
 </request>
 eos
 
-    rubyoutput =  {"history"=> 
-      [ {"name"=>"review", "when"=>"2011-11-25T15:02:53", "who"=>"coolo"}, 
-        {"comment"=>"please make sure to wait before these depencencies are in openSUSE:Factory: libopendbx-devel, libopendbx1, libopendbxplus1, opendbx-backend-pgsql", 
-          "name"=>"declined", "when"=>"2011-11-25T16:17:30", "who"=>"coolo"}
-      ], 
-      "review"=> 
-      [
-       {"comment"=>"{\"approve\": \"preliminary, version number changed\"} <!-- {\n  \"dest\": {\n    \"ldb\": {\n      \"review\": \"done\", \n      \"rpm_license\": \"GPLv2+\", \n      \"status\": \"production\", \n      \"version\": \"3.0.rc1\"\n    }, \n    \"license\": \"GPLv2+\", \n    \"version\": \"2.9.22\"\n  }, \n  \"hint\": [\n    \"src('3.0') and dest('2.9.22') version numbers differ\"\n  ], \n  \"plugin\": \"0.35\", \n  \"src\": {\n    \"auto-co\": \"/api.opensuse.org/server:dns/pdns%3.0%r65\", \n    \"license\": \"GPLv2+\", \n    \"rev\": \"65\", \n    \"version\": \"3.0\"\n  }\n} -->", "by_group"=>"legal-auto", "when"=>"2011-11-25T15:09:55", "who"=>"licensedigger", "state"=>"accepted"}, {"by_group"=>"factory-auto", "state"=>"new"}], "action"=>{"type"=>"submit", "target"=>{"project"=>"openSUSE:Factory", "package"=>"pdns"}, "source"=>{"rev"=>"65", "project"=>"server:dns", "package"=>"pdns"}}, "id"=>"93651", "description"=>"update and factory fix (forwarded request 86230 from -miska-)", "state"=>{"comment"=>{}, "name"=>"revoked", "when"=>"2011-12-19T13:20:50", "who"=>"coolo"}}
+Output = {"history" =>
+              [{"name" => "review", "when" => "2011-11-25T15:02:53", "who" => "coolo"},
+               {"comment" => "please make sure to wait before these depencencies are in openSUSE:Factory: libopendbx-devel, libopendbx1, libopendbxplus1, opendbx-backend-pgsql",
+                "name" => "declined", "when" => "2011-11-25T16:17:30", "who" => "coolo"}
+              ],
+          "review" =>
+              [
+                  {"comment" => "Big comment",
+                   "by_group" => "legal-auto",
+                   "when" => "2011-11-25T15:09:55",
+                   "who" => "licensedigger",
+                   "state" => "accepted"
+                  },
+                  {"by_group" => "factory-auto",
+                   "state" => "new"}
+              ], "action" => {"type" => "submit", "target" => {"project" => "openSUSE:Factory", "package" => "pdns"}, "source" => {"rev" => "65", "project" => "server:dns", "package" => "pdns"}}, "id" => "93651", "description" => "update and factory fix (forwarded request 86230 from -miska-)", "state" => {"comment" => {}, "name" => "revoked", "when" => "2011-12-19T13:20:50", "who" => "coolo"}}
+
+
+class TestXmlhash < Test::Unit::TestCase
+  def test_xml
+
 
     1000.times {
-      ret = Xmlhash.parse(xml)
+      ret = Xmlhash.parse(Xml)
       GC.start
-      assert_equal ret, rubyoutput
+      assert_equal ret, Output
     }
- 
+
     10000.times {
-      ret = Xmlhash.parse(xml)
-      assert_equal ret, rubyoutput
-     }
+      ret = Xmlhash.parse(Xml)
+      assert_equal ret, Output
+    }
+
+  end
 
+  def test_threading
+    10.times do
+      Thread.new do
+        100.times do
+          ret = Xmlhash.parse(Xml)
+          assert_equal ret, Output
+        end
+      end
+    end
   end
 
   def test_entry
-      xml = <<eos
+    xml = <<eos
 <?xml version='1.0' encoding='UTF-8'?>
 <directory count="4">
    <entry name="Apache"/>
@@ -82,12 +83,12 @@ eos
 eos
 
     rubyoutput = {"count" => "4",
-      "entry"=>
-      [{"name"=>"Apache"},
-       {"name"=>"Apache:APR_Pool_Debug"},
-       {"name"=>"Apache:MirrorBrain"},
-       {"name"=>"Apache:Modules"}]}
-    
+                  "entry" =>
+                      [{"name" => "Apache"},
+                       {"name" => "Apache:APR_Pool_Debug"},
+                       {"name" => "Apache:MirrorBrain"},
+                       {"name" => "Apache:Modules"}]}
+
     ret = Xmlhash.parse(xml)
     assert_equal ret, rubyoutput
 
@@ -96,16 +97,16 @@ eos
   end
 
   def test_encoding
-     xml = "<?xml version='1.0' encoding='UTF-8'?><name>Adrian Schröter</name>"
+    xml = "<?xml version='1.0' encoding='UTF-8'?><name>Adrian Schröter</name>"
 
-     ret = Xmlhash.parse(xml)
-     assert_equal ret, "Adrian Schröter"
+    ret = Xmlhash.parse(xml)
+    assert_equal ret, "Adrian Schröter"
 
-     xml = "<?xml version='1.0' encoding='UTF-8'?><name value='Adrian Schröter'/>"
-     ret = Xmlhash.parse(xml)
-     assert_equal ret, {"value"=>"Adrian Schröter"}
+    xml = "<?xml version='1.0' encoding='UTF-8'?><name value='Adrian Schröter'/>"
+    ret = Xmlhash.parse(xml)
+    assert_equal ret, {"value" => "Adrian Schröter"}
 
-     assert_equal ret.get("value"), "Adrian Schröter"
+    assert_equal ret.get("value"), "Adrian Schröter"
   end
 
   def test_cdata
@@ -117,7 +118,7 @@ eos
 eos
 
     ret = Xmlhash.parse(xml)
-    assert_equal ret['diff'], {"lines" => "1", "_content" => "DummyContent" }
+    assert_equal ret['diff'], {"lines" => "1", "_content" => "DummyContent"}
   end
 
   def test_empty
@@ -133,7 +134,7 @@ eos
   end
 
   def test_utf8
-     xml = '<package name="libconfig" project="home:coolo">
+    xml = '<package name="libconfig" project="home:coolo">
   <title>libconfig &#8211; C/C++ Configuration File Library</title>
   <description>Libconfig is a simple library for processing structured configuration files, like this one: test.cfg. This file format is more compact and more readable than XML. And unlike XML, it is type-aware, so it is not necessary to do string parsing in application code.
 
@@ -154,7 +155,7 @@ The library includes bindings for both the C and C++ languages. It works on POSI
     xml.encode!('ISO-8859-1')
     xh = Xmlhash.parse(xml)
     assert_equal "ISO-8859-1", xh['title'].encoding.to_s
-    
+
     xml = '<?xml version="1.0" encoding="ISO-8859-1"?>
     <package><title>&#228;&#211;&#254;</title></package>'
     xml.encode!('US-ASCII')

metadata

@@ -1,83 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: xmlhash
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors:
 - Stephan Kulow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
-description: ! 'A small C module that wraps libxml2''s xmlreader to parse a XML
-
-  string into a ruby hash'
+        version: '3.7'
+description: |-
+  A small C module that wraps libxml2's xmlreader to parse a XML
+  string into a ruby hash
 email:
 - coolo@suse.com
 executables: []
@@ -101,7 +92,9 @@ files:
 - test/test_xmlhash.rb
 - .gemtest
 homepage: https://github.com/coolo/xmlhash
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -109,22 +102,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: xmlhash
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small C module that wraps libxml2's xmlreader to parse a XML string into
   a ruby hash
 test_files: