ox 2.12.0 → 2.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923d0aee2bea7b543f7aec674879c552846492786d05af0d7fd6447f4e60d3b
-  data.tar.gz: b0acca612b1a7624847d0c2399f18b7d122c4d9f41a77deaee23ac96c76d87c2
+  metadata.gz: 455a3e6630c8cf482656e024c14c609cfcc5441d201dd6b6f7649a283309bf87
+  data.tar.gz: e6240807c3f21f2915d044b56bc05433730a39315b10a50c3698adcc5640cf1d
 SHA512:
-  metadata.gz: 5c9f59561ace452549c579d22f30b3c0101f0ec9e1f3bf302d711aee2844af32c5c575057fb28c60aecff009c7314d4772691c187368517939ec0ed8a48fc74d
-  data.tar.gz: 4a13ef2c59d159cb1728751c1ec7eb896df35909fb6434e65d722a8ef96e96a2a95e309852f21daf6de87c41e7ca13b13d19015f5bbaed1b0a0dcca5d14b123c
+  metadata.gz: 3ddfd3e2a3e80338a1f5d4cf36b9b0ea28b721f24d7d6bc8c3b1a27c2c026484596274b105b4da602e4070627411297295807eebbf83cc923863d4494e0c0c32
+  data.tar.gz: af3b468beb6e48aa6046b3829ee186433be56d308dd3bb06b19068eefd4a315c004353aaa245a95fdc42d315e817d7cca4f3d309b745fb782c5e77bbd463e427

data/CHANGELOG.md

@@ -4,8 +4,56 @@ All changes to the Ox gem are documented here. Releases follow semantic versioni
 
 ## [Unreleased]
 
+## [2.13.4] - 2020-09-11
+
+### Fixed
+
+- Fixed one crash that occurred when a corrupted object encoded string was provided.
+
+## [2.13.3] - 2020-09-03
+
+### Changed
+
+- mkmf have macros used instead of ad-hoc determinations.
+
+## [2.13.2] - 2020-02-05
+
+Skip and missed sequence
+
+### Fixed
+
+- Add ' sequence.
+
+- `:skip_off` no longer misses spaces between elements.
+
+## [2.13.1] - 2020-01-30
+
+HTML Sequences
+
+### Added
+
+- All HTML 4 sequence are now supported.
+
+## [2.13.0] - 2020-01-25
+
+HTML Escape Sequences
+
+### Added
+
+- All HTML 4 escape sequences are now parsed.
+
+## [2.12.1] - 2020-01-05
+
+Ruby 2.7.0
+
+### Fixed
+
+- Updated for Ruby 2.7.0. More strict type checking. Function signature changes, and `Object#taint` deprecated.
+
 ## [2.12.0] - 2019-12-18
 
+### Added
+
 - Add `no_empty` option to not allow <xyz/> and use <xyz></xyz> instead.
 
 ## [2.11.0] - 2019-06-14

data/README.md

@@ -2,6 +2,7 @@
 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) 
 
 ## Installation
     gem install ox
@@ -323,3 +324,33 @@ Ox supports circular references where attributes of one Object can refer to
 an Object that refers back to the first Object. When this option is used an
 Object ID is added to each XML Object element as the value of the 'a'
 attribute.
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/ohler55/ox/graphs/contributors"><img src="https://opencollective.com/ohler/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/ohler/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/ohler"><img src="https://opencollective.com/ohler/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/ohler/contribute)]
+
+<a href="https://opencollective.com/ohler/organization/0/website"><img src="https://opencollective.com/ohler/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/1/website"><img src="https://opencollective.com/ohler/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/2/website"><img src="https://opencollective.com/ohler/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/3/website"><img src="https://opencollective.com/ohler/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/4/website"><img src="https://opencollective.com/ohler/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/5/website"><img src="https://opencollective.com/ohler/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/6/website"><img src="https://opencollective.com/ohler/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/7/website"><img src="https://opencollective.com/ohler/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/8/website"><img src="https://opencollective.com/ohler/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/ohler/organization/9/website"><img src="https://opencollective.com/ohler/organization/9/avatar.svg"></a>

