ox 2.14.11 → 2.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a654851f11a761fdb77beb9cb4ec9ae07b4697cec9a4c5578a973a344779ca97
-  data.tar.gz: b4b004cc4fd90e3c52e142bd4007c471515a520d52a42ca2d81f332c11e6b2ba
+  metadata.gz: f9742d803f0730d6e9724d0f08809ec291b474beae8e966cf3b9ab3c95e165fa
+  data.tar.gz: 102f6dc50ee242f5a7cbb4e8395aa4004d826679b5b02f0e9734d3e8d206d7ec
 SHA512:
-  metadata.gz: 6b0595691afa3021e1abada2fd0fc4fb21992a10155f744846b01eb40bd74e33bf52041db37ec502b3f916295b64bde60816c20d99ed9954633342d035225d8a
-  data.tar.gz: e38010c8dcf091b983d17774464bd727a0f33538548d6b5d1820c6d043ba602d83552837a4ce4dd963c554ec19657475c21add9246323e5d5a9fbd7773c20e55
+  metadata.gz: 754fe3197d3944d4b398ba0334d62bc45d066448885e9a47ac8216c0a292203f273c4f0ab764a3ec4e5e49ebc472282ac89821aa0f03929491c60c659494e02b
+  data.tar.gz: 31f01b2ca8b2440511c9eda13fe590937bfd266173d83befcc81e228c0e8516545a29369755f1575c2e8bdb11aac791e463a397035fafed8e13848a23c8fb255

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.13] - 2023-01-16
+
+### Fixed
+
+- Fixed the intern cache to handle symbol memory changes.
+
+## [2.14.12] - 2022-12-27
+
+### Fixed
+
+- Updated to support Ruby 3.2.
+
 ## [2.14.11] - 2022-03-31
 
 ### Fixed

data/ext/ox/builder.c

@@ -10,6 +10,7 @@
 
 #include "ruby.h"
 #include "ruby/encoding.h"
+#include "ruby/version.h"
 #include "ox.h"
 #include "buf.h"
 #include "err.h"
@@ -881,6 +882,35 @@ builder_column(VALUE self) {
     return LONG2NUM(((Builder)DATA_PTR(self))->col);
 }
 
+/* call-seq: indent()
+ *
+ * Returns the indentation level
+ */
+static VALUE
+builder_get_indent(VALUE self) {
+    return INT2NUM(((Builder)DATA_PTR(self))->indent);
+}
+
+/* call-seq: indent=(indent)
+ *
+ * Sets the indentation level
+ *
+ * - +indent+ (Fixnum) indentaion level, negative values excludes terminating newline
+ */
+static VALUE
+builder_set_indent(VALUE self, VALUE indent) {
+#ifdef RUBY_INTEGER_UNIFICATION
+    if (rb_cInteger != rb_obj_class(indent)) {
+#else
+    if (rb_cFixnum != rb_obj_class(indent)) {
+#endif
+      rb_raise(ox_parse_error_class, "indent must be a fixnum.\n");
+    }
+
+    ((Builder)DATA_PTR(self))->indent = NUM2INT(indent);
+    return Qnil;
+}
+
 /* call-seq: pos()
  *
  * Returns the number of bytes written.
@@ -923,6 +953,9 @@ ox_init_builder(VALUE ox) {
     ox = rb_define_module("Ox");
 #endif
     builder_class = rb_define_class_under(ox, "Builder", rb_cObject);
+#if RUBY_API_VERSION_CODE >= 30200
+    rb_undef_alloc_func(builder_class);
+#endif
     rb_define_module_function(builder_class, "new", builder_new, -1);
     rb_define_module_function(builder_class, "file", builder_file, -1);
     rb_define_module_function(builder_class, "io", builder_io, -1);
@@ -940,4 +973,6 @@ ox_init_builder(VALUE ox) {
     rb_define_method(builder_class, "line", builder_line, 0);
     rb_define_method(builder_class, "column", builder_column, 0);
     rb_define_method(builder_class, "pos", builder_pos, 0);
+    rb_define_method(builder_class, "indent", builder_get_indent, 0);
+    rb_define_method(builder_class, "indent=", builder_set_indent, 1);
 }

data/ext/ox/hash_load.c

@@ -35,7 +35,7 @@ mark_value(PInfo pi, VALUE val) {
 	pi->mark_size = MARK_INC;
     } else if (pi->mark_size <= pi->mark_cnt) {
 	pi->mark_size += MARK_INC;
-	pi->marked = REALLOC_N(pi->marked, VALUE, pi->mark_size);
+	REALLOC_N(pi->marked, VALUE, pi->mark_size);
     }
     pi->marked[pi->mark_cnt] = val;
     pi->mark_cnt++;

data/ext/ox/intern.c

@@ -5,6 +5,8 @@
 
 #include <stdint.h>
 
+#include "ruby/version.h"
+
 #include "cache.h"
 #include "ox.h"
 
@@ -68,6 +70,9 @@ static VALUE form_id(const char *str, size_t len) {
 
 void ox_hash_init() {
     VALUE cache_class = rb_define_class_under(Ox, "Cache", rb_cObject);
+#if RUBY_API_VERSION_CODE >= 30200
+    rb_undef_alloc_func(cache_class);
+#endif
 
     ox_str_cache     = ox_cache_create(0, form_str, true, false);
     ox_str_cache_obj = Data_Wrap_Struct(cache_class, ox_cache_mark, ox_cache_free, ox_str_cache);

data/ext/ox/sax.c

@@ -762,6 +762,7 @@ CB:
  */
 static char read_element_start(SaxDrive dr) {
     const char    *ename = 0;
+    size_t         nlen;
     volatile VALUE name  = Qnil;
     char           c;
     int            closed;
@@ -790,6 +791,7 @@ static char read_element_start(SaxDrive dr) {
         0 == strcasecmp("html", dr->buf.str)) {
         dr->options.hints = ox_hints_html();
     }
+    nlen = dr->buf.tail - dr->buf.str - 1;
     if (NULL != dr->options.hints) {
         hint_clear_empty(dr);
         h = ox_hint_find(dr->options.hints, dr->buf.str);
@@ -810,7 +812,7 @@ static char read_element_start(SaxDrive dr) {
                 if (rb_respond_to(dr->handler, ox_abort_id)) {
                     VALUE args[1];
 
-                    args[0] = str2sym(dr, dr->buf.str, dr->buf.tail - dr->buf.str - 1, NULL);
+                    args[0] = str2sym(dr, dr->buf.str, nlen, NULL);
                     rb_funcall2(dr->handler, ox_abort_id, 1, args);
                 }
                 dr->abort = true;
@@ -861,7 +863,7 @@ static char read_element_start(SaxDrive dr) {
             }
         }
     }
-    name = str2sym(dr, dr->buf.str, dr->buf.tail - dr->buf.str - 1, &ename);
+    name = str2sym(dr, dr->buf.str, nlen, &ename);
     if (dr->has_start_element && 0 >= dr->blocked &&
         (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
         VALUE args[1];
@@ -894,7 +896,7 @@ static char read_element_start(SaxDrive dr) {
     } else if (stackless) {
         end_element_cb(dr, name, pos, line, col, h);
     } else if (NULL != h && h->jump) {
-        stack_push(&dr->stack, ename, name, h);
+        stack_push(&dr->stack, ename, nlen, name, h);
         if ('>' != c) {
             ox_sax_drive_error(dr, WRONG_CHAR "element not closed");
             return c;
@@ -902,7 +904,7 @@ static char read_element_start(SaxDrive dr) {
         read_jump(dr, h->name);
         return '<';
     } else {
-        stack_push(&dr->stack, ename, name, h);
+        stack_push(&dr->stack, ename, nlen, name, h);
     }
     if ('>' != c) {
         ox_sax_drive_error(dr, WRONG_CHAR "element not closed");

data/ext/ox/sax_as.c

@@ -15,6 +15,7 @@
 #include <time.h>
 
 #include "ruby.h"
+#include "ruby/version.h"
 #include "ox.h"
 #include "sax.h"
 
@@ -254,11 +255,16 @@ void
 ox_sax_define() {
 #if 0
     ox = rb_define_module("Ox");
+#if RUBY_API_VERSION_CODE >= 30200
     sax_module = rb_define_class_under(ox, "Sax", rb_cObject);
+#endif
 #endif
     VALUE	sax_module = rb_const_get_at(Ox, rb_intern("Sax"));
 
     ox_sax_value_class = rb_define_class_under(sax_module, "Value", rb_cObject);
+#if RUBY_API_VERSION_CODE >= 30200
+    rb_undef_alloc_func(ox_sax_value_class);
+#endif
 
     rb_define_method(ox_sax_value_class, "as_s", sax_value_as_s, 0);
     rb_define_method(ox_sax_value_class, "as_sym", sax_value_as_sym, 0);

data/ext/ox/sax_stack.h

@@ -6,11 +6,16 @@
 #ifndef OX_SAX_STACK_H
 #define OX_SAX_STACK_H
 
+#include <stdlib.h>
+
+#include "intern.h"
 #include "sax_hint.h"
 
 #define STACK_INC	32
+#define NV_BUF_MAX      64
 
 typedef struct _nv {
+    char	name_buf[NV_BUF_MAX];
     const char	*name;
     VALUE	val;
     int		childCnt;
@@ -44,7 +49,7 @@ stack_cleanup(NStack stack) {
 }
 
 inline static void
-stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
+stack_push(NStack stack, const char *name, size_t nlen, VALUE val, Hint hint) {
     if (stack->end <= stack->tail) {
 	size_t	len = stack->end - stack->head;
 	size_t	toff = stack->tail - stack->head;
@@ -58,7 +63,13 @@ stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
     }
-    stack->tail->name = name;
+    if (NV_BUF_MAX <= nlen) {
+        stack->tail->name = ox_strndup(name, nlen);
+    } else {
+        strncpy(stack->tail->name_buf, name, nlen);
+        stack->tail->name_buf[nlen] = '\0';
+        stack->tail->name = stack->tail->name_buf;
+    }
     stack->tail->val = val;
     stack->tail->hint = hint;
     stack->tail->childCnt = 0;
@@ -77,6 +88,9 @@ inline static Nv
 stack_pop(NStack stack) {
     if (stack->head < stack->tail) {
 	stack->tail--;
+        if (stack->tail->name != stack->tail->name_buf) {
+            free((char*)(stack->tail->name));
+        }
 	return stack->tail;
     }
     return 0;

data/lib/ox/version.rb

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

data/lib/ox.rb

@@ -76,4 +76,9 @@ require 'ox/document'
 require 'ox/bag'
 require 'ox/sax'
 
-require 'ox/ox' # C extension
+# C extension
+begin
+  require_relative 'ox.so'
+rescue LoadError
+  require 'ox/ox'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.11
+  version: 2.14.13
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2023-01-16 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 optimized\nXML handling.