ox 2.0.9 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee595cb2877fd846e3876313780517e91a3e4705
-  data.tar.gz: 14418d0ea4f70c7b876727992546f074855ce509
+  metadata.gz: d43573d307b0054cf658e7b827330e1bb9be6b30
+  data.tar.gz: e8ab4066d5969e207b7df07ca2432324d84e33ac
 SHA512:
-  metadata.gz: c7f39413fb9be2701c8d28d2410b78bb503656dc05132affea3dd1fa18aae54a42933225001d07b525764f0ed6d4e86bd479db47820a72b86066f3a7e6a3f8a8
-  data.tar.gz: b8e72240a020d7e990ff4de9e24deac1243ee13c159ece51c096bcc93a7bb5a3c0c92f4d9826363fcd2b1e7a4575ee2117d2132a645bafda912e25d8dfd82d12
+  metadata.gz: 54bd52dcbc721e8f76068ad2f48a74ce12f558b45d8a6b0435c7cacfcacc978bd492ece4877ac7ec099ffcae53f8107a696670844e76aa4032679eaafb72c24d
+  data.tar.gz: f08283d2bff69dd8a6b3e73f5deded1f2a376c9c3d1f97ecf24754a855134f0430a8bd0c6a18ebd132c6d9fe1a8cfe06c7071c53324d05301e1d17ce794a5a98

data/README.md

@@ -34,9 +34,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.9
+### Release 2.0.11
 
- - Fixed bug that did not allow ISO-8859-1 characters and caused a crash.
+ - Added support for BigDecimals in :object mode.
 
 ## <a name="description">Description</a>
 
