ox 1.4.5 → 1.4.6

data/README.md

@@ -26,9 +26,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.5
+### Release 1.4.6
 
- - Fixed encoding issues with all parsers so that attribute and element names can now be encoded with something other than ASCII.
+ - Adopted the Exception message encoding hack to work for the latests ruby versions.
 
 ## <a name="description">Description</a>
 

data/ext/ox/dump.c

@@ -72,6 +72,7 @@ typedef struct _Out {
     int                 indent;
     int                 depth; // used by dumpHash
     Options             opts;
+    VALUE		obj;
 } *Out;
 
 static void     dump_obj_to_xml(VALUE obj, Options copts, Out out);
@@ -435,9 +436,11 @@ dump_first_obj(VALUE obj, Out out) {
 static void
 dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     struct _Element     e;
+    VALUE		prev_obj = out->obj;
     char                value_buf[64];
     int                 cnt;
 
+    out->obj = obj;
     if (0 == aid) {
         //e.attr.str = 0;
         e.attr.len = 0;
@@ -823,20 +826,20 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         }
         break;
     }
+    out->obj = prev_obj;
 }
 
 static int
 dump_var(ID key, VALUE value, Out out) {
-    if (T_DATA == rb_type(value) && rb_cTime != rb_obj_class(value)) {
+    if (T_DATA == rb_type(value) && key == mesg_id) {
         /* There is a secret recipe that keeps Exception mesg attributes as a
-         * T_DATA until it is needed. StringValue() or a safer method of
-         * calling to_s() makes the value needed and it is converted to a
-         * regular Ruby Object. It might seem reasonable to expect that this
-         * would be done before calling the foreach callback but it isn't. A
-         * slight hack fixes the inconsistency. If the var is not something
-         * that can be represented as a String then this will fail.
+         * T_DATA until it is needed. The safe way around this hack is to call
+         * the message() method and use the returned string as the
+         * message. Not pretty but it solves the most common use of this
+         * hack. If there are others they will have to be handled one at a
+         * time.
          */
-        rb_funcall(value, to_s_id, 0);
+	value = rb_funcall(out->obj, message_id, 0);
     }
     dump_obj(key, value, out->depth, out);
 
@@ -1026,6 +1029,7 @@ dump_obj_to_xml(VALUE obj, Options copts, Out out) {
     out->circ_cache = 0;
     out->circ_cnt = 0;
     out->opts = copts;
+    out->obj = obj;
     if (Yes == copts->circular) {
         ox_cache8_new(&out->circ_cache);
     }

data/ext/ox/ox.c

@@ -62,6 +62,8 @@ ID      inspect_id;
 ID      instruct_id;
 ID      keys_id;
 ID      local_id;
+ID      mesg_id;
+ID      message_id;
 ID      nodes_id;
 ID      num_id;
 ID      parse_id;
@@ -653,6 +655,8 @@ void Init_ox() {
     instruct_id = rb_intern("instruct");
     keys_id = rb_intern("keys");
     local_id = rb_intern("local");
+    mesg_id = rb_intern("mesg");
+    message_id = rb_intern("message");
     nodes_id = rb_intern("@nodes");
     num_id = rb_intern("@num");
     parse_id = rb_intern("parse");

data/ext/ox/ox.h

@@ -233,6 +233,8 @@ extern ID       inspect_id;
 extern ID       instruct_id;
 extern ID       keys_id;
 extern ID       local_id;
+extern ID       mesg_id;
+extern ID       message_id;
 extern ID       nodes_id;
 extern ID       num_id;
 extern ID       parse_id;

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies: []
 description: ! "A fast XML parser and object serializer that uses only standard C
   lib.\n            \nOptimized XML (Ox), as the name implies was written to provide