ox 2.14.17 → 2.14.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b849217680d29abfe528da7bd89f0d5b2700f19a28dd09ed176a663f4cd35ab
-  data.tar.gz: 1a4690fc380ca55710b5ddf1d862503a1e6ef7cdfa9a5ebfb973c9c5b4ed6ea4
+  metadata.gz: fd178b1fd415d3a97ef3b60e73896d52fd3eea1e9ef7a32dd0de316e00a21542
+  data.tar.gz: f9813bab8a071e6ba9efa07a92c228d3ea783a29503cfc763e72e73220899fe8
 SHA512:
-  metadata.gz: 98b13052c1015400d8bbec0f79525562eb6e47e21826ca7c89b9197096ead85701211139be6562e5a72d411a47f75d0bb8c354b9ccc28e9c9eaf05ac897dc8ce
-  data.tar.gz: 94ea365ef3cd0a40e36d743b15b0d587748f0d26df8fcb1a9d660c431c6179011fc3531dc559bea95ea5f5b3594907b17f5f1369c0ac5f660ad657f21c286a04
+  metadata.gz: 1a7cfc1bfbe0693f52f66f662d4f0f8eeabe20bc50ddefb854abde16e1f1e1c8236b64a2c1ebd51d6de18a697f588ff4d60f854e7b50b383db14ad6eed57ae92
+  data.tar.gz: ae9344f3607e94721eafda29f7255be6a36a0340dd4de3b03d249e616126ec340f5c9485f855ba342f33c951d7153c1b47e0b95aaada4e1936741f2b6755452c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.18] - 2024-03-21
+
+### Fixed
+
+- UTF8 element names now load correctly thansk to @Uelb.
+
 ## [2.14.17] - 2023-07-14
 
 ### Fixed

data/ext/ox/hash_load.c

@@ -93,14 +93,26 @@ static void add_str(PInfo pi, VALUE s) {
 }
 
 static void add_text(PInfo pi, char *text, int closed) {
-    add_str(pi, rb_str_new2(text));
+    VALUE s = rb_str_new2(text);
+    if (0 != pi->options->rb_enc) {
+        rb_enc_associate(s, pi->options->rb_enc);
+    }
+    add_str(pi, s);
 }
 
 static void add_cdata(PInfo pi, const char *text, size_t len) {
-    add_str(pi, rb_str_new(text, len));
+    VALUE s = rb_str_new2(text);
+    if (0 != pi->options->rb_enc) {
+        rb_enc_associate(s, pi->options->rb_enc);
+    }
+    add_str(pi, s);
 }
 
 static void add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
+    VALUE s = rb_str_new2(ename);
+    if (0 != pi->options->rb_enc) {
+        rb_enc_associate(s, pi->options->rb_enc);
+    }
     if (helper_stack_empty(&pi->helpers)) {
         create_top(pi);
     }
