ox 2.14.2 → 2.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fcb1a62067bc5b89b5d87f21fadeef568fc3ff077562f5b283a8ff01ed0e0e
-  data.tar.gz: 3da26b22a552c6f1009593e163b77b26eee204758fb13af7a978a936247dc192
+  metadata.gz: 8cef7183a7bea9cd7baba3313afd0e008861d159ae8d99ef229dca9cb34ba1fd
+  data.tar.gz: 4929590f1b84ac3e5350c2657a3374eb49a2a258668bbf13d2ee5624110402c5
 SHA512:
-  metadata.gz: 0dcaafdffe911c917c12e44e45f02ab100489a98d3f19df67a1131743141e0efb8dacb3d695e9f0b965d7813b91cadd15faa4375aab886fceff37cd9a9d6e404
-  data.tar.gz: e7701c3e41d8f6701bcc44f74fffd540cac3c525192531e652d6c2508b1a0c72dbd21d344e1e2f431683714ea5cf23eefa1da80c97dfa32d509df496ae0bf5c2
+  metadata.gz: fb7fb21b9be8f9e046b22e3dde36bb2469256daab163e17e082c9c15865926e21d2793052f544ebadaa958fb6589d30e9a5b7c6fed018f1fa6e32782271a2e8c
+  data.tar.gz: f259be386f39855faf5f871119cd60c16ee6c23872baf2239754f17512355fd19c2dbfa8c254746e1f44b0819f32b3e63700a5bfe3f6f0ff831c5f9c107f9df1

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.6] - 2021-11-03
+
+### Fixed
+
+- Closing tags in builder are now escapped correctly thanks to ezekg.
+
+## [2.14.5] - 2021-06-04
+
+### Fixed
+
+- Fixed RDoc for for Ox::Builder.
+
+## [2.14.4] - 2021-03-19
+
+### Fixed
+
+- Really fixed code issue around HAVE_RB_ENC_ASSOCIATE.
+
+## [2.14.3] - 2021-03-12
+
+### Fixed
+
+- Code issue around HAVE_RB_ENC_ASSOCIATE fixed.
+
 ## [2.14.2] - 2021-03-07
 
 ### Fixed

data/README.md

@@ -1,7 +1,7 @@
 # Ox gem
 A fast XML parser and Object marshaller as a Ruby gem.
 
-[![Build status](https://ci.appveyor.com/api/projects/status/pg2w4wspbrflbi8c?svg=true)](https://ci.appveyor.com/project/ohler55/ox)
+[![Build Status](https://img.shields.io/github/workflow/status/ohler55/ox/CI?logo=github)](https://github.com/ohler55/ox/actions/workflows/CI.yml)
 
 ## Installation
     gem install ox

data/ext/ox/builder.c

@@ -286,7 +286,7 @@ pop(Builder b) {
 	    append_indent(b);
 	}
 	buf_append_string(&b->buf, "</", 2);
-	buf_append_string(&b->buf, e->name, e->len);
+	append_string(b, e->name, e->len, xml_element_chars, false);
 	buf_append(&b->buf, '>');
 	b->col += e->len + 3;
 	b->pos += e->len + 3;
@@ -898,8 +898,7 @@ builder_pos(VALUE self) {
  *
  * Closes the current element.
  */
-static VALUE
-builder_pop(VALUE self) {
+static VALUE builder_pop(VALUE self) {
     pop((Builder)DATA_PTR(self));
 
     return Qnil;
@@ -921,7 +920,12 @@ builder_close(VALUE self) {
  *
  * An XML builder.
  */
-void ox_init_builder(VALUE ox) {
+void
+ox_init_builder(VALUE ox) {
+#if 0
+    // Just for rdoc.
+    ox = rb_define_module("Ox");
+#endif
     builder_class = rb_define_class_under(ox, "Builder", rb_cObject);
     rb_define_module_function(builder_class, "new", builder_new, -1);
     rb_define_module_function(builder_class, "file", builder_file, -1);

data/ext/ox/extconf.rb

@@ -38,6 +38,7 @@ have_func('rb_enc_find')
 have_func('rb_struct_alloc_noinit')
 have_func('rb_obj_encoding')
 have_func('rb_ivar_foreach')
+have_func('rb_ext_ractor_safe', 'ruby.h')
 
 have_header('ruby/st.h')
 have_header('sys/uio.h')

data/ext/ox/gen_load.c

@@ -116,18 +116,18 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
 #endif
 	    rb_hash_aset(ah, sym, rb_str_new2(attrs->value));
 	} else {
+#if HAVE_RB_ENC_ASSOCIATE
 	    volatile VALUE	rstr = rb_str_new2(attrs->name);
 
-#if HAVE_RB_ENC_ASSOCIATE
 	    if (0 != pi->options->rb_enc) {
 		rb_enc_associate(rstr, pi->options->rb_enc);
 	    }
 	    rb_hash_aset(ah, rstr, rb_str_new2(attrs->value));
+#endif
 	}
 	if (0 == strcmp("encoding", attrs->name)) {
 	    pi->options->rb_enc = rb_enc_find(attrs->value);
 	}
-#endif
     }
     nodes = rb_ary_new();
     rb_ivar_set(doc, ox_attributes_id, ah);

data/ext/ox/ox.c

@@ -1395,6 +1395,9 @@ cache8_test(VALUE self) {
 #endif
 
 void Init_ox() {
+#if HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
     Ox = rb_define_module("Ox");
 
     rb_define_module_function(Ox, "default_options", get_def_opts, 0);

data/ext/ox/sax.c

@@ -123,6 +123,9 @@ str2sym(SaxDrive dr, const char *str, const char **strp) {
 
 void
 ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
+#if HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
     struct _saxDrive    dr;
     int			line = 0;
 

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.14.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-11-03 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.
@@ -81,9 +81,12 @@ rdoc_options:
 - "--main"
 - README.md
 - "--title"
-- Ox Documentation
+- Ox
 - "--exclude"
 - extconf.rb
+- lib
+- ext/ox
+- README.md
 require_paths:
 - lib
 - ext
@@ -98,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.