ox 1.2.7 → 1.2.8

data/ext/ox/cache.h

@@ -36,6 +36,7 @@
 typedef struct _Cache   *Cache;
 
 extern void     ox_cache_new(Cache *cache);
+
 extern VALUE    ox_cache_get(Cache cache, const char *key, VALUE **slot);
 
 extern void     ox_cache_print(Cache cache);

data/ext/ox/cache8.c

@@ -20,6 +20,7 @@ struct _Cache8 {
     };
 };
 
+static void     cache8_delete(Cache8 cache, int depth);
 static void     slot_print(Cache8 cache, VALUE key, unsigned int depth);
 
 void
@@ -35,6 +36,26 @@ ox_cache8_new(Cache8 *cache) {
     }
 }
 
+void
+ox_cache8_delete(Cache8 cache) {
+    cache8_delete(cache, 0);
+}
+
+static void
+cache8_delete(Cache8 cache, int depth) {
+    Cache8              *cp;
+    unsigned int        i;
+
+    for (i = 0, cp = cache->slots; i < SLOT_CNT; i++, cp++) {
+        if (0 != *cp) {
+            if (DEPTH - 1 != depth) {
+                cache8_delete(*cp, depth + 1);
+            }
+        }
+    }
+    free(cache);
+}
+
 unsigned long
 ox_cache8_get(Cache8 cache, VALUE key, unsigned long **slot) {
     Cache8      *cp;

data/ext/ox/cache8.h

@@ -36,6 +36,8 @@
 typedef struct _Cache8   *Cache8;
 
 extern void             ox_cache8_new(Cache8 *cache);
+extern void             ox_cache8_delete(Cache8 cache);
+
 extern unsigned long    ox_cache8_get(Cache8 cache, VALUE key, unsigned long **slot);
 
 extern void             ox_cache8_print(Cache8 cache);

data/ext/ox/dump.c

@@ -125,8 +125,13 @@ obj_class_code(VALUE obj) {
     case RUBY_T_FALSE:          return FalseClassCode;
     case RUBY_T_FIXNUM:         return FixnumCode;
     case RUBY_T_FLOAT:          return FloatCode;
-    case RUBY_T_STRING:         return (is_xml_friendly((u_char*)StringValuePtr(obj), (int)RSTRING_LEN(obj))) ? StringCode : Base64Code;
-    case RUBY_T_SYMBOL:         return SymbolCode;
+    case RUBY_T_STRING:         return (is_xml_friendly((u_char*)StringValuePtr(obj), (int)RSTRING_LEN(obj))) ? StringCode : String64Code;
+    case RUBY_T_SYMBOL:
+    {
+        const char      *sym = rb_id2name(SYM2ID(obj));
+
+        return (is_xml_friendly((u_char*)sym, (int)strlen(sym))) ? SymbolCode : Symbol64Code;
+    }
     case RUBY_T_DATA:           return (rb_cTime == rb_obj_class(obj)) ? TimeCode : 0;
     case RUBY_T_STRUCT:         return (rb_cRange == rb_obj_class(obj)) ? RangeCode : StructCode;
     case RUBY_T_OBJECT:         return (ox_document_clas == rb_obj_class(obj) || ox_element_clas == rb_obj_class(obj)) ? RawCode : ObjectCode;
@@ -441,9 +446,11 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         e.indent = depth * out->indent;
     }
     e.id = 0;
+    e.clas.len = 0;
+    e.clas.str = 0;    
     switch (rb_type(obj)) {
     case RUBY_T_NIL:
-        e.type = NilClassCode;  e.clas.len = 0;  e.clas.str = 0;
+        e.type = NilClassCode;
         e.closed = 1;
         out->w_start(out, &e);
         break;
@@ -452,7 +459,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             break;
         }
         cnt = (int)RARRAY_LEN(obj);
-        e.type = ArrayCode;  e.clas.len = 5;  e.clas.str = "Array";
+        e.type = ArrayCode;
         e.closed = (0 >= cnt);
         out->w_start(out, &e);
         if (!e.closed) {
@@ -471,7 +478,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             break;
         }
         cnt = (int)RHASH_SIZE(obj);
-        e.type = HashCode;  e.clas.len = 4;  e.clas.str = "Hash";
+        e.type = HashCode;
         e.closed = (0 >= cnt);
         out->w_start(out, &e);
         if (0 < cnt) {
@@ -484,24 +491,24 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         }
         break;
     case RUBY_T_TRUE:
-        e.type = TrueClassCode;  e.clas.len = 9;  e.clas.str = "TrueClass";
+        e.type = TrueClassCode;
         e.closed = 1;
         out->w_start(out, &e);
         break;
     case RUBY_T_FALSE:
-        e.type = FalseClassCode;  e.clas.len = 10;  e.clas.str = "FalseClass";
+        e.type = FalseClassCode;
         e.closed = 1;
         out->w_start(out, &e);
         break;
     case RUBY_T_FIXNUM:
-        e.type = FixnumCode;  e.clas.len = 6;  e.clas.str = "Fixnum";
+        e.type = FixnumCode;
         out->w_start(out, &e);
         dump_num(out, obj);
         e.indent = -1;
         out->w_end(out, &e);
         break;
     case RUBY_T_FLOAT:
-        e.type = FloatCode;  e.clas.len = 5;  e.clas.str = "Float";
+        e.type = FloatCode;
         cnt = sprintf(value_buf, "%0.16g", RFLOAT_VALUE(obj)); // used sprintf due to bug in snprintf
         out->w_start(out, &e);
         dump_value(out, value_buf, cnt);
@@ -518,7 +525,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         str = StringValuePtr(obj);
         cnt = (int)RSTRING_LEN(obj);
         if (is_xml_friendly((u_char*)str, cnt)) {
-            e.type = StringCode;  e.clas.len = 6;  e.clas.str = "String";
+            e.type = StringCode;
             out->w_start(out, &e);
             dump_value(out, str, cnt);
             e.indent = -1;
@@ -528,7 +535,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             char                *b64 = buf64;
             unsigned long       size = b64_size(cnt);
 
-            e.type = Base64Code;  e.clas.len = 6;  e.clas.str = "Base64";
+            e.type = String64Code;
             if (sizeof(buf64) < size) {
                 if (0 == (b64 = (char*)malloc(size + 1))) {
                     rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
@@ -549,11 +556,33 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     {
         const char      *sym = rb_id2name(SYM2ID(obj));
 
-        e.type = SymbolCode;  e.clas.len = 6;  e.clas.str = "Symbol";
-        out->w_start(out, &e);
-        dump_value(out, sym, strlen(sym));
-        e.indent = -1;
-        out->w_end(out, &e);
+        cnt = (int)strlen(sym);
+        if (is_xml_friendly((u_char*)sym, cnt)) {
+            e.type = SymbolCode;
+            out->w_start(out, &e);
+            dump_value(out, sym, cnt);
+            e.indent = -1;
+            out->w_end(out, &e);
+        } else {
+            char                buf64[4096];
+            char                *b64 = buf64;
+            unsigned long       size = b64_size(cnt);
+
+            e.type = Symbol64Code;
+            if (sizeof(buf64) < size) {
+                if (0 == (b64 = (char*)malloc(size + 1))) {
+                    rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
+                }
+            }
+            to_base64((u_char*)sym, cnt, b64);
+            out->w_start(out, &e);
+            dump_value(out, b64, size);
+            e.indent = -1;
+            out->w_end(out, &e);
+            if (buf64 != b64) {
+                free(b64);
+            }
+        }
         break;
     }
     case RUBY_T_DATA:
@@ -562,7 +591,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
 
         clas = rb_obj_class(obj);
         if (rb_cTime == clas) {
-            e.type = TimeCode;  e.clas.len = 4;  e.clas.str = "Time";
+            e.type = TimeCode;
             out->w_start(out, &e);
             out->w_time(out, obj);
             e.indent = -1;
@@ -659,7 +688,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
 
         cnt = (int)RREGEXP_SRC_LEN(obj);
 #endif
-        e.type = RegexpCode;  e.clas.len = 6;  e.clas.str = "Regexp";
+        e.type = RegexpCode;
         out->w_start(out, &e);
         if (is_xml_friendly((u_char*)s, cnt)) {
             //dump_value(out, "/", 1);
@@ -700,7 +729,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
     {
         VALUE   rs = rb_big2str(obj, 10);
         
-        e.type = BignumCode;  e.clas.len = 6;  e.clas.str = "Bignum";
+        e.type = BignumCode;
         out->w_start(out, &e);
         dump_value(out, StringValuePtr(rs), RSTRING_LEN(rs));
         e.indent = -1;
@@ -708,14 +737,14 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
         break;
     }
     case RUBY_T_COMPLEX:
-        e.type = ComplexCode;  e.clas.len = 7;  e.clas.str = "Complex";
+        e.type = ComplexCode;
         out->w_start(out, &e);
         dump_obj(0, RCOMPLEX(obj)->real, depth + 1, out);
         dump_obj(0, RCOMPLEX(obj)->imag, depth + 1, out);
         out->w_end(out, &e);
         break;
     case RUBY_T_RATIONAL:
-        e.type = RationalCode;  e.clas.len = 8;  e.clas.str = "Rational";
+        e.type = RationalCode;
         out->w_start(out, &e);
         dump_obj(0, RRATIONAL(obj)->num, depth + 1, out);
         dump_obj(0, RRATIONAL(obj)->den, depth + 1, out);
@@ -735,7 +764,7 @@ dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
             rb_raise(rb_eNotImpError, "Failed to dump %s Object (%02x)\n",
                      rb_class2name(rb_obj_class(obj)), rb_type(obj));
         } else {
-            e.type = NilClassCode;  e.clas.len = 0;  e.clas.str = 0;
+            e.type = NilClassCode;
             e.closed = 1;
             out->w_start(out, &e);
         }
@@ -938,6 +967,9 @@ dump_obj_to_xml(VALUE obj, Options copts, Out out) {
         dump_first_obj(obj, out);
     }
     dump_value(out, "\n", 1);
+    if (Yes == copts->circular) {
+        ox_cache8_delete(out->circ_cache);
+    }
 }
 
 char*

data/ext/ox/obj_load.c

@@ -416,7 +416,7 @@ add_text(PInfo pi, char *text, int closed) {
     case TimeCode:
         pi->h->obj = parse_time(text, time_class);
         break;
-    case Base64Code:
+    case String64Code:
     {
         char            buf[1024];
         char            *str = buf;
@@ -437,7 +437,31 @@ add_text(PInfo pi, char *text, int closed) {
             circ_array_set(pi->circ_array, v, (unsigned long)pi->h->obj);
         }
         pi->h->obj = v;
+        if (buf != str) {
+            free(str);
+        }
+        break;
+    }
+    case Symbol64Code:
+    {
+        VALUE           sym;
+        VALUE           *slot;
+        char            buf[1024];
+        char            *str = buf;
+        unsigned long   str_size = b64_orig_size(text);
+        
         if (sizeof(buf) <= str_size) {
+            if (0 == (str = (char*)malloc(str_size + 1))) {
+                rb_raise(rb_eNoMemError, "not enough memory\n");
+            }
+        }
+        from_base64(text, (u_char*)str);
+        if (Qundef == (sym = ox_cache_get(symbol_cache, str, &slot))) {
+            sym = ID2SYM(rb_intern(str));
+            *slot = sym;
+        }
+        pi->h->obj = sym;
+        if (buf != str) {
             free(str);
         }
         break;
@@ -531,6 +555,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     case FixnumCode:
     case FloatCode:
     case SymbolCode:
+    case Symbol64Code:
     case RegexpCode:
     case BignumCode:
     case ComplexCode:
@@ -539,7 +564,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
         // value will be read in the following add_text
         h->obj = Qundef;
         break;
-    case Base64Code:
+    case String64Code:
         h->obj = Qundef;
         if (0 != pi->circ_array) {
             pi->id = get_id_from_attrs(pi, attrs);

data/ext/ox/ox.h

@@ -100,8 +100,9 @@ typedef enum {
 typedef enum {
     NoCode         = 0,
     ArrayCode      = 'a',
-    Base64Code     = 'b',
+    String64Code   = 'b', // base64 encoded String
     ClassCode      = 'c',
+    Symbol64Code   = 'd', // base64 encoded Symbol
     FloatCode      = 'f',
     RegexpCode     = 'g',
     HashCode       = 'h',

data/lib/ox/version.rb

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

data/test/func.rb

@@ -103,6 +103,7 @@ class Func < ::Test::Unit::TestCase
 
   def test_symbol
     dump_and_load(:a_symbol, false)
+    dump_and_load(:<=, false)
   end
 
   def test_base64

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ox
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 7
-  version: 1.2.7
+  prerelease: 
+  version: 1.2.8
 platform: ruby
 authors: 
 - Peter Ohler
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +09:00
+date: 2011-08-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -51,10 +47,8 @@ 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
 - test/cache16_test.rb
 - test/cache8_test.rb
 - test/cache_test.rb
@@ -100,21 +94,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)

data/test/bug3.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '../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
-    
-  end
-end
-
-dump()