ox 2.0.0 → 2.0.1

data/ext/ox/sax.c

@@ -96,9 +96,16 @@ char *stpncpy(char *dest, const char *src, size_t n) {
 }
 #endif
 
+static VALUE protect_parse(VALUE drp) {
+    parse((SaxDrive)drp);
+
+    return Qnil;
+}
+
 void
 ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
     struct _SaxDrive    dr;
+    int			line = 0;
 
     sax_drive_init(&dr, handler, io, options);
 #if 0
@@ -107,6 +114,7 @@ ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
     printf("    has_end_instruct = %s\n", dr.has.end_instruct ? "true" : "false");
     printf("    has_attr = %s\n", dr.has.attr ? "true" : "false");
     printf("    has_attr_value = %s\n", dr.has.attr_value ? "true" : "false");
+    printf("    has_attrs_done = %s\n", dr.has.attrs_done ? "true" : "false");
     printf("    has_doctype = %s\n", dr.has.doctype ? "true" : "false");
     printf("    has_comment = %s\n", dr.has.comment ? "true" : "false");
     printf("    has_cdata = %s\n", dr.has.cdata ? "true" : "false");
@@ -118,8 +126,12 @@ ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
     printf("    has_line = %s\n", dr.has.line ? "true" : "false");
     printf("    has_column = %s\n", dr.has.column ? "true" : "false");
 #endif
-    parse(&dr);
+    //parse(&dr);
+    rb_protect(protect_parse, (VALUE)&dr, &line);
     ox_sax_drive_cleanup(&dr);
+    if (0 != line) {
+	rb_jump_tag(line);
+    }
 }
 
 static void
