ox 2.14.22 → 2.14.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ea7796d81dd5eeab479adb5adcc99a9ee3d9833d3e530beb632aaaf6d0f0c3
-  data.tar.gz: 1610339dd1e860bcbaafa2fbdd96622cac9454e825fba6e790ed2c3ae55e77c0
+  metadata.gz: 444d4c71c0158602ab3da3916298a9acd7ad5acf63ca3e13a3b6cd443305a252
+  data.tar.gz: f88a970f2313edd5770fdb944b66795442a7f81a8bf1c4b68940b14790c0243b
 SHA512:
-  metadata.gz: e508b4efc21f5518962b7ef5145a9930f77fab6da2b5e45b3ea9ab414e373f905464a12b42d30e3bb6e140a4e4d151e0b40b918849b26c2ba0b0e2ae81f12a75
-  data.tar.gz: 339917575070ef9e6db27f42763d1c28f485ca3db33d28d74627d32cdaaba8417d3c5c4d0e9298d0c8a6a34e80e48d2fff970dbe0fad9d94e4371608f9a76fb1
+  metadata.gz: 25ea7cb714850534fcf45c3df80ae3b36edbc16776c8767f7ea19523a62b72c7da8756e1d2e8636cdc85420e52a40931ab12b006af5c7fb4c7eea76badc455af
+  data.tar.gz: ffba2a2a6295ae7020bfa6c29edbb591a62435d3d76ff76195b490dd0ab5324bd3799d8c771bd0672fb7afee9e3efe3943fe6db636941e4b69607b3b914adf28

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.24] - 2026-04-20
+
+### Fixed
+
+- Bundler load issue #389
+
+## [2.14.23] - 2025-05-27
+
+### Changed
+
+- Comments are no longer space padded to be similar with other XML writers.
+
 ## [2.14.22] - 2025-02-11
 
 ### Fixed

data/ext/ox/dump.c

