ox 2.14.19 → 2.14.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f79925bdad366a8453ecda24602c7372371b5ac90363def31f7a21c5f46e85a
-  data.tar.gz: 1d88152e72cd654b215592b9874f6cf4c018853fcbfe3a5e3a37aa4f15a7d0f1
+  metadata.gz: 90ae9618a50e6028cfaa556e88975ddc3a6f38572732326ea27145141b3b892d
+  data.tar.gz: 24dc5e56d8b1cffe5b2125cb530a68784b4d3d59ace2aa67c8511461b727313a
 SHA512:
-  metadata.gz: ed6c242bf2a70049e9af314614fc9c47f51fb4740a1fdb4785fa693d1c93586bf10b4a1c73ba60e6e88c39c6b6b6d283b324ffbd27cac51e915a1fc48c69b5a0
-  data.tar.gz: 8c0d35c215e6720fff4c82cb711f9f9991b6dfcd91c4ec1c74ac656c52ef1cb74fcc93a4171fbbe28b09aee0ceefe8c50173d20af4935321207db93f45009b18
+  metadata.gz: 3a8d4307b4864e47719d0beaa06639cbad02ef7acca448a78161ed44ca97309895a35f14d674effe72060a86e10df4937cc2dcf08241701064bbf23fecaf7b3e
+  data.tar.gz: 943e7ef226e58cefb34745e8dc58242e1338e5d671faad42427911ed11199243fe333457a5c21a3de8b23e906cf4bb9e1bff7070e81b42cf6ddd2d3cba01a6b3

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.21] - 2025-01-15
+
+### Fixed
+
+- Removed internal dependency on BigDecimal. If BigDecimal is use it
+  must now be included in the calling code. This was forced by the
+  change in BigDecimal no longer being included in the Ruby core.
+
+## [2.14.20] - 2025-01-12
+
+### Fixed
+
+- The instruction encoding attribute is now used to set the encoding in the `:limited` mode.
+
 ## [2.14.19] - 2024-12-25
 
 ### Fixed

data/ext/ox/ox.c

@@ -87,7 +87,6 @@ VALUE ox_sym_bank;  // Array
 
 VALUE ox_arg_error_class;
 VALUE ox_bag_clas;
-VALUE ox_bigdecimal_class;
 VALUE ox_cdata_clas;
 VALUE ox_comment_clas;
 VALUE ox_raw_clas;
@@ -1399,7 +1398,7 @@ void Init_ox(void) {
 
     rb_require("time");
     rb_require("date");
-    rb_require("bigdecimal");
+    // rb_require("bigdecimal");
     rb_require("stringio");
 
     ox_abort_id             = rb_intern("abort");
@@ -1471,7 +1470,6 @@ void Init_ox(void) {
     ox_arg_error_class    = rb_const_get_at(Ox, rb_intern("ArgError"));
     ox_struct_class       = rb_const_get(rb_cObject, rb_intern("Struct"));
     ox_stringio_class     = rb_const_get(rb_cObject, rb_intern("StringIO"));
-    ox_bigdecimal_class   = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
 
     abort_sym = ID2SYM(rb_intern("abort"));
     rb_gc_register_address(&abort_sym);
@@ -1589,7 +1587,6 @@ void Init_ox(void) {
     rb_gc_register_address(&ox_arg_error_class);
     rb_gc_register_address(&ox_bag_clas);
     rb_gc_register_address(&ox_bag_clas);
-    rb_gc_register_address(&ox_bigdecimal_class);
     rb_gc_register_address(&ox_cdata_clas);
     rb_gc_register_address(&ox_cdata_clas);
     rb_gc_register_address(&ox_comment_clas);

data/ext/ox/ox.h

@@ -218,7 +218,6 @@ extern VALUE ox_sym_bank;  // Array
 extern VALUE ox_version_sym;
 extern VALUE ox_zero_fixnum;
 
-extern VALUE ox_bigdecimal_class;
 extern VALUE ox_date_class;
 extern VALUE ox_stringio_class;
 extern VALUE ox_struct_class;

data/ext/ox/parse.c

@@ -342,6 +342,15 @@ DONE:
         } else {
             pi->pcb->instruct(pi, target, attrs.head, content_ptr);
         }
+    } else {
+        for (Attr a = attrs.head; a < attrs.tail; a++) {
+            if (0 == strcasecmp(a->name, "encoding")) {
+                strncpy(pi->options->encoding, a->value, sizeof(pi->options->encoding) - 1);
+                pi->options->encoding[sizeof(pi->options->encoding) - 1] = '\0';
+                pi->options->rb_enc                                      = rb_enc_find(a->value);
+                break;
+            }
+        }
     }
     attr_stack_cleanup(&attrs);
     if (content_ptr != content) {

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.19
+  version: 2.14.21
 platform: ruby
 authors:
 - Peter Ohler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -52,7 +51,6 @@ 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
@@ -100,7 +98,6 @@ metadata:
   homepage_uri: http://www.ohler.com/ox/
   source_code_uri: https://github.com/ohler55/ox
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -125,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []

data/ext/ox/foo.h

@@ -1,204 +0,0 @@
-/* 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 */