ox 1.4.6 → 1.5.0

data/ext/ox/ox.h

@@ -59,7 +59,7 @@ extern "C" {
 #define NO_RSTRUCT 1
 #endif
 
-#define raise_error(msg, xml, current) _raise_error(msg, xml, current, __FILE__, __LINE__)
+#define raise_error(msg, xml, current) _ox_raise_error(msg, xml, current, __FILE__, __LINE__)
 
 #define MAX_TEXT_LEN    4096
 #define MAX_ATTRS       1024
@@ -204,58 +204,56 @@ typedef struct _Options {
     char        effort;         // Effort
 } *Options;
 
-extern VALUE    parse(char *xml, ParseCallbacks pcb, char **endp, int trace, Effort effort);
-extern void     _raise_error(const char *msg, const char *xml, const char *current, const char* file, int line);
+extern VALUE	ox_parse(char *xml, ParseCallbacks pcb, char **endp, int trace, Effort effort);
+extern void	_ox_raise_error(const char *msg, const char *xml, const char *current, const char* file, int line);
 
-extern void     ox_sax_parse(VALUE handler, VALUE io, int convert);
+extern void	ox_sax_parse(VALUE handler, VALUE io, int convert);
 
-extern char*    write_obj_to_str(VALUE obj, Options copts);
-extern void     write_obj_to_file(VALUE obj, const char *path, Options copts);
+extern char*	ox_write_obj_to_str(VALUE obj, Options copts);
+extern void	ox_write_obj_to_file(VALUE obj, const char *path, Options copts);
 
-extern struct _Options  default_options;
+extern struct _Options  ox_default_options;
 
 extern VALUE    Ox;
 
-extern ID       at_id;
-extern ID       attr_id;
-extern ID       attributes_id;
-extern ID       beg_id;
-extern ID       cdata_id;
-extern ID       comment_id;
-extern ID       den_id;
-extern ID       doctype_id;
-extern ID       end_element_id;
-extern ID       end_id;
-extern ID       error_id;
-extern ID       excl_id;
-extern ID       fileno_id;
-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;
-extern ID       read_id;
-extern ID       readpartial_id;
-extern ID       start_element_id;
-extern ID       text_id;
-extern ID       to_c_id;
-extern ID       to_s_id;
-extern ID       to_sym_id;
-extern ID       tv_sec_id;
-extern ID       tv_usec_id;
-extern ID       value_id;
-
-extern VALUE    empty_string;
-extern VALUE    encoding_sym;
-extern VALUE    standalone_sym;
-extern VALUE    struct_class;
-extern VALUE    time_class;
-extern VALUE    version_sym;
-extern VALUE    zero_fixnum;
+extern ID	ox_at_id;
+extern ID	ox_attr_id;
+extern ID	ox_attributes_id;
+extern ID	ox_beg_id;
+extern ID	ox_cdata_id;
+extern ID	ox_comment_id;
+extern ID	ox_den_id;
+extern ID	ox_doctype_id;
+extern ID	ox_end_element_id;
+extern ID	ox_end_id;
+extern ID	ox_error_id;
+extern ID	ox_excl_id;
+extern ID	ox_fileno_id;
+extern ID	ox_inspect_id;
+extern ID	ox_instruct_id;
+extern ID	ox_keys_id;
+extern ID	ox_local_id;
+extern ID	ox_mesg_id;
+extern ID	ox_message_id;
+extern ID	ox_nodes_id;
+extern ID	ox_num_id;
+extern ID	ox_parse_id;
+extern ID	ox_read_id;
+extern ID	ox_readpartial_id;
+extern ID	ox_start_element_id;
+extern ID	ox_text_id;
+extern ID	ox_to_c_id;
+extern ID	ox_to_s_id;
+extern ID	ox_to_sym_id;
+extern ID	ox_tv_sec_id;
+extern ID	ox_tv_usec_id;
+extern ID	ox_value_id;
+
+extern VALUE    ox_empty_string;
+extern VALUE    ox_encoding_sym;
+extern VALUE    ox_struct_class;
+extern VALUE    ox_time_class;
+extern VALUE    ox_zero_fixnum;
 
 extern VALUE    ox_document_clas;
 extern VALUE    ox_element_clas;
@@ -264,9 +262,9 @@ extern VALUE    ox_comment_clas;
 extern VALUE    ox_doctype_clas;
 extern VALUE    ox_cdata_clas;
 
-extern Cache    symbol_cache;
-extern Cache    class_cache;
-extern Cache    attr_cache;
+extern Cache    ox_symbol_cache;
+extern Cache    ox_class_cache;
+extern Cache    ox_attr_cache;
 
 #if defined(__cplusplus)
 #if 0

data/ext/ox/parse.c

@@ -96,7 +96,7 @@ next_white(PInfo pi) {
 }
 
 VALUE
-parse(char *xml, ParseCallbacks pcb, char **endp, int trace, Effort effort) {
+ox_parse(char *xml, ParseCallbacks pcb, char **endp, int trace, Effort effort) {
     struct _PInfo	pi;
     int			body_read = 0;
 

data/ext/ox/sax.c

@@ -174,13 +174,13 @@ str2sym(const char *str, SaxDrive dr) {
     VALUE       *slot;
     VALUE       sym;
 
-    if (Qundef == (sym = ox_cache_get(symbol_cache, str, &slot))) {
+    if (Qundef == (sym = ox_cache_get(ox_symbol_cache, str, &slot))) {
 #ifdef HAVE_RUBY_ENCODING_H
         if (0 != dr->encoding) {
 	    VALUE	rstr = rb_str_new2(str);
 
             rb_enc_associate(rstr, dr->encoding);
-	    sym = rb_funcall(rstr, to_sym_id, 0);
+	    sym = rb_funcall(rstr, ox_to_sym_id, 0);
         } else {
 	    sym = ID2SYM(rb_intern(str));
 	}
@@ -216,20 +216,20 @@ ox_sax_parse(VALUE handler, VALUE io, int convert) {
 
 static void
 sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, int convert) {
-    if (rb_respond_to(io, readpartial_id)) {
+    if (rb_respond_to(io, ox_readpartial_id)) {
         VALUE   rfd;
 
-        if (rb_respond_to(io, fileno_id) && Qnil != (rfd = rb_funcall(io, fileno_id, 0))) {
+        if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
             dr->read_func = read_from_fd;
             dr->fd = FIX2INT(rfd);
         } else {
             dr->read_func = read_from_io_partial;
             dr->io = io;
         }
-    } else if (rb_respond_to(io, read_id)) {
+    } else if (rb_respond_to(io, ox_read_id)) {
         VALUE   rfd;
 
-        if (rb_respond_to(io, fileno_id) && Qnil != (rfd = rb_funcall(io, fileno_id, 0))) {
+        if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
             dr->read_func = read_from_fd;
             dr->fd = FIX2INT(rfd);
         } else {
@@ -249,20 +249,20 @@ sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, int convert) {
     dr->col = 0;
     dr->handler = handler;
     dr->convert_special = convert;
-    dr->has_instruct = rb_respond_to(handler, instruct_id);
-    dr->has_attr = rb_respond_to(handler, attr_id);
-    dr->has_doctype = rb_respond_to(handler, doctype_id);
-    dr->has_comment = rb_respond_to(handler, comment_id);
-    dr->has_cdata = rb_respond_to(handler, cdata_id);
-    dr->has_text = rb_respond_to(handler, text_id);
-    dr->has_start_element = rb_respond_to(handler, start_element_id);
-    dr->has_end_element = rb_respond_to(handler, end_element_id);
-    dr->has_error = rb_respond_to(handler, error_id);
+    dr->has_instruct = rb_respond_to(handler, ox_instruct_id);
+    dr->has_attr = rb_respond_to(handler, ox_attr_id);
+    dr->has_doctype = rb_respond_to(handler, ox_doctype_id);
+    dr->has_comment = rb_respond_to(handler, ox_comment_id);
+    dr->has_cdata = rb_respond_to(handler, ox_cdata_id);
+    dr->has_text = rb_respond_to(handler, ox_text_id);
+    dr->has_start_element = rb_respond_to(handler, ox_start_element_id);
+    dr->has_end_element = rb_respond_to(handler, ox_end_element_id);
+    dr->has_error = rb_respond_to(handler, ox_error_id);
 #ifdef HAVE_RUBY_ENCODING_H
-    if ('\0' == *default_options.encoding) {
+    if ('\0' == *ox_default_options.encoding) {
         dr->encoding = 0;
     } else {
-        dr->encoding = rb_enc_find(default_options.encoding);
+        dr->encoding = rb_enc_find(ox_default_options.encoding);
     }
 #endif
 }
@@ -329,7 +329,7 @@ sax_drive_error(SaxDrive dr, const char *msg, int critical) {
         args[0] = rb_str_new2(msg);
         args[1] = INT2FIX(dr->line);
         args[2] = INT2FIX(dr->col);
-        rb_funcall2(dr->handler, error_id, 3, args);
+        rb_funcall2(dr->handler, ox_error_id, 3, args);
     } else if (critical) {
         sax_drive_cleanup(dr);
         rb_raise(rb_eSyntaxError, "%s at line %d, column %d\n", msg, dr->line, dr->col);
@@ -438,7 +438,7 @@ read_instruction(SaxDrive dr) {
         VALUE       args[1];
 
         args[0] = rb_str_new2(dr->str);
-        rb_funcall2(dr->handler, instruct_id, 1, args);
+        rb_funcall2(dr->handler, ox_instruct_id, 1, args);
     }
     if (0 != read_attrs(dr, c, '?', '?', (0 == strcmp("xml", dr->str)))) {
         return -1;
@@ -471,7 +471,7 @@ read_doctype(SaxDrive dr) {
         VALUE       args[1];
 
         args[0] = rb_str_new2(dr->str);
-        rb_funcall2(dr->handler, doctype_id, 1, args);
+        rb_funcall2(dr->handler, ox_doctype_id, 1, args);
     }
     dr->str = 0;
 
@@ -513,7 +513,7 @@ read_cdata(SaxDrive dr) {
             rb_enc_associate(args[0], dr->encoding);
         }
 #endif
-        rb_funcall2(dr->handler, cdata_id, 1, args);
+        rb_funcall2(dr->handler, ox_cdata_id, 1, args);
     }
     dr->str = 0;
 
@@ -557,7 +557,7 @@ read_comment(SaxDrive dr) {
             rb_enc_associate(args[0], dr->encoding);
         }
 #endif
-        rb_funcall2(dr->handler, comment_id, 1, args);
+        rb_funcall2(dr->handler, ox_comment_id, 1, args);
     }
     dr->str = 0;
 
@@ -582,7 +582,7 @@ read_element(SaxDrive dr) {
         VALUE       args[1];
 
         args[0] = name;
-        rb_funcall2(dr->handler, start_element_id, 1, args);
+        rb_funcall2(dr->handler, ox_start_element_id, 1, args);
     }
     if ('/' == c) {
         closed = 1;
@@ -606,7 +606,7 @@ read_element(SaxDrive dr) {
             VALUE       args[1];
 
             args[0] = name;
-            rb_funcall2(dr->handler, end_element_id, 1, args);
+            rb_funcall2(dr->handler, ox_end_element_id, 1, args);
         }
     } else {
         if (0 != read_children(dr, 0)) {
@@ -620,7 +620,7 @@ read_element(SaxDrive dr) {
             VALUE       args[1];
 
             args[0] = name;
-            rb_funcall2(dr->handler, end_element_id, 1, args);
+            rb_funcall2(dr->handler, ox_end_element_id, 1, args);
         }
     }
     dr->str = 0;
@@ -654,7 +654,7 @@ read_text(SaxDrive dr) {
             rb_enc_associate(args[0], dr->encoding);
         }
 #endif
-        rb_funcall2(dr->handler, text_id, 1, args);
+        rb_funcall2(dr->handler, ox_text_id, 1, args);
     }
     return 0;
 }
@@ -711,7 +711,7 @@ read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml) {
                 rb_enc_associate(args[1], dr->encoding);
             }
 #endif
-            rb_funcall2(dr->handler, attr_id, 2, args);
+            rb_funcall2(dr->handler, ox_attr_id, 2, args);
         }
         c = next_non_white(dr);
     }
@@ -801,7 +801,7 @@ partial_io_cb(VALUE rdr) {
     size_t      cnt;
 
     args[0] = ULONG2NUM(dr->buf_end - dr->cur);
-    rstr = rb_funcall2(dr->io, readpartial_id, 1, args);
+    rstr = rb_funcall2(dr->io, ox_readpartial_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
     //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
@@ -831,7 +831,7 @@ io_cb(VALUE rdr) {
 
     args[0] = ULONG2NUM(dr->buf_end - dr->cur);
     //args[0] = SIZET2NUM(dr->buf_end - dr->cur);
-    rstr = rb_funcall2(dr->io, read_id, 1, args);
+    rstr = rb_funcall2(dr->io, ox_read_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
     //printf("*** read %lu bytes, str: '%s'\n", cnt, str);

data/lib/ox/version.rb

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

data/test/files.rb

@@ -8,12 +8,11 @@ if $0 == __FILE__
 end
 
 require 'pp'
-require 'ox'
-require 'test/ox/file'
-require 'test/ox/dir'
+require 'sample/file'
+require 'sample/dir'
 
 def files(dir)
-  d = ::Test::Ox::Dir.new(dir)
+  d = ::Sample::Dir.new(dir)
   Dir.new(dir).each do |fn|
     next if fn.start_with?('.')
     filename = File.join(dir, fn)
@@ -21,14 +20,10 @@ def files(dir)
     if File.directory?(filename)
       d << files(filename)
     else
-      d << Test::Ox::File.new(filename)
+      d << ::Sample::File.new(filename)
     end
   end
   #pp d
   d
 end
 
-if $0 == __FILE__
-  File.open('files.xml', "w") { |f| f.write(Ox.dump(files('.'), :indent => 2, :opt_format => true)) }
-  #Ox.to_file(files('.'), 'files2.xml', :indent => 2, :opt_format => true)
-end

data/test/func.rb

@@ -191,6 +191,17 @@ class Func < ::Test::Unit::TestCase
     assert_equal(loaded.class.superclass.to_s, 'Ox::Bag')
   end
 
+  def test_bad_class
+    xml = %{<?xml version="1.0"?>
+<o c="Bad:Boy">
+  <i a="@x">3</i>
+</o>
+}
+    assert_raise(SyntaxError) {
+      Ox.load(xml, :mode => :object, :trace => 0)
+    }
+  end
+
   def test_xml_instruction
     xml = Ox.dump("test", :mode => :object, :with_xml => false)
     assert_equal("<s>test</s>\n", xml)
@@ -430,6 +441,28 @@ class Func < ::Test::Unit::TestCase
     assert_equal("test", obj)
   end
 
+  def test_generic_string
+    xml = %{<?xml?>
+<Str>A &lt;boo&gt;</Str>
+}
+    doc = Ox.load(xml, :mode => :generic)
+    xml2 = Ox.dump(doc, :with_xml => true)
+    assert_equal(xml, xml2)
+  end
+
+  def test_generic_encoding
+    if RUBY_VERSION.start_with?('1.8')
+      assert(true)
+    else
+      xml = %{<?xml encoding="UTF-8"?>
+<Str>&lt;まきえ&gt;</Str>
+}
+      doc = Ox.load(xml, :mode => :generic)
+      xml2 = Ox.dump(doc, :with_xml => true)
+      assert_equal(xml, xml2)
+    end
+  end
+
   def test_IO
     f = File.open(__FILE__, "r")
     assert_raise(NotImplementedError) {

data/test/perf.rb

@@ -0,0 +1,91 @@
+
+class Perf
+
+  def initialize()
+    @items = []
+  end
+
+  def add(title, op, &blk)
+    @items << Item.new(title, op, &blk)
+  end
+
+  def run(iter)
+    base = Item.new(nil, nil) { }
+    base.run(iter, 0.0)
+    @items.each do |i|
+      i.run(iter, base.duration)
+      if i.error.nil?
+        puts "#{i.title}.#{i.op} #{iter} times in %0.3f seconds or %0.3f #{i.op}/sec." % [i.duration, iter / i.duration]
+      else
+        puts "***** #{i.title}.#{i.op} failed! #{i.error}"
+      end
+    end
+    summary()
+  end
+
+  def summary()
+    fastest = nil
+    slowest = nil
+    width = 6
+    @items.each do |i|
+      next if i.duration.nil?
+      width = i.title.size if width < i.title.size
+    end
+    iva = @items.clone
+    iva.delete_if { |i| i.duration.nil? }
+    iva.sort_by! { |i| i.duration }
+    puts
+    puts "Summary:"
+    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
+    puts "#{'-' * width}  -----------  --------------"
+    iva.each do |i|
+      if i.duration.nil?
+      else
+        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
+      end
+    end
+    puts
+    puts "Comparison Matrix\n(performance factor, 2.0 row is means twice as fast as column)"
+    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
+    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
+    iva.each do |i|
+      line = ["%*s" % [width, i.title]]
+      iva.each do |o|
+        line << "%*.2f" % [width, o.duration / i.duration]
+      end
+      puts line.join('  ')
+    end
+    puts
+  end
+
+  class Item
+    attr_accessor :title
+    attr_accessor :op
+    attr_accessor :blk
+    attr_accessor :duration
+    attr_accessor :rate
+    attr_accessor :error
+
+    def initialize(title, op, &blk)
+      @title = title
+      @blk = blk
+      @op = op
+      @duration = nil
+      @rate = nil
+      @error = nil
+    end
+
+    def run(iter, base)
+      begin
+        start = Time.now
+        iter.times { @blk.call }
+        @duration = Time.now - start - base
+        @duration = 0.0 if @duration < 0.0
+        @rate = iter / @duration
+      rescue Exception => e
+        @error = "#{e.class}: #{e.message}"
+      end
+    end
+
+  end # Item
+end # Perf