@@ -404,6 +416,9 @@ read_instruction(SaxDrive dr) {
     buf_reset(&dr->buf);
     dr->err = 0;
     c = read_attrs(dr, c, '?', '?', is_xml, 1);
+    if (dr->has.attrs_done) {
+	    rb_funcall(dr->handler, ox_attrs_done_id, 0);
+    }
     if (dr->err) {
 	if (dr->has.text) {
 	    VALUE   args[1];
@@ -749,6 +764,9 @@ read_element_start(SaxDrive dr) {
 	}
 	closed = ('/' == c);
     }
+    if (dr->has.attrs_done) {
+	    rb_funcall(dr->handler, ox_attrs_done_id, 0);
+    }
     if (closed) {
 	c = buf_next_non_white(&dr->buf);
 	line = dr->buf.line;

data/ext/ox/sax_buf.c

@@ -43,6 +43,8 @@
 #include "ox.h"
 #include "sax.h"
 
+#define BUF_PAD	4
+
 static VALUE		rescue_cb(VALUE rdr, VALUE err);
 static VALUE		io_cb(VALUE rdr);
 static VALUE		partial_io_cb(VALUE rdr);
@@ -95,7 +97,7 @@ ox_sax_buf_init(Buf buf, VALUE io) {
     }
     buf->head = buf->base;
     *buf->head = '\0';
-    buf->end = buf->head + sizeof(buf->base) - 1; /* 1 less to make debugging easier */
+    buf->end = buf->head + sizeof(buf->base) - BUF_PAD;
     buf->tail = buf->head;
     buf->read_end = buf->head;
     buf->pro = 0;
@@ -118,10 +120,9 @@ ox_sax_buf_read(Buf buf) {
         } else {
             shift = buf->pro - buf->head;
         }
-        /*printf("\n*** shift: %lu\n", shift); */
         if (0 == shift) { /* no space left so allocate more */
             char        *old = buf->head;
-            size_t      size = buf->end - buf->head;
+            size_t      size = buf->end - buf->head + BUF_PAD;
         
             if (buf->head == buf->base) {
                 buf->head = ALLOC_N(char, size * 2);
@@ -129,7 +130,7 @@ ox_sax_buf_read(Buf buf) {
             } else {
 		REALLOC_N(buf->head, char, size * 2);
             }
-            buf->end = buf->head + size * 2;
+            buf->end = buf->head + size * 2 - BUF_PAD;
             buf->tail = buf->head + (buf->tail - old);
             buf->read_end = buf->head + (buf->read_end - old);
             if (0 != buf->pro) {

data/ext/ox/sax_has.h

@@ -35,6 +35,7 @@ typedef struct _Has {
     int         instruct;
     int         end_instruct;
     int         attr;
+    int         attrs_done;
     int         attr_value;
     int         doctype;
     int         comment;
@@ -70,6 +71,7 @@ has_init(Has has, VALUE handler) {
     has->end_instruct = respond_to(handler, ox_end_instruct_id);
     has->attr = respond_to(handler, ox_attr_id);
     has->attr_value = respond_to(handler, ox_attr_value_id);
+    has->attrs_done = respond_to(handler, ox_attrs_done_id);
     has->doctype = respond_to(handler, ox_doctype_id);
     has->comment = respond_to(handler, ox_comment_id);
     has->cdata = respond_to(handler, ox_cdata_id);

data/ext/ox/sax_stack.h

@@ -33,7 +33,7 @@
 
 #include "sax_hint.h"
 
-#define STACK_INC	100
+#define STACK_INC	32
 
 typedef struct _Nv {
     const char	*name;
@@ -57,7 +57,7 @@ stack_init(NStack stack) {
 
 inline static int
 stack_empty(NStack stack) {
-    return (stack->head == stack->base);
+    return (stack->head == stack->tail);
 }
 
 inline static void
@@ -77,7 +77,7 @@ stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
 	    stack->head = ALLOC_N(struct _Nv, len + STACK_INC);
 	    memcpy(stack->head, stack->base, sizeof(struct _Nv) * len);
 	} else {
-	    stack->head = REALLOC_N(stack->head, struct _Nv, len + STACK_INC);
+	    REALLOC_N(stack->head, struct _Nv, len + STACK_INC);
 	}
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;

data/ext/ox/type.h

@@ -0,0 +1,63 @@
+/* type.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __OX_TYPE_H__
+#define __OX_TYPE_H__
+
+typedef enum {
+    NoCode	   = 0,
+    ArrayCode	   = 'a',
+    String64Code   = 'b', /* base64 encoded String */
+    ClassCode	   = 'c',
+    Symbol64Code   = 'd', /* base64 encoded Symbol */
+    DateCode	   = 'D',
+    ExceptionCode  = 'e',
+    FloatCode	   = 'f',
+    RegexpCode	   = 'g',
+    HashCode	   = 'h',
+    FixnumCode	   = 'i',
+    BignumCode	   = 'j',
+    KeyCode	   = 'k', /* indicates the value is a hash key, kind of a hack */
+    RationalCode   = 'l',
+    SymbolCode	   = 'm',
+    FalseClassCode = 'n',
+    ObjectCode	   = 'o',
+    RefCode	   = 'p',
+    RangeCode	   = 'r',
+    StringCode	   = 's',
+    TimeCode	   = 't',
+    StructCode	   = 'u',
+    ComplexCode	   = 'v',
+    RawCode	   = 'x',
+    TrueClassCode  = 'y',
+    NilClassCode   = 'z',
+} Type;
+
+#endif /* __OX_TYPE_H__ */

data/lib/ox/sax.rb

@@ -27,14 +27,16 @@ module Ox
   # not be called during parsing. The 'name' argument in the callback methods
   # will be a Symbol. The 'str' arguments will be a String. The 'value'
   # arguments will be Ox::Sax::Value objects. Since both the text() and the
-  # value() methods are called for the same element in the XML document the
-  # the text() method is ignored if the value() method is defined or
-  # public. The same is true for attr() and attr_value().
+  # value() methods are called for the same element in the XML document the the
+  # text() method is ignored if the value() method is defined or public. The
+  # same is true for attr() and attr_value(). When all attribtues have been read
+  # the attr_done() callback will be invoked.
   #
   #    def instruct(target); end
   #    def end_instruct(target); end
   #    def attr(name, str); end
   #    def attr_value(name, value); end
+  #    def attrs_done(); end
   #    def doctype(str); end
   #    def comment(str); end
   #    def cdata(str); end
@@ -43,9 +45,10 @@ module Ox
   #    def start_element(name); end
   #    def end_element(name); end
   #
-  # Initializing @line in the initializer will cause that variable to be updated before each callback with the XML line
-  # number. The same is true for the @column but it will be updated with the column in the XML file that is the start of
-  # the element or node just read.
+  # Initializing @line in the initializer will cause that variable to be updated
+  # before each callback with the XML line number. The same is true for the
+  # @column but it will be updated with the column in the XML file that is the
+  # start of the element or node just read.
   class Sax
     # Create a new instance of the Sax handler class.
     def initialize()
@@ -70,6 +73,9 @@ module Ox
     def attr_value(name, value)
     end
 
+    def attrs_done()
+    end
+
     def doctype(str)
     end
 

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-21 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
@@ -35,21 +35,26 @@ files:
 - lib/ox/version.rb
 - lib/ox.rb
 - ext/ox/extconf.rb
+- ext/ox/attr.h
 - ext/ox/base64.h
 - ext/ox/cache.h
 - ext/ox/cache8.h
+- ext/ox/err.h
+- ext/ox/helper.h
 - ext/ox/ox.h
 - ext/ox/sax.h
 - ext/ox/sax_buf.h
 - ext/ox/sax_has.h
 - ext/ox/sax_hint.h
 - ext/ox/sax_stack.h
+- ext/ox/type.h
 - ext/ox/base64.c
 - ext/ox/cache.c
 - ext/ox/cache8.c
 - ext/ox/cache8_test.c
 - ext/ox/cache_test.c
 - ext/ox/dump.c
+- ext/ox/err.c
 - ext/ox/gen_load.c
 - ext/ox/obj_load.c
 - ext/ox/ox.c
@@ -82,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ox
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
-has_rdoc: true