@@ -111,12 +123,14 @@ static void add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren
         volatile VALUE a;
 
         for (; 0 != attrs->name; attrs++) {
+            key = rb_str_new2(attrs->name);
+            if (0 != pi->options->rb_enc) {
+                rb_enc_associate(key, pi->options->rb_enc);
+            }
             if (Qnil != pi->options->attr_key_mod) {
-                key = rb_funcall(pi->options->attr_key_mod, ox_call_id, 1, rb_str_new2(attrs->name));
+                key = rb_funcall(pi->options->attr_key_mod, ox_call_id, 1, key);
             } else if (Yes == pi->options->sym_keys) {
-                key = rb_id2sym(rb_intern(attrs->name));
-            } else {
-                key = rb_str_new2(attrs->name);
+                key = rb_id2sym(rb_intern_str(key));
             }
             val = rb_str_new2(attrs->value);
             if (0 != pi->options->rb_enc) {
@@ -127,17 +141,21 @@ static void add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren
         a = rb_ary_new();
         rb_ary_push(a, h);
         mark_value(pi, a);
-        helper_stack_push(&pi->helpers, rb_intern(ename), a, ArrayCode);
+        helper_stack_push(&pi->helpers, rb_intern_str(s), a, ArrayCode);
     } else {
-        helper_stack_push(&pi->helpers, rb_intern(ename), Qnil, NoCode);
+        helper_stack_push(&pi->helpers, rb_intern_str(s), Qnil, NoCode);
     }
 }
 
 static void add_element_no_attrs(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
+    VALUE s = rb_str_new2(ename);
+    if (0 != pi->options->rb_enc) {
+        rb_enc_associate(s, pi->options->rb_enc);
+    }
     if (helper_stack_empty(&pi->helpers)) {
         create_top(pi);
     }
-    helper_stack_push(&pi->helpers, rb_intern(ename), Qnil, NoCode);
+    helper_stack_push(&pi->helpers, rb_intern_str(s), Qnil, NoCode);
 }
 
 static int umark_hash_cb(VALUE key, VALUE value, VALUE x) {
@@ -224,8 +242,22 @@ static void finish(PInfo pi) {
     xfree(pi->marked);
 }
 
+static void set_encoding_from_instruct(PInfo pi, Attr attrs) {
+    for (; 0 != attrs->name; attrs++) {
+        if (0 == strcmp("encoding", attrs->name)) {
+            pi->options->rb_enc = rb_enc_find(attrs->value);
+        }
+    }
+}
+
+static void instruct(PInfo pi, const char *target, Attr attrs, const char *content) {
+    if (0 == strcmp("xml", target)) {
+        set_encoding_from_instruct(pi, attrs);
+    }
+}
+
 struct _parseCallbacks _ox_hash_callbacks = {
-    NULL,
+    instruct,
     NULL,
     NULL,
     NULL,
@@ -238,7 +270,7 @@ struct _parseCallbacks _ox_hash_callbacks = {
 ParseCallbacks ox_hash_callbacks = &_ox_hash_callbacks;
 
 struct _parseCallbacks _ox_hash_cdata_callbacks = {
-    NULL,
+    instruct,
     NULL,
     NULL,
     add_cdata,
@@ -251,7 +283,7 @@ struct _parseCallbacks _ox_hash_cdata_callbacks = {
 ParseCallbacks ox_hash_cdata_callbacks = &_ox_hash_cdata_callbacks;
 
 struct _parseCallbacks _ox_hash_no_attrs_callbacks = {
-    NULL,
+    instruct,
     NULL,
     NULL,
     NULL,
@@ -264,7 +296,7 @@ struct _parseCallbacks _ox_hash_no_attrs_callbacks = {
 ParseCallbacks ox_hash_no_attrs_callbacks = &_ox_hash_no_attrs_callbacks;
 
 struct _parseCallbacks _ox_hash_no_attrs_cdata_callbacks = {
-    NULL,
+    instruct,
     NULL,
     NULL,
     add_cdata,

data/ext/ox/ox.h

@@ -146,7 +146,7 @@ struct _pInfo {
     VALUE              *marked;
     int                 mark_size;  // allocated size
     int                 mark_cnt;
-    char                last;       // last character read, rarely set
+    char                last;  // last character read, rarely set
 };
 
 extern VALUE ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options, Err err);

data/ext/ox/parse.c

@@ -167,7 +167,7 @@ ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options
             helper_stack_cleanup(&pi.helpers);
             return Qnil;
         }
-        pi.s++;    // past <
+        pi.s++;  // past <
         switch (*pi.s) {
         case '?':  // processing instruction
             pi.s++;

data/ext/ox/sax.c

@@ -1219,7 +1219,7 @@ static char read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml,
             c = buf_next_non_white(&dr->buf);
         }
         if ('=' != c) {
-	    // TBD allow in smart mode
+            // TBD allow in smart mode
             if (eq_req) {
                 dr->err = 1;
                 return c;
@@ -1328,7 +1328,7 @@ static char read_quoted_value(SaxDrive dr, bool inst) {
     dr->buf.str = dr->buf.tail - 1;
     // TBD if smart or html then no error
     if (!(dr->options.smart && ox_hints_html() != dr->options.hints)) {
-	ox_sax_drive_error(dr, WRONG_CHAR "attribute value not in quotes");
+        ox_sax_drive_error(dr, WRONG_CHAR "attribute value not in quotes");
     }
     while ('\0' != (c = buf_get(&dr->buf))) {
         switch (c) {
@@ -1341,12 +1341,12 @@ static char read_quoted_value(SaxDrive dr, bool inst) {
             *(dr->buf.tail - 1) = '\0'; /* terminate value */
             // dr->buf.tail is in the correct position, one after the word terminator
             return c;
-        case '?':  // for instructions
-	    if (inst) {
-		*(dr->buf.tail - 1) = '\0'; /* terminate value */
-		return c;
-	    }
-	    break;
+        case '?':
+            if (inst) {
+                *(dr->buf.tail - 1) = '\0'; /* terminate value */
+                return c;
+            }
+            break;
         default: break;
         }
     }

data/ext/ox/sax_buf.c

@@ -79,7 +79,7 @@ int ox_sax_buf_read(Buf buf) {
         } else {
             shift = buf->pro - buf->head - 1;  // leave one character so we cab backup one
         }
-        if (0 >= shift) {                      /* no space left so allocate more */
+        if (0 >= shift) { /* no space left so allocate more */
             char  *old  = buf->head;
             size_t size = buf->end - buf->head + BUF_PAD;
 

data/ext/ox/slotcache.c

@@ -82,8 +82,8 @@ slot_cache_get(SlotCache cache, const char *key, VALUE **slot, const char **keyp
                     orig->key    = form_key(key);
                     orig->value  = Qundef;
                 }
-            } else {                                                           /* not exact match but on the path */
-                if (0 != cache->key) {                                         /* there is a key/value here already */
+            } else {                   /* not exact match but on the path */
+                if (0 != cache->key) { /* there is a key/value here already */
                     if (depth == *cache->key || (255 <= depth && 0 == strncmp(cache->key, key, depth) &&
                                                  '\0' == cache->key[depth])) { /* key belongs here */
                         continue;

data/lib/ox/version.rb

@@ -1,4 +1,4 @@
 module Ox
   # Current version of the module.
-  VERSION = '2.14.17'
+  VERSION = '2.14.18'
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.17
+  version: 2.14.18
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2024-03-21 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.
   It was designed to be an alternative to Nokogiri and other Ruby\nXML parsers for
@@ -125,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.