@@ -171,6 +171,38 @@ Ox.sax_parse(handler, io)
 # end: top
 ```
 
+### Yielding results immediately while SAX XML Parsing:
+
+```ruby
+require 'stringio'
+require 'ox'
+
+class Yielder < ::Ox::Sax
+  def initialize(block); @yield_to = block; end
+  def start_element(name); @yield_to.call(name); end
+end
+
+io = StringIO.new(%{
+<top name="sample">
+  <middle name="second">
+    <bottom name="third"/>
+  </middle>
+</top>
+})
+
+proc = Proc.new { |name| puts name }
+handler = Yielder.new(proc)
+puts "before parse"
+Ox.sax_parse(handler, io)
+puts "after parse"
+# outputs
+# before parse
+# top
+# middle
+# bottom
+# after parse
+```
+
 ### Object XML format
 
 The XML format used for Object encoding follows the structure of the

data/ext/ox/dump.c

@@ -739,6 +739,14 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 		dump_date(out, obj);
 		e.indent = -1;
 		out->w_end(out, &e);
+	    } else if (0 == strcmp("BigDecimal", classname)) {
+		VALUE	rs = rb_funcall(obj, ox_to_s_id, 0);
+
+		e.type = BigDecimalCode;
+		out->w_start(out, &e);
+		dump_value(out, StringValuePtr(rs), RSTRING_LEN(rs));
+		e.indent = -1;
+		out->w_end(out, &e);
 	    } else {
 		if (StrictEffort == out->opts->effort) {
 		    rb_raise(rb_eNotImpError, "Failed to dump T_DATA %s\n", classname);

data/ext/ox/extconf.rb

@@ -30,6 +30,8 @@ dflags = {
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
+  'HAS_GC_GUARD' => ('jruby' != type && 'rubinius' != type) ? 1 : 0,
+  'HAS_BIGDECIMAL' => ('jruby' != type) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
   'NEEDS_UIO' => (RUBY_PLATFORM =~ /(win|w)32$/) ? 0 : 1,
 }

data/ext/ox/gen_load.c

@@ -94,6 +94,9 @@ create_doc(PInfo pi) {
 
     helper_stack_init(&pi->helpers);
     doc = rb_obj_alloc(ox_document_clas);
+#if HAS_GC_GUARD
+    RB_GC_GUARD(doc);
+#endif
     nodes = rb_ary_new();
     rb_ivar_set(doc, ox_attributes_id, rb_hash_new());
     rb_ivar_set(doc, ox_nodes_id, nodes);

data/ext/ox/obj_load.c

@@ -557,6 +557,13 @@ add_text(PInfo pi, char *text, int closed) {
     case BignumCode:
 	h->obj = rb_cstr_to_inum(text, 10, 1);
 	break;
+    case BigDecimalCode:
+#if HAS_BIGDECIMAL
+	h->obj = rb_funcall(ox_bigdecimal_class, ox_new_id, 1, rb_str_new2(text));
+#else
+	h->obj = Qnil;
+#endif
+	break;
     default:
 	h->obj = Qnil;
 	break;
@@ -623,6 +630,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     case Symbol64Code:
     case RegexpCode:
     case BignumCode:
+    case BigDecimalCode:
     case ComplexCode:
     case DateCode:
     case TimeCode:

data/ext/ox/ox.c

@@ -80,6 +80,7 @@ ID	ox_local_id;
 ID	ox_mesg_id;
 ID	ox_message_id;
 ID	ox_nodes_id;
+ID	ox_new_id;
 ID	ox_num_id;
 ID	ox_parse_id;
 ID	ox_read_id;
@@ -102,6 +103,7 @@ VALUE	ox_zero_fixnum;
 
 VALUE	ox_arg_error_class;
 VALUE	ox_bag_clas;
+VALUE	ox_bigdecimal_class;
 VALUE	ox_cdata_clas;
 VALUE	ox_comment_clas;
 VALUE	ox_date_class;
@@ -402,10 +404,17 @@ to_obj(VALUE self, VALUE ruby_xml) {
 	xml = ALLOCA_N(char, len);
     }
     memcpy(xml, x, len);
+#if HAS_GC_GUARD
+    rb_gc_disable();
+#endif
     obj = ox_parse(xml, ox_obj_callbacks, 0, &options, &err);
     if (SMALL_XML < len) {
 	xfree(xml);
     }
+#if HAS_GC_GUARD
+    RB_GC_GUARD(obj);
+    rb_gc_enable();
+#endif
     if (err_has(&err)) {
 	ox_err_raise(&err);
     }
@@ -514,7 +523,14 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
     xml = defuse_bom(xml, &options);
     switch (options.mode) {
     case ObjMode:
+#if HAS_GC_GUARD
+	rb_gc_disable();
+#endif
 	obj = ox_parse(xml, ox_obj_callbacks, 0, &options, err);
+#if HAS_GC_GUARD
+	RB_GC_GUARD(obj);
+	rb_gc_enable();
+#endif
 	break;
     case GenMode:
 	obj = ox_parse(xml, ox_gen_callbacks, 0, &options, err);
@@ -854,6 +870,7 @@ void Init_ox() {
 
     rb_require("time");
     rb_require("date");
+    rb_require("bigdecimal");
     rb_require("stringio");
 
     ox_at_column_id = rb_intern("@column");
@@ -886,6 +903,7 @@ void Init_ox() {
     ox_mesg_id = rb_intern("mesg");
     ox_message_id = rb_intern("message");
     ox_nodes_id = rb_intern("@nodes");
+    ox_new_id = rb_intern("new");
     ox_num_id = rb_intern("@num");
     ox_parse_id = rb_intern("parse");
     ox_read_id = rb_intern("read");
@@ -907,6 +925,7 @@ void Init_ox() {
     ox_arg_error_class = rb_const_get_at(Ox, rb_intern("ArgError"));
     ox_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
     ox_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
+    ox_bigdecimal_class = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
 
     auto_define_sym = ID2SYM(rb_intern("auto_define"));		rb_gc_register_address(&auto_define_sym);
     auto_sym = ID2SYM(rb_intern("auto"));			rb_gc_register_address(&auto_sym);
@@ -971,5 +990,8 @@ _ox_raise_error(const char *msg, const char *xml, const char *current, const cha
 	    xline++;
 	}
     }
+#if HAS_GC_GUARD
+    rb_gc_enable();
+#endif
     rb_raise(ox_parse_error_class, "%s at line %d, column %d [%s:%d]\n", msg, xline, col, file, line);
 }

data/ext/ox/ox.h

@@ -214,6 +214,7 @@ extern ID	ox_local_id;
 extern ID	ox_mesg_id;
 extern ID	ox_message_id;
 extern ID	ox_nodes_id;
+extern ID	ox_new_id;
 extern ID	ox_num_id;
 extern ID	ox_parse_id;
 extern ID	ox_read_id;
@@ -237,6 +238,7 @@ extern VALUE		ox_utf8_encoding;
 extern void		*ox_utf8_encoding;
 #endif
 
+extern VALUE	ox_bigdecimal_class;
 extern VALUE	ox_date_class;
 extern VALUE	ox_empty_string;
 extern VALUE	ox_encoding_sym;

data/ext/ox/type.h

@@ -38,6 +38,7 @@ typedef enum {
     ClassCode	   = 'c',
     Symbol64Code   = 'd', /* base64 encoded Symbol */
     DateCode	   = 'D',
+    BigDecimalCode = 'B',
     ExceptionCode  = 'e',
     FloatCode	   = 'f',
     RegexpCode	   = 'g',

data/lib/ox/element.rb

@@ -49,7 +49,7 @@ module Ox
     # Element.
     # @return [Array] all child Nodes.
     def nodes
-      @nodes = [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
+      return [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
       @nodes
     end
 
@@ -57,8 +57,8 @@ module Ox
     # so multiple appends can be chained together.
     # @param [Node] node Node to append to the nodes array
     def <<(node)
-      @nodes = [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
       raise "argument to << must be a String or Ox::Node." unless node.is_a?(String) or node.is_a?(Node)
+      @nodes = [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
       @nodes << node
       self
     end

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.11
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-17 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 speed
@@ -69,7 +69,9 @@ files:
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/ox
-licenses: []
+licenses:
+- MIT
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -95,3 +97,4 @@ signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
+has_rdoc: true