data/ext/ox/builder.c

@@ -8,6 +8,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ruby.h"
+#if HAVE_RB_ENC_ASSOCIATE
+#include "ruby/encoding.h"
+#endif
 #include "ox.h"
 #include "buf.h"
 #include "err.h"
@@ -17,7 +21,7 @@
 typedef struct _element {
     char	*name;
     char	buf[64];
-    int		len;
+    long	len;
     bool	has_child;
     bool	non_text_child;
 } *Element;
@@ -124,7 +128,7 @@ append_string(Builder b, const char *str, size_t size, const char *table, bool s
 	char	buf[256];
 	char	*end = buf + sizeof(buf) - 1;
 	char	*bp = buf;
-	int	i = size;
+	size_t	i = size;
 	int	fcnt;
 
 	for (; '\0' != *str && 0 < i; i--, str++) {
@@ -183,7 +187,7 @@ append_string(Builder b, const char *str, size_t size, const char *table, bool s
 static void
 append_sym_str(Builder b, VALUE v) {
     const char	*s;
-    int		len;
+    long	len;
 
     switch (rb_type(v)) {
     case T_STRING:
@@ -219,7 +223,9 @@ i_am_a_child(Builder b, bool is_text) {
 }
 
 static int
-append_attr(VALUE key, VALUE value, Builder b) {
+append_attr(VALUE key, VALUE value, VALUE bv) {
+    Builder	b = (Builder)bv;
+
     buf_append(&b->buf, ' ');
     b->col++;
     b->pos++;
@@ -329,7 +335,7 @@ to_s(Builder b) {
     rstr = rb_str_new(b->buf.head, buf_len(&b->buf));
 
     if ('\0' != *b->encoding) {
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 	rb_enc_associate(rstr, rb_enc_find(b->encoding));
 #endif
     }
@@ -600,7 +606,7 @@ builder_element(int argc, VALUE *argv, VALUE self) {
     Builder		b = (Builder)DATA_PTR(self);
     Element		e;
     const char		*name;
-    int			len;
+    long		len;
 
     if (1 > argc) {
 	rb_raise(ox_arg_error_class, "missing element name");
@@ -662,7 +668,7 @@ static VALUE
 builder_void_element(int argc, VALUE *argv, VALUE self) {
     Builder	b = (Builder)DATA_PTR(self);
     const char	*name;
-    int		len;
+    long	len;
 
     if (1 > argc) {
 	rb_raise(ox_arg_error_class, "missing element name");

data/ext/ox/dump.c

@@ -54,7 +54,7 @@ static void	dump_obj(ID aid, VALUE obj, int depth, Out out);
 static void	dump_gen_doc(VALUE obj, int depth, Out out);
 static void	dump_gen_element(VALUE obj, int depth, Out out);
 static void	dump_gen_instruct(VALUE obj, int depth, Out out);
-static int	dump_gen_attr(VALUE key, VALUE value, Out out);
+static int	dump_gen_attr(VALUE key, VALUE value, VALUE ov);
 static int	dump_gen_nodes(VALUE obj, int depth, Out out);
 static void	dump_gen_val_node(VALUE obj, int depth,
 				  const char *pre, size_t plen,
@@ -67,12 +67,12 @@ static void	grow(Out out, size_t len);
 
 static void	dump_value(Out out, const char *value, size_t size);
 static void	dump_str_value(Out out, const char *value, size_t size, const char *table);
-static int	dump_var(ID key, VALUE value, Out out);
+static int	dump_var(ID key, VALUE value, VALUE ov);
 static void	dump_num(Out out, VALUE obj);
 static void	dump_date(Out out, VALUE obj);
 static void	dump_time_thin(Out out, VALUE obj);
 static void	dump_time_xsd(Out out, VALUE obj);
-static int	dump_hash(VALUE key, VALUE value, Out out);
+static int	dump_hash(VALUE key, VALUE value, VALUE ov);
 
 static int	is_xml_friendly(const uchar *str, int len, const char *table);
 
@@ -455,17 +455,14 @@ static void
 dump_time_thin(Out out, VALUE obj) {
     char		buf[64];
     char		*b = buf + sizeof(buf) - 1;
-#if HAS_RB_TIME_TIMESPEC
+#if HAVE_RB_TIME_TIMESPEC
     struct timespec	ts = rb_time_timespec(obj);
     time_t		sec = ts.tv_sec;
     long		nsec = ts.tv_nsec;
 #else
     time_t		sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_nsec_id, 0, 0));
-#else
-    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
-#endif
+    //long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
 #endif
     char		*dot = b - 10;
     long		size;
@@ -520,11 +517,8 @@ dump_time_xsd(Out out, VALUE obj) {
     long		nsec = ts.tv_nsec;
 #else
     time_t		sec = NUM2LONG(rb_funcall2(obj, ox_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_nsec_id, 0, 0));
-#else
-    long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
-#endif
+    //long		nsec = NUM2LONG(rb_funcall2(obj, ox_tv_usec_id, 0, 0)) * 1000;
 #endif
     int			tzhour, tzmin;
     char		tzsign = '+';
@@ -809,7 +803,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
     }
     case T_STRUCT:
     {
-#if HAS_RSTRUCT
+#ifdef RSTRUCT_GET
 	VALUE	clas;
 
 	if (0 != out->circ_cache && check_circular(out, obj, &e)) {
@@ -831,7 +825,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	} else {
 	    char	num_buf[16];
 	    int		d2 = depth + 1;
-#if UNIFY_FIXNUM_AND_BIGNUM
+#ifdef RUBY_INTEGER_UNIFICATION
 		long i;
 		long cnt = NUM2LONG(rb_struct_size(obj));
 #else // UNIFY_FIXNUM_AND_INTEGER
@@ -877,7 +871,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	    dump_gen_element(obj, depth + 1, out);
 	    out->w_end(out, &e);
 	} else { /* Object */
-#if HAS_IVAR_HELPERS
+#if HAVE_RB_IVAR_FOREACH
 	    e.type = (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) ? ExceptionCode : ObjectCode;
 	    cnt = (int)rb_ivar_count(obj);
 	    e.closed = (0 >= cnt);
@@ -1005,7 +999,9 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_var(ID key, VALUE value, Out out) {
+dump_var(ID key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     if (T_DATA == rb_type(value) && key == ox_mesg_id) {
 	/* There is a secret recipe that keeps Exception mesg attributes as a
 	 * T_DATA until it is needed. The safe way around this hack is to call
@@ -1022,7 +1018,9 @@ dump_var(ID key, VALUE value, Out out) {
 }
 
 static int
-dump_hash(VALUE key, VALUE value, Out out) {
+dump_hash(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     dump_obj(0, key, out->depth, out);
     dump_obj(0, value, out->depth, out);
 
@@ -1198,16 +1196,13 @@ dump_gen_nodes(VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_gen_attr(VALUE key, VALUE value, Out out) {
+dump_gen_attr(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     const char	*ks;
     size_t	klen;
     size_t	size;
 
-#if HAS_PRIVATE_ENCODING
-    // There seems to be a bug in jruby for converting symbols to strings and preserving the encoding. This is a work
-    // around.
-    ks = rb_str_ptr(rb_String(key));
-#else
     switch (rb_type(key)) {
     case T_SYMBOL:
 	ks = rb_id2name(SYM2ID(key));
@@ -1220,7 +1215,6 @@ dump_gen_attr(VALUE key, VALUE value, Out out) {
 	ks = StringValuePtr(key);
 	break;
     }
-#endif
     klen = strlen(ks);
     value = rb_String(value);
     size = 4 + klen + RSTRING_LEN(value);

data/ext/ox/extconf.rb

@@ -6,7 +6,6 @@ dir_config(extension_name)
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0].downcase()
 type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
 puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} on #{platform} <<<<<"
@@ -18,41 +17,8 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION)) ? 1 : 0,
-  #'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
-  'HAS_TM_GMTOFF' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0]) && 
-                      !(platform.include?('cygwin') || platform.include?('solaris') || platform.include?('linux') || RUBY_PLATFORM =~ /(win|w)32$/)) ? 1 : 0,
-  'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type || 'macruby' == type) &&
-                             (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_ONIG' => (('ruby' == type || 'jruby' == type || 'rubinius' == type) &&
-                 (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_PRIVATE_ENCODING' => ('jruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
-  'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
-  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
-  'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
-  'HAS_GC_GUARD' => ('jruby' != type && 'rubinius' != type) ? 1 : 0,
-  'HAS_BIGDECIMAL' => ('jruby' != type) ? 1 : 0,
-  'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'NEEDS_UIO' => (RUBY_PLATFORM =~ /(win|w)32$/) ? 0 : 1,
-  'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
-  'UNIFY_FIXNUM_AND_BIGNUM' => ('ruby' == type && '2' == version[0] && '4' <= version[1]) ? 1 : 0,
 }
 
-if RUBY_PLATFORM =~ /(win|w)32$/ || RUBY_PLATFORM =~ /solaris2\.10/
-  dflags['NEEDS_STPCPY'] = nil
-end
-
-if ['i386-darwin10.0.0', 'x86_64-darwin10.8.0'].include? RUBY_PLATFORM
-  dflags['NEEDS_STPCPY'] = nil
-  dflags['HAS_IVAR_HELPERS'] = 0 if ('ruby' == type && '1.9.1' == RUBY_VERSION)
-elsif 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' == RUBY_RELEASE_DATE
-  begin
-    dflags['NEEDS_STPCPY'] = nil if `more /etc/issue`.include?('CentOS release 5.4')
-  rescue Exception
-  end
-end
-
 dflags.each do |k,v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
@@ -62,6 +28,22 @@ dflags.each do |k,v|
 end
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
+
+have_func('rb_time_timespec')
+have_func('rb_enc_associate')
+have_func('rb_enc_find')
+have_func('rb_struct_alloc_noinit')
+have_func('rb_obj_encoding')
+have_func('rb_ivar_foreach')
+
+have_header('ruby/st.h')
+have_header('sys/uio.h')
+
+have_struct_member('struct tm', 'tm_gmtoff')
+
 create_makefile(extension_name)
 
 %x{make clean}

data/ext/ox/gen_load.c

@@ -10,6 +10,9 @@
 #include <stdarg.h>
 
 #include "ruby.h"
+#if HAVE_RB_ENC_ASSOCIATE
+#include "ruby/encoding.h"
+#endif
 #include "ox.h"
 
 static void     instruct(PInfo pi, const char *target, Attr attrs, const char *content);
@@ -72,7 +75,7 @@ create_doc(PInfo pi) {
 
     helper_stack_init(&pi->helpers);
     doc = rb_obj_alloc(ox_document_clas);
-#if HAS_GC_GUARD
+#ifdef RB_GC_GUARD
     RB_GC_GUARD(doc);
 #endif
     nodes = rb_ary_new();
@@ -100,7 +103,7 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
 	    sym = rb_funcall(pi->options->attr_key_mod, ox_call_id, 1, rb_str_new2(attrs->name));
 	    rb_hash_aset(ah, sym, rb_str_new2(attrs->value));
 	} else if (Yes == pi->options->sym_keys) {
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 	    if (0 != pi->options->rb_enc) {
 		VALUE	rstr = rb_str_new2(attrs->name);
 
@@ -109,41 +112,21 @@ create_prolog_doc(PInfo pi, const char *target, Attr attrs) {
 	    } else {
 		sym = ID2SYM(rb_intern(attrs->name));
 	    }
-#elif HAS_PRIVATE_ENCODING
-	    if (Qnil != pi->options->rb_enc) {
-		VALUE	rstr = rb_str_new2(attrs->name);
-
-		rb_funcall(rstr, ox_force_encoding_id, 1, pi->options->rb_enc);
-		sym = rb_funcall(rstr, ox_to_sym_id, 0);
-	    } else {
-		sym = ID2SYM(rb_intern(attrs->name));
-	    }
-#else
 	    sym = ID2SYM(rb_intern(attrs->name));
 #endif
 	    rb_hash_aset(ah, sym, rb_str_new2(attrs->value));
 	} else {
 	    volatile VALUE	rstr = rb_str_new2(attrs->name);
 
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 	    if (0 != pi->options->rb_enc) {
 		rb_enc_associate(rstr, pi->options->rb_enc);
 	    }
-#elif HAS_PRIVATE_ENCODING
-	    if (Qnil != pi->options->rb_enc) {
-		rb_funcall(rstr, ox_force_encoding_id, 1, pi->options->rb_enc);
-	    }
-#endif
 	    rb_hash_aset(ah, rstr, rb_str_new2(attrs->value));
 	}
-#if HAS_ENCODING_SUPPORT
 	if (0 == strcmp("encoding", attrs->name)) {
 	    pi->options->rb_enc = rb_enc_find(attrs->value);
 	}
-#elif HAS_PRIVATE_ENCODING
-	if (0 == strcmp("encoding", attrs->name)) {
-	    pi->options->rb_enc = rb_str_new2(attrs->value);
-	}
 #endif
     }
     nodes = rb_ary_new();
@@ -212,14 +195,10 @@ add_doctype(PInfo pi, const char *docType) {
     VALUE       n = rb_obj_alloc(ox_doctype_clas);
     VALUE       s = rb_str_new2(docType);
 
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-    }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
     if (helper_stack_empty(&pi->helpers)) { /* top level object */
@@ -233,14 +212,10 @@ add_comment(PInfo pi, const char *comment) {
     VALUE       n = rb_obj_alloc(ox_comment_clas);
     VALUE       s = rb_str_new2(comment);
 
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-    }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
     if (helper_stack_empty(&pi->helpers)) { /* top level object */
@@ -254,14 +229,10 @@ add_cdata(PInfo pi, const char *cdata, size_t len) {
     VALUE       n = rb_obj_alloc(ox_cdata_clas);
     VALUE       s = rb_str_new2(cdata);
 
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-    }
 #endif
     rb_ivar_set(n, ox_at_value_id, s);
     if (helper_stack_empty(&pi->helpers)) { /* top level object */
@@ -274,14 +245,10 @@ static void
 add_text(PInfo pi, char *text, int closed) {
     VALUE       s = rb_str_new2(text);
 
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-    }
 #endif
     if (helper_stack_empty(&pi->helpers)) { /* top level object */
 	create_doc(pi);
@@ -297,14 +264,10 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     if (Qnil != pi->options->element_key_mod) {
 	s = rb_funcall(pi->options->element_key_mod, ox_call_id, 1, s);
     }
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-    }
 #endif
     e = rb_obj_alloc(ox_element_clas);
     rb_ivar_set(e, ox_at_value_id, s);
@@ -320,7 +283,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 		VALUE	*slot;
 
 		if (Qundef == (sym = ox_cache_get(ox_symbol_cache, attrs->name, &slot, 0))) {
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 		    if (0 != pi->options->rb_enc) {
 			VALUE	rstr = rb_str_new2(attrs->name);
 
@@ -329,15 +292,6 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 		    } else {
 			sym = ID2SYM(rb_intern(attrs->name));
 		    }
-#elif HAS_PRIVATE_ENCODING
-		    if (Qnil != pi->options->rb_enc) {
-			VALUE	rstr = rb_str_new2(attrs->name);
-
-			rb_funcall(rstr, ox_force_encoding_id, 1, pi->options->rb_enc);
-			sym = rb_funcall(rstr, ox_to_sym_id, 0);
-		    } else {
-			sym = ID2SYM(rb_intern(attrs->name));
-		    }
 #else
 		    sym = ID2SYM(rb_intern(attrs->name));
 #endif
@@ -348,25 +302,17 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 		}
 	    } else {
 		sym = rb_str_new2(attrs->name);
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 		if (0 != pi->options->rb_enc) {
 		    rb_enc_associate(sym, pi->options->rb_enc);
 		}
-#elif HAS_PRIVATE_ENCODING
-		if (Qnil != pi->options->rb_enc) {
-		    rb_funcall(sym, ox_force_encoding_id, 1, pi->options->rb_enc);
-		}
 #endif
 	    }
             s = rb_str_new2(attrs->value);
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
             if (0 != pi->options->rb_enc) {
                 rb_enc_associate(s, pi->options->rb_enc);
             }
-#elif HAS_PRIVATE_ENCODING
-            if (Qnil != pi->options->rb_enc) {
-		rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-            }
 #endif
             rb_hash_aset(ah, sym, s);
         }
@@ -403,20 +349,13 @@ add_instruct(PInfo pi, const char *name, Attr attrs, const char *content) {
     if (0 != content) {
 	c = rb_str_new2(content);
     }
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
     if (0 != pi->options->rb_enc) {
         rb_enc_associate(s, pi->options->rb_enc);
 	if (0 != content) {
 	    rb_enc_associate(c, pi->options->rb_enc);
 	}
     }
-#elif HAS_PRIVATE_ENCODING
-    if (Qnil != pi->options->rb_enc) {
-	rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-	if (0 != content) {
-	    rb_funcall(c, ox_force_encoding_id, 1, pi->options->rb_enc);
-	}
-    }
 #endif
     inst = rb_obj_alloc(ox_instruct_clas);
     rb_ivar_set(inst, ox_at_value_id, s);
@@ -433,7 +372,7 @@ add_instruct(PInfo pi, const char *name, Attr attrs, const char *content) {
 		sym = rb_funcall(pi->options->attr_key_mod, ox_call_id, 1, rb_str_new2(attrs->name));
 	    } else if (Yes == pi->options->sym_keys) {
 		if (Qundef == (sym = ox_cache_get(ox_symbol_cache, attrs->name, &slot, 0))) {
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 		    if (0 != pi->options->rb_enc) {
 			VALUE	rstr = rb_str_new2(attrs->name);
 
@@ -442,15 +381,6 @@ add_instruct(PInfo pi, const char *name, Attr attrs, const char *content) {
 		    } else {
 			sym = ID2SYM(rb_intern(attrs->name));
 		    }
-#elif HAS_PRIVATE_ENCODING
-		    if (Qnil != pi->options->rb_enc) {
-			VALUE	rstr = rb_str_new2(attrs->name);
-
-			rb_funcall(rstr, ox_force_encoding_id, 1, pi->options->rb_enc);
-			sym = rb_funcall(rstr, ox_to_sym_id, 0);
-		    } else {
-			sym = ID2SYM(rb_intern(attrs->name));
-		    }
 #else
 		    sym = ID2SYM(rb_intern(attrs->name));
 #endif
@@ -461,25 +391,17 @@ add_instruct(PInfo pi, const char *name, Attr attrs, const char *content) {
 		}
 	    } else {
 		sym = rb_str_new2(attrs->name);
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
 		if (0 != pi->options->rb_enc) {
 		    rb_enc_associate(sym, pi->options->rb_enc);
 		}
-#elif HAS_PRIVATE_ENCODING
-		if (Qnil != pi->options->rb_enc) {
-		    rb_funcall(sym, ox_force_encoding_id, 1, pi->options->rb_enc);
-		}
 #endif
 	    }
             s = rb_str_new2(attrs->value);
-#if HAS_ENCODING_SUPPORT
+#if HAVE_RB_ENC_ASSOCIATE
             if (0 != pi->options->rb_enc) {
                 rb_enc_associate(s, pi->options->rb_enc);
             }
-#elif HAS_PRIVATE_ENCODING
-	    if (Qnil != pi->options->rb_enc) {
-		rb_funcall(s, ox_force_encoding_id, 1, pi->options->rb_enc);
-	    }
 #endif
             rb_hash_aset(ah, sym, s);
         }