@@ -1080,6 +1080,9 @@ static void dump_gen_instruct(VALUE obj, int depth, Out out) {
     *out->cur++ = '?';
     fill_value(out, name, nlen);
     if (0 != content) {
+        if (' ' != *content) {
+            dump_value(out, " ", 1);
+        }
         fill_value(out, content, clen);
     } else if (Qnil != attrs) {
         rb_hash_foreach(attrs, dump_gen_attr, (VALUE)out);
@@ -1112,7 +1115,7 @@ static int dump_gen_nodes(VALUE obj, int depth, Out out) {
                 dump_str_value(out, StringValuePtr(*(VALUE *)np), RSTRING_LEN(*np), xml_element_chars);
                 indent_needed = (1 == cnt) ? 0 : 1;
             } else if (ox_comment_clas == clas) {
-                dump_gen_val_node(*np, d2, "<!-- ", 5, " -->", 4, out);
+                dump_gen_val_node(*np, d2, "<!--", 4, "-->", 3, out);
             } else if (ox_raw_clas == clas) {
                 dump_gen_val_node(*np, d2, "", 0, "", 0, out);
             } else if (ox_cdata_clas == clas) {
@@ -1210,6 +1213,14 @@ static void dump_obj_to_xml(VALUE obj, Options copts, Out out) {
         dump_gen_doc(obj, -1, out);
     } else if (ox_element_clas == clas) {
         dump_gen_element(obj, 0, out);
+    } else if (ox_cdata_clas == clas) {
+        dump_gen_val_node(obj, 0, "<![CDATA[", 9, "]]>", 3, out);
+    } else if (ox_instruct_clas == clas) {
+        dump_gen_instruct(obj, 0, out);
+    } else if (ox_comment_clas == clas) {
+        dump_gen_val_node(obj, 0, "<!--", 4, "-->", 3, out);
+    } else if (ox_doctype_clas == clas) {
+        dump_gen_val_node(obj, 0, "<!DOCTYPE ", 10, ">", 1, out);
     } else {
         out->w_start = dump_start;
         out->w_end   = dump_end;

data/ext/ox/extconf.rb

@@ -42,6 +42,6 @@ have_header('sys/uio.h')
 
 have_struct_member('struct tm', 'tm_gmtoff')
 
-create_makefile(extension_name)
+create_makefile("ox/#{extension_name}")
 
 `make clean`

data/ext/ox/foo.h

@@ -0,0 +1,204 @@
+/* sax_buf.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ */
+
+#ifndef OX_SAX_BUF_H
+#define OX_SAX_BUF_H
+
+#include <stdio.h>
+
+typedef struct _buf {
+    char  base[0x00001000];
+    char *head;
+    char *end;
+    char *tail;
+    char *read_end; /* one past last character read */
+    char *pro;      /* protection start, buffer can not slide past this point */
+    char *str;      /* start of current string being read */
+    off_t pos;
+    off_t line;
+    off_t col;
+    off_t pro_pos;
+    off_t pro_line;
+    off_t pro_col;
+    int (*read_func)(struct _buf *buf);
+    union {
+        int         fd;
+        VALUE       io;
+        const char *str;
+    } in;
+    struct _saxDrive *dr;
+} *Buf;
+
+typedef struct _checkPt {
+    off_t pro_dif;
+    off_t pos;
+    off_t line;
+    off_t col;
+    char  c;
+} *CheckPt;
+
+#define CHECK_PT_INIT {-1, 0, 0, 0, '\0'}
+
+extern void ox_sax_buf_init(Buf buf, VALUE io);
+extern int  ox_sax_buf_read(Buf buf);
+
+static inline char buf_get(Buf buf) {
+    // printf("*** drive get from '%s'  from start: %ld  buf: %p  from read_end: %ld\n", buf->tail, buf->tail -
+    // buf->head, buf->head, buf->read_end - buf->tail);
+    if (buf->read_end <= buf->tail) {
+        if (0 != ox_sax_buf_read(buf)) {
+            return '\0';
+        }
+    }
+    if ('\n' == *buf->tail) {
+        buf->line++;
+        buf->col = 0;
+    } else {
+        buf->col++;
+    }
+    buf->pos++;
+
+    return *buf->tail++;
+}
+
+static inline void buf_backup(Buf buf) {
+    buf->tail--;
+    buf->col--;
+    buf->pos--;
+    if (0 >= buf->col) {
+        buf->line--;
+        // allow col to be negative since we never backup twice in a row
+    }
+}
+
+static inline void buf_protect(Buf buf) {
+    buf->pro      = buf->tail;
+    buf->str      = buf->tail;  // can't have str before pro
+    buf->pro_pos  = buf->pos;
+    buf->pro_line = buf->line;
+    buf->pro_col  = buf->col;
+}
+
+static inline void buf_reset(Buf buf) {
+    buf->tail = buf->pro;
+    buf->pos  = buf->pro_pos;
+    buf->line = buf->pro_line;
+    buf->col  = buf->pro_col;
+}
+
+/* Starts by reading a character so it is safe to use with an empty or
+ * compacted buffer.
+ */
+static inline char buf_next_non_white(Buf buf) {
+    char c;
+
+    while ('\0' != (c = buf_get(buf))) {
+        switch (c) {
+        case ' ':
+        case '\t':
+        case '\f':
+        case '\n':
+        case '\r': break;
+        default: return c;
+        }
+    }
+    return '\0';
+}
+
+/* Starts by reading a character so it is safe to use with an empty or
+ * compacted buffer.
+ */
+static inline char buf_next_white(Buf buf) {
+    char c;
+
+    while ('\0' != (c = buf_get(buf))) {
+        switch (c) {
+        case ' ':
+        case '\t':
+        case '\f':
+        case '\n':
+        case '\r':
+        case '\0': return c;
+        default: break;
+        }
+    }
+    return '\0';
+}
+
+static inline void buf_cleanup(Buf buf) {
+    if (buf->base != buf->head && 0 != buf->head) {
+        xfree(buf->head);
+        buf->head = 0;
+    }
+}
+
+static inline int is_white(char c) {
+    switch (c) {
+    case ' ':
+    case '\t':
+    case '\f':
+    case '\n':
+    case '\r': return 1;
+    default: break;
+    }
+    return 0;
+}
+
+static inline void buf_checkpoint(Buf buf, CheckPt cp) {
+    cp->pro_dif = (int)(buf->tail - buf->pro);
+    cp->pos     = buf->pos;
+    cp->line    = buf->line;
+    cp->col     = buf->col;
+    cp->c       = *(buf->tail - 1);
+}
+
+static inline int buf_checkset(CheckPt cp) {
+    return (0 <= cp->pro_dif);
+}
+
+static inline char buf_checkback(Buf buf, CheckPt cp) {
+    buf->tail = buf->pro + cp->pro_dif;
+    buf->pos  = cp->pos;
+    buf->line = cp->line;
+    buf->col  = cp->col;
+    return cp->c;
+}
+
+static inline void buf_collapse_return(char *str) {
+    char *s    = str;
+    char *back = str;
+
+    for (; '\0' != *s; s++) {
+        if (back != str && '\n' == *s && '\r' == *(back - 1)) {
+            *(back - 1) = '\n';
+        } else {
+            *back++ = *s;
+        }
+    }
+    *back = '\0';
+}
+
+static inline void buf_collapse_white(char *str) {
+    char *s    = str;
+    char *back = str;
+
+    for (; '\0' != *s; s++) {
+        switch (*s) {
+        case ' ':
+        case '\t':
+        case '\f':
+        case '\n':
+        case '\r':
+            if (back == str || ' ' != *(back - 1)) {
+                *back++ = ' ';
+            }
+            break;
+        default: *back++ = *s; break;
+        }
+    }
+    *back = '\0';
+}
+
+#endif /* OX_SAX_BUF_H */

data/lib/ox/element.rb

@@ -278,7 +278,7 @@ module Ox
 
           i += 1
           qual = step[i..i] # step[i] would be better but some rubies (jruby, ree, rbx) take that as a Fixnum.
-          if '0' <= qual and qual <= '9'
+          if qual.between?('0', '9')
             qual = '+'
           else
             i += 1
@@ -359,7 +359,7 @@ module Ox
 
           i += 1
           qual = step[i..i] # step[i] would be better but some rubies (jruby, ree, rbx) take that as a Fixnum.
-          if '0' <= qual and qual <= '9'
+          if qual.between?('0', '9')
             qual = '+'
           else
             i += 1

data/lib/ox/version.rb

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

data/lib/ox.rb

@@ -76,8 +76,4 @@ require 'ox/bag'
 require 'ox/sax'
 
 # C extension
-begin
-  require_relative 'ox.so'
-rescue LoadError
-  require 'ox/ox'
-end
+require 'ox/ox'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.22
+  version: 2.14.24
 platform: ruby
 authors:
 - Peter Ohler
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -32,8 +32,8 @@ executables: []
 extensions:
 - ext/ox/extconf.rb
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE
@@ -51,6 +51,7 @@ files:
 - ext/ox/err.c
 - ext/ox/err.h
 - ext/ox/extconf.rb
+- ext/ox/foo.h
 - ext/ox/gen_load.c
 - ext/ox/hash_load.c
 - ext/ox/helper.h
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []