ox 2.14.10 → 2.14.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6a58bfa91298fd0da2d02538dfe039bb5a426edfba8e4f245d8bd91b7388cbb
-  data.tar.gz: 77765350035814045329fa94935cd3de29975eaefbaef1666e4ffe29269338d8
+  metadata.gz: bf4c5ff67edda493ebf9fd2a29fcee1584b0310f917094dec0a57eb93632f412
+  data.tar.gz: 7283aca3a2a2770f72696410a6691c131cfa2777562cd882f76bb0ea643c414e
 SHA512:
-  metadata.gz: 9ac7c0bd9c0ac54cd033f432a0e14cd29b265b078459025c889ca08a907703d1aa202aee9ccae792e87a47b783bacf3044e62bedfc0c25090457dd5035ee2ee3
-  data.tar.gz: 73fc0775f561ca3290b6f6a875d0c8076d4434a642f0c0e7321952ed8b1adc655aa0f880916e1fde5f02f0d29b5c7cc57de871e4e58c869540c219bd46d75403
+  metadata.gz: e6ada04ac77531e74f5d40995d660d6e993d9c69685c586d15cbd9c896dfe6c60df879a51adecf5f5d3cb860b8bcb3fd80116a1001ae6eb5d15fbeb472be7118
+  data.tar.gz: 4053266ff36240627decb9eefbdc30e1afcb07bf36fed7ad639d2e1cfbff5165991f59ee1fdc985259f6dc60e4394e4782df98de9c73c2e51be911f39436d595

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.12] - 2022-12-27
+
+### Fixed
+
+- Updated to support Ruby 3.2.
+
+## [2.14.11] - 2022-03-31
+
+### Fixed
+
+- Missing attribute value no longer crashes with the SAX parser.
+
 ## [2.14.10] - 2022-03-10
 
 ### 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/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

@@ -117,7 +117,7 @@ static void attr_text(SaxDrive dr, VALUE name, char *value, long pos, long line,
     VALUE args[2];
 
     args[0] = name;
-    if (dr->options.convert_special) {
+    if (dr->options.convert_special && '\0' != value[0]) {
         ox_sax_collapse_special(dr, value, pos, line, col);
     }
     args[1] = rb_str_new2(value);
@@ -1215,6 +1215,7 @@ static char read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml,
             col        = dr->buf.col + 1;
             c          = read_quoted_value(dr);
             attr_value = dr->buf.str;
+
             if (is_encoding) {
                 dr->encoding = rb_enc_find(dr->buf.str);
                 is_encoding  = 0;

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/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module.
-  VERSION = '2.14.10'
+  VERSION = '2.14.12'
 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.10
+  version: 2.14.12
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-12-27 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.