ox 2.14.0 → 2.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059b3f1db82648104560fe8087b57d8c7e1ee082ed953a53afcdf3f8762b0a3e'
-  data.tar.gz: 344eac455d082e55935804cc45a7f399ebce83be700c1895a4679f28cd3b635a
+  metadata.gz: f3288687ada02ee5a8c19fbde18da50329577718b7db9650a3cf544e423d3c20
+  data.tar.gz: 711f74754b5e417028c8b6c1956eda6c6483ca7a1ce906bbdb64a60c36169de4
 SHA512:
-  metadata.gz: f4a109a5e5d97594c1c266bfd071af26aedf94acaf08d11c55ea03981fef97bff44d762c3df2b6b21da8559d928e7aac1d6d3421fbe0af56fb2eec10975449a6
-  data.tar.gz: c82c7d2ca8fb54eb4f04d7da7b1b5527ef47e89905fcdd3b9ab9b5407bee6c9f3a55ea253472e212810e10cec71627a9cd84dcbb69f1c3db2bdee2e86651f6bd
+  metadata.gz: 3ed4c311f6e5100b36db59aa46eaf5870479bee44ac733bd844591b87205da49437f715c504f0e048a73e7c0f82c953e74e5fe08772a723561c7b2c5ec30ef20
+  data.tar.gz: 2149589a87c214dbbc5b999c4ae3123a106813d453b1f0e9c9b387d2356668d6b84de964b0e82a47f695810a776cb5e9960490ca6d391a4c77cbb1b6c8a39204

data/CHANGELOG.md

@@ -2,7 +2,36 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
-## [Unreleased]
+## [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
+
+- Attribute keys for setting attributes no longer create seemily
+  duplicates if symbol and string keys are mixed.
+
+## [2.14.1] - 2021-01-11
+
+### Fixed
+
+- In Ruby 3.0 Range objects are frozen. This version allows Ranges to be created on load.
 
 ## [2.14.0] - 2020-12-15
 

data/README.md

@@ -1,8 +1,7 @@
 # Ox gem
 A fast XML parser and Object marshaller as a Ruby gem.
 
-[![Build Status](https://secure.travis-ci.org/ohler55/ox.svg?branch=master)](http://travis-ci.org/ohler55/ox) [![TideLift](https://tidelift.com/badges/github/ohler55/ox)](https://tidelift.com/subscription/pkg/rubygems-ox?utm_source=rubygems-ox&utm_medium=referral&utm_campaign=readme)
-[![Financial Contributors on Open Collective](https://opencollective.com/ohler/all/badge.svg?label=financial+contributors)](https://opencollective.com/ohler) 
+[![Build status](https://ci.appveyor.com/api/projects/status/pg2w4wspbrflbi8c?svg=true)](https://ci.appveyor.com/project/ohler55/ox)
 
 ## Installation
     gem install ox
@@ -17,10 +16,6 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 *RubyGems* *repo*: https://rubygems.org/gems/ox
 
-## Follow @oxgem on Twitter
-
-[Follow @peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Ox gem.
-
 ## Support
 
 [Get supported Ox with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-ox?utm_source=rubygems-ox&utm_medium=referral&utm_campaign=readme) Security updates are [supported](https://tidelift.com/security).
@@ -79,7 +74,7 @@ callbacks. Unlike Nokogiri and LibXML, Ox can be tuned to use only the SAX
 callbacks that are of interest to the caller. (See the perf_sax.rb file for an
 example.)
 
-Ox is compatible with Ruby 1.8.7, 1.9.3, 2.1.2, 2.2.0 and RBX.
+Ox is compatible with Ruby 2.3, 2.4, 2.5, 2.6, 2.7, 3.0.
 
 ### Object Dump Sample:
 

data/ext/ox/builder.c

@@ -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/dump.c

@@ -838,7 +838,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	    out->w_start(out, &e);
 
 	    for (i = 0; i < cnt; i++) {
-	        VALUE v = RSTRUCT_GET(obj, i);
+	        VALUE v = RSTRUCT_GET(obj, (int)(i));
 	        dump_obj(rb_intern(ulong2str(i, num_buf + sizeof(num_buf) - 1)), v, d2, out);
 	    }
 	    out->w_end(out, &e);

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/obj_load.c

@@ -42,10 +42,10 @@ static void		fill_indent(PInfo pi, char *buf, size_t size);
 
 
 struct _parseCallbacks	 _ox_obj_callbacks = {
-    instruct, /* instruct, */
-    0, /* add_doctype, */
-    0, /* add_comment, */
-    0, /* add_cdata, */
+    instruct,	// instruct,
+    0,		// add_doctype,
+    0,		// add_comment,
+    0,		// add_cdata,
     add_text,
     add_element,
     end_element,
@@ -128,7 +128,7 @@ resolve_classname(VALUE mod, const char *class_name, Effort effort, VALUE base_c
 	break;
     case StrictEffort:
     default:
-	/* raise an error if name is not defined */
+	// raise an error if name is not defined
 	clas = rb_const_get_at(mod, ci);
 	break;
     }
@@ -183,7 +183,7 @@ parse_ulong(const char *s, PInfo pi) {
     return ULONG2NUM(n);
 }
 
-/* 2010-07-09T10:47:45.895826162+09:00 */
+// 2010-07-09T10:47:45.895826162+09:00
 inline static VALUE
 parse_time(const char *text, VALUE clas) {
     VALUE	t;
@@ -559,7 +559,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 	    printf("%s%s\n", indent, buf);
 	}
     }
-    if (helper_stack_empty(&pi->helpers)) { /* top level object */
+    if (helper_stack_empty(&pi->helpers)) { // top level object
 	if (0 != (id = get_id_from_attrs(pi, attrs))) {
 	    pi->circ_array = circ_array_new();
 	}
@@ -580,7 +580,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 	h->obj = Qfalse;
 	break;
     case StringCode:
-	/* h->obj will be replaced by add_text if it is called */
+	// h->obj will be replaced by add_text if it is called
 	h->obj = ox_empty_string;
 	if (0 != pi->circ_array) {
 	    pi->id = get_id_from_attrs(pi, attrs);
@@ -597,8 +597,8 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     case ComplexCode:
     case DateCode:
     case TimeCode:
-    case RationalCode: /* sub elements read next */
-	/* value will be read in the following add_text */
+    case RationalCode: // sub elements read next
+	// value will be read in the following add_text
 	h->obj = Qundef;
 	break;
     case String64Code:
@@ -620,7 +620,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 	}
 	break;
     case RangeCode:
-	h->obj = rb_range_new(ox_zero_fixnum, ox_zero_fixnum, Qfalse);
+	h->obj = rb_ary_new_from_args(3, Qnil, Qnil, Qfalse);
 	break;
     case RawCode:
 	if (hasChildren) {
@@ -700,12 +700,15 @@ end_element(PInfo pi, const char *ename) {
 	Helper	ph = helper_stack_peek(&pi->helpers);
 
 	if (ox_empty_string == h->obj) {
-	    /* special catch for empty strings */
+	    // special catch for empty strings
 	    h->obj = rb_str_new2("");
-	}
-	if (Qundef == h->obj) {
+	} else if (Qundef == h->obj) {
 	    set_error(&pi->err, "Invalid element for object mode", pi->str, pi->s);
 	    return;
+	} else if (RangeCode == h->type) { // Expect an array of 3 elements.
+	    const VALUE	*ap = RARRAY_PTR(h->obj);
+
+	    h->obj = rb_range_new(*ap, *(ap + 1), Qtrue == *(ap + 2));
 	}
 	pi->obj = h->obj;
 	if (0 != ph) {
@@ -740,11 +743,11 @@ end_element(PInfo pi, const char *ename) {
 		break;
 	    case RangeCode:
 		if (ox_beg_id == h->var) {
-		    RSTRUCT_SET(ph->obj, 0, h->obj);
+		    rb_ary_store(ph->obj, 0, h->obj);
 		} else if (ox_end_id == h->var) {
-		    RSTRUCT_SET(ph->obj, 1, h->obj);
+		    rb_ary_store(ph->obj, 1, h->obj);
 		} else if (ox_excl_id == h->var) {
-		    RSTRUCT_SET(ph->obj, 2, h->obj);
+		    rb_ary_store(ph->obj, 2, h->obj);
 		} else {
 		    set_error(&pi->err, "Invalid range attribute", pi->str, pi->s);
 		    return;
@@ -903,7 +906,7 @@ parse_xsd_time(const char *text, VALUE clas) {
 #endif
 }
 
-/* debug functions */
+// debug functions
 static void
 fill_indent(PInfo pi, char *buf, size_t size) {
     size_t	cnt;

data/lib/ox/hasattrs.rb

@@ -13,7 +13,7 @@ module Ox
       @attributes = { } if !instance_variable_defined?(:@attributes) or @attributes.nil?
       @attributes
     end
-    
+
     # Returns the value of an attribute.
     # - +attr+ [Symbol|String] attribute name or key to return the value for
     def [](attr)
@@ -27,9 +27,16 @@ module Ox
     def []=(attr, value)
       raise "argument to [] must be a Symbol or a String." unless attr.is_a?(Symbol) or attr.is_a?(String)
       @attributes = { } if !instance_variable_defined?(:@attributes) or @attributes.nil?
+      a_str = attr.to_s
+      a_sym = attr.to_sym
+      if @attributes.has_key?(a_str)
+	attr = a_str
+      elsif @attributes.has_key?(a_sym)
+	attr = a_sym
+      end
       @attributes[attr] = value.to_s
     end
-    
+
     # Handles the 'easy' API that allows navigating a simple XML by
     # referencing attributes by name.
     # - +id+ [Symbol] element or attribute name

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-06-04 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.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.