xmlhash 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.2 / 2012-11-06
+
+* elements that have both attributes and content, are now parsed
+  as { "attr" => "value", "_content" => "CONTENT" }
+
 === 1.3.1 / 2012-10-08
 
 * fix manifest

data/ext/xmlhash/xmlhash.c

@@ -55,7 +55,7 @@ void xml_hash_end_element(const xmlChar *name)
   chash = rb_ary_entry(pair, 1);
   assert(!strcmp((const char*)name, RSTRING_PTR(cname)));
 
-  if (rb_obj_is_kind_of(chash, rb_cHash) && RHASH_SIZE(chash) == 0) {
+  if (rb_obj_is_kind_of(chash, rb_cHash)) {
     VALUE string;
     const char *string_ptr;
     long string_len;
@@ -72,9 +72,15 @@ void xml_hash_end_element(const xmlChar *name)
       string_len--;
     }
     /* avoid overwriting empty hash with empty string */
-    if (string_len > 0)
-      chash = string;
+    if (string_len > 0) {
+      if (RHASH_SIZE(chash) == 0)
+	chash = string;
+      else {
+	rb_hash_aset(chash, rb_str_new2("_content"), string);
+      }
+    }
   }
+  rb_ary_clear(m_cstring);
   if (RARRAY_LEN(m_stack) == 0) {
     m_result = chash;
     return;

data/lib/xmlhash.rb

@@ -1,7 +1,7 @@
 require 'xmlhash/xmlhash'
 
 module Xmlhash
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
   class XMLHash < Hash
     

data/test/test_xmlhash.rb

@@ -107,4 +107,15 @@ eos
      assert_equal ret.get("value"), "Adrian Schröter"
   end
 
+  def test_cdata
+    xml = <<eos
+<sourcediff key="7ebf6606bf56a9f952dda73f0d861738">
+   <new name="myfile" md5="299d8fe34c516b078c3d367e3fb460b9" size="12"/>
+    <diff lines="1">DummyContent</diff>
+</sourcediff>
+eos
+
+    ret = Xmlhash.parse(xml)
+    assert_equal ret['diff'], {"lines" => "1", "_content" => "DummyContent" }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlhash
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config