ox 1.2.9 → 1.2.10

data/ext/ox/dump.c

@@ -447,7 +447,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     }
     e.id = 0;
     e.clas.len = 0;
-    e.clas.str = 0;    
+    e.clas.str = 0;
     switch (rb_type(obj)) {
     case RUBY_T_NIL:
         e.type = NilClassCode;
@@ -598,8 +598,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             out->w_end(out, &e);
         } else {
             if (StrictEffort == out->opts->effort) {
-                rb_raise(rb_eNotImpError, "Failed to dump RUBY_T_DATA %s Object (%02x)\n",
-                         rb_class2name(clas), rb_type(obj));
+                rb_raise(rb_eNotImpError, "Failed to dump RUBY_T_DATA %s\n", rb_class2name(clas));
             } else {
                 e.type = NilClassCode;
                 e.closed = 1;
@@ -673,7 +672,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             out->w_start(out, &e);
             if (0 < cnt) {
                 unsigned int        od = out->depth;
-            
+
                 out->depth = depth + 1;
                 rb_ivar_foreach(obj, dump_var, (VALUE)out);
                 out->depth = od;
@@ -781,8 +780,19 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
 
 static int
 dump_var(ID key, VALUE value, Out out) {
+    if (RUBY_T_DATA == rb_type(value) && rb_cTime != rb_obj_class(value)) {
+        /* There is a secret recipe that keeps Exception mesg attributes as a
+         * T_DATA until it is needed. StringValue() 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.
+         */
+        StringValue(value);
+    }
     dump_obj(key, value, out->depth, out);
-    
+
     return ST_CONTINUE;
 }
 

data/lib/ox/version.rb

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

data/test/bug3.rb

@@ -3,21 +3,19 @@
 $: << '../lib'
 $: << '../ext'
 
-if __FILE__ == $0
-  if (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
 require 'ox'
 
-def dump(cnt = 100000)
-  cnt.times do |i|
-    xml = Ox.dump([:inc, 1])
-    #puts xml
-    
+def name_it()
+  begin
+    "x".foo
+  rescue Exception => e
+    #puts e.message
+    xml = Ox.dump(e, effort: :tolerant)
+    puts xml
+    o = Ox.load(xml, mode: :object)
+    puts o.message
+    puts Ox.dump(e)
   end
 end
 
-dump()
+name_it()

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ox
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 9
-  version: 1.2.9
+  prerelease: 
+  version: 1.2.10
 platform: ruby
 authors: 
 - Peter Ohler
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +09:00
+date: 2011-08-29 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +47,6 @@ files:
 - ext/ox/obj_load.c
 - ext/ox/ox.c
 - ext/ox/parse.c
-- test/big.rb
 - test/bug1.rb
 - test/bug2.rb
 - test/bug3.rb
@@ -100,21 +95,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ox
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.

data/test/big.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '../lib'
-$: << '../ext'
-
-if __FILE__ == $0
-  while (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
-require 'ox'
-
-def dump(cnt = 10000)
-  h = { }
-  cnt.times do |i|
-    h[i] = [i * 2, "this is #{i}"]
-  end
-  xml = Ox.dump(h)
-  puts "size: #{xml.size}"
-end
-
-dump(200000)