apex-ruby 1.0.34 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f4be7471b1a5d14cc4f772e5a92fed588dfa22f746d2ebc8417fb9b13758d7
-  data.tar.gz: 27aa2109e8bdad8f123f5cdfd6f7dee7a56947f4f47a06d653ca6fde9adf558c
+  metadata.gz: f0e8b147ca76e15cc47b7c82389cd32c925aabdb84580155ca98ea9cadaa4e94
+  data.tar.gz: 7b6c52d126e87e1d7adbd22a5eb4c0371617b056b6a8a8b019edea8f78328ee2
 SHA512:
-  metadata.gz: e3d8fb224ae6eaebe856a9651319c806e3031d3720a7261c264063f8f0777dd522a8547175dfdd393bb83aafb1f5a7ad8b7ee7a49d18cdae9124f279051e7bf9
-  data.tar.gz: a60e981f839d51dae0b93e4e088ba43fe575800b951e85d97b35379af434a93ef968d84ebcab74e137dd916023682ff06b1023c4a14574a0224a720490054c88
+  metadata.gz: a24d7c5056504ad6557c259f62f4f7aa7f83f4214675793415587ad040affe6095a830a60a65387b76d0d3138ebfc659a100406dda633f4f426fab67d1d0043b
+  data.tar.gz: 3e9a435b4f1d0e3539d90ed2448b646843d7b9a8b300baa032c72dc5ba12d1d9e4f881ac588e50102df688e51d7f994cdb0bfc88f355f0149baed824e8bb82f3

data/README.md

@@ -6,7 +6,15 @@ Apex is a C library that supports CommonMark, GFM, MultiMarkdown, Kramdown, and
 Marked-specific extensions. This gem vendors the Apex sources (currently the **1.1.x** library)
 and exposes a small, kramdown-style Ruby API for converting Markdown to HTML.
 
-Query the underlying C library version with `Apex::Native.version`.
+The gem has its own version number, separate from the Apex library it bundles. Each gem
+release ships the latest Apex release, and `Apex::Native.version` reports which one you have:
+
+```ruby
+require "apex"
+
+Apex::VERSION         # => "1.0.34" (the gem)
+Apex::Native.version  # => "1.1.36" (the bundled Apex library)
+```
 
 ## Requirements
 

data/ext/apex_ext/apex_src/include/apex/apex.h

@@ -21,8 +21,8 @@ typedef struct cmark_node cmark_node;
 
 #define APEX_VERSION_MAJOR 1
 #define APEX_VERSION_MINOR 1
-#define APEX_VERSION_PATCH 36
-#define APEX_VERSION_STRING "1.1.36"
+#define APEX_VERSION_PATCH 38
+#define APEX_VERSION_STRING "1.1.38"
 
 /**
  * Processor compatibility modes

data/ext/apex_ext/apex_src/src/extensions/toc.c

@@ -364,6 +364,32 @@ static header_item *collect_headers(cmark_node *node, header_item **tail,
     return headers;
 }
 
+typedef struct {
+    char *data;
+    size_t length;
+    size_t capacity;
+    bool failed;
+} toc_buffer;
+
+static void toc_buffer_append(toc_buffer *buf, const char *str) {
+    if (buf->failed || !str) return;
+    size_t len = strlen(str);
+    if (buf->length + len + 1 > buf->capacity) {
+        size_t capacity = buf->capacity ? buf->capacity : 4096;
+        while (buf->length + len + 1 > capacity) capacity *= 2;
+        char *grown = realloc(buf->data, capacity);
+        if (!grown) {
+            buf->failed = true;
+            return;
+        }
+        buf->data = grown;
+        buf->capacity = capacity;
+    }
+    memcpy(buf->data + buf->length, str, len);
+    buf->length += len;
+    buf->data[buf->length] = '\0';
+}
+
 /**
  * Generate TOC HTML from headers
  * Produces valid ul > li > ul nesting (nested lists inside list items)
@@ -371,81 +397,64 @@ static header_item *collect_headers(cmark_node *node, header_item **tail,
 static char *generate_toc_html(header_item *headers, int min_level, int max_level) {
     if (!headers) return strdup("");
 
-    size_t capacity = 4096;
-    char *html = malloc(capacity);
-    if (!html) return strdup("");
+    toc_buffer buf = {0};
+    /* depth: open <ul> elements. level_at[d] is the shallowest heading level
+     * listed at depth d. A deeper heading nests one level under the open <li>,
+     * however many heading levels it skips; headings at that same level stay
+     * siblings. */
+    int depth = 0;
+    int level_at[8] = {0};
+    bool li_open = false;
 
-    char *write = html;
-    size_t remaining = capacity;
-    int current_level = 0;
-    int last_level = 0;  /* normalized level of last item added (0 = none yet) */
-
-    #define APPEND(str) do { \
-        size_t len = strlen(str); \
-        if (len < remaining) { \
-            memcpy(write, str, len); \
-            write += len; \
-            remaining -= len; \
-        } \
-    } while(0)
-
-    APPEND("<nav class=\"toc\">\n");
+    toc_buffer_append(&buf, "<nav class=\"toc\">\n");
 
     for (header_item *h = headers; h; h = h->next) {
-        /* Skip headers outside min/max range */
         if (h->level < min_level || h->level > max_level) continue;
         int target_level = h->level - min_level + 1;
         if (target_level < 1) target_level = 1;
 
-        /* Going up: close </ul></li> for each level (nested ul inside parent li) */
-        while (current_level > target_level) {
-            APPEND("</ul>\n</li>\n");
-            current_level--;
-        }
-
-        /* Going down: open one <ul> inside the previous li before adding child.
-         * At root (current_level 0): only open one ul - never ul > ul.
-         * When going deeper: open exactly one ul per step - never ul > ul. */
-        while (current_level < target_level) {
-            if (current_level == 0) {
-                APPEND("<ul>\n");
-                current_level = 1;
-                break;
-            }
-            if (last_level > 0) {
-                APPEND("<ul>\n");
-                current_level++;
-                break;
-            } else {
-                break;  /* No parent li - add as direct child of root ul */
+        if (depth == 0) {
+            toc_buffer_append(&buf, "<ul>\n");
+            depth = 1;
+            level_at[depth] = target_level;
+        } else if (target_level > level_at[depth] && li_open && depth < 7) {
+            toc_buffer_append(&buf, "<ul>\n");
+            depth++;
+            level_at[depth] = target_level;
+            li_open = false;
+        } else {
+            while (depth > 1 && target_level <= level_at[depth - 1]) {
+                if (li_open) toc_buffer_append(&buf, "</li>\n");
+                toc_buffer_append(&buf, "</ul>\n");
+                depth--;
+                li_open = true;
             }
+            if (li_open) toc_buffer_append(&buf, "</li>\n");
+            if (target_level < level_at[depth]) level_at[depth] = target_level;
         }
 
-        /* Close previous li when adding sibling (same or shallower level) */
-        if (last_level > 0 && target_level <= last_level) {
-            APPEND("</li>\n");
-        }
-
-        /* Add list item (leave open - may contain nested ul) */
-        char item[1024];
-        snprintf(item, sizeof(item), "<li><a href=\"#%s\">%s</a>",
-                 h->id, h->text);
-        APPEND(item);
-        last_level = target_level;
+        toc_buffer_append(&buf, "<li><a href=\"#");
+        toc_buffer_append(&buf, h->id);
+        toc_buffer_append(&buf, "\">");
+        toc_buffer_append(&buf, h->text);
+        toc_buffer_append(&buf, "</a>");
+        li_open = true;
     }
 
-    /* Close remaining: </li></ul> for each open level */
-    while (current_level > 0) {
-        APPEND("</li>\n</ul>\n");
-        current_level--;
+    while (depth > 0) {
+        if (li_open) toc_buffer_append(&buf, "</li>\n");
+        toc_buffer_append(&buf, "</ul>\n");
+        depth--;
+        li_open = depth > 0;
     }
 
-    APPEND("</nav>\n");
+    toc_buffer_append(&buf, "</nav>\n");
 
-    #undef APPEND
-
-    *write = '\0';
-    return html;
+    if (buf.failed || !buf.data) {
+        free(buf.data);
+        return strdup("");
+    }
+    return buf.data;
 }
 
 void apex_toc_entries_free(apex_toc_entry *entries, size_t count) {

data/ext/apex_ext/apex_src/src/html_renderer.c

@@ -2473,6 +2473,41 @@ char *apex_adjust_quote_language(const char *html, const char *quotes_language)
     return output;
 }
 
+typedef struct {
+    char *data;
+    size_t len;
+    size_t cap;
+} aria_buf;
+
+static bool aria_buf_append(aria_buf *b, const char *s, size_t n) {
+    if (b->len + n + 1 > b->cap) {
+        size_t new_cap = b->cap ? b->cap : 64;
+        while (b->len + n + 1 > new_cap) new_cap *= 2;
+        char *grown = realloc(b->data, new_cap);
+        if (!grown) return false;
+        b->data = grown;
+        b->cap = new_cap;
+    }
+    memcpy(b->data + b->len, s, n);
+    b->len += n;
+    b->data[b->len] = '\0';
+    return true;
+}
+
+/* strstr limited to [start, end) */
+static const char *aria_find_in(const char *start, const char *end, const char *needle) {
+    size_t n = strlen(needle);
+    for (const char *p = start; p && p + n <= end; p++) {
+        if (*p == *needle && memcmp(p, needle, n) == 0) return p;
+    }
+    return NULL;
+}
+
+static bool aria_has_table_figure_class(const char *start, const char *end) {
+    return aria_find_in(start, end, "class=\"table-figure\"") ||
+           aria_find_in(start, end, "class='table-figure'");
+}
+
 /**
  * Apply ARIA labels and accessibility attributes to HTML output
  * @param html The HTML output
@@ -2512,11 +2547,7 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
                 const char *figure_start_pos = NULL;
                 while (before_cap >= html && before_cap > search - 200) {
                     if (*before_cap == '<' && strncmp(before_cap, "<figure", 7) == 0) {
-                        const char *class_check = strstr(before_cap, "class=\"table-figure\"");
-                        if (!class_check) {
-                            class_check = strstr(before_cap, "class='table-figure'");
-                        }
-                        if (class_check && class_check < cap_tag_start) {
+                        if (aria_has_table_figure_class(before_cap, cap_tag_start)) {
                             in_table_figure = true;
                             figure_start_pos = before_cap;
                             break;
@@ -2527,13 +2558,13 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
 
                 if (in_table_figure) {
                     /* Check if ID already exists */
-                    const char *id_attr = strstr(cap_tag_start, "id=\"");
+                    const char *id_attr = aria_find_in(cap_tag_start, cap_tag_end, "id=\"");
                     if (!id_attr) {
-                        id_attr = strstr(cap_tag_start, "id='");
+                        id_attr = aria_find_in(cap_tag_start, cap_tag_end, "id='");
                     }
 
                     char *caption_id = NULL;
-                    if (id_attr && id_attr < cap_tag_end) {
+                    if (id_attr) {
                         /* Extract existing ID */
                         const char *id_start = id_attr + 4;
                         const char *id_end = strchr(id_start, '"');
@@ -2573,41 +2604,26 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
         search++;
     }
 
-    /* Allocate buffer with extra space for ARIA attributes */
-    size_t capacity = html_len + 2048 + (caption_list ? strlen(caption_list->caption_id) * 10 : 0);
-    char *output = malloc(capacity + 1);
-    if (!output) {
-        /* Free caption list */
-        while (caption_list) {
-            caption_info *next = caption_list->next;
-            free(caption_list->caption_id);
-            free(caption_list);
-            caption_list = next;
-        }
-        return strdup(html);
-    }
+    aria_buf out = {0};
+    out.cap = html_len + html_len / 8 + 256;
+    out.data = malloc(out.cap);
+    if (!out.data) goto oom;
+    out.data[0] = '\0';
 
     const char *read = html;
-    char *write = output;
-    size_t remaining = capacity;
 
-    /* Helper macro to append strings safely */
+    /* Arguments are evaluated before appending so the read position always advances */
+    #define APPEND_N(s, n) do { \
+        if (!aria_buf_append(&out, (s), (n))) goto oom; \
+    } while (0)
     #define APPEND_SAFE(str) do { \
-        size_t len = strlen(str); \
-        if (len <= remaining) { \
-            memcpy(write, str, len); \
-            write += len; \
-            remaining -= len; \
-        } \
-    } while(0)
-
-    /* Helper macro to copy characters safely */
+        const char *str_ = (str); \
+        APPEND_N(str_, strlen(str_)); \
+    } while (0)
     #define COPY_CHAR(c) do { \
-        if (remaining > 0) { \
-            *write++ = (c); \
-            remaining--; \
-        } \
-    } while(0)
+        char c_ = (c); \
+        APPEND_N(&c_, 1); \
+    } while (0)
 
     while (*read) {
         /* Check for <nav class="toc"> */
@@ -2620,29 +2636,16 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
             }
 
             /* Check if this is a TOC nav element */
-            const char *class_attr = strstr(tag_start, "class=\"toc\"");
-            if (!class_attr) {
-                class_attr = strstr(tag_start, "class='toc'");
-            }
-
-            if (class_attr && class_attr < tag_end) {
-                /* Check if aria-label already exists */
-                const char *aria_label = strstr(tag_start, "aria-label=");
-                if (!aria_label || aria_label > tag_end) {
-                    /* Copy up to just before closing >, add aria-label, then close */
-                    size_t prefix_len = tag_end - tag_start;
-                    if (prefix_len <= remaining) {
-                        memcpy(write, tag_start, prefix_len);
-                        write += prefix_len;
-                        remaining -= prefix_len;
-                    }
+            bool is_toc = aria_find_in(tag_start, tag_end, "class=\"toc\"") ||
+                          aria_find_in(tag_start, tag_end, "class='toc'");
 
-                    /* Add aria-label before closing > */
-                    APPEND_SAFE(" aria-label=\"Table of contents\"");
-                    COPY_CHAR('>');
-                    read = tag_end + 1;
-                    continue;
-                }
+            if (is_toc && !aria_find_in(tag_start, tag_end, "aria-label=")) {
+                /* Copy up to just before closing >, add aria-label, then close */
+                APPEND_N(tag_start, (size_t)(tag_end - tag_start));
+                APPEND_SAFE(" aria-label=\"Table of contents\"");
+                COPY_CHAR('>');
+                read = tag_end + 1;
+                continue;
             }
         }
 
@@ -2655,18 +2658,9 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
                 continue;
             }
 
-            /* Check if role already exists */
-            const char *role_attr = strstr(tag_start, "role=");
-            if (!role_attr || role_attr > tag_end) {
+            if (!aria_find_in(tag_start, tag_end, "role=")) {
                 /* Copy up to just before closing >, add role, then close */
-                size_t prefix_len = tag_end - tag_start;
-                if (prefix_len <= remaining) {
-                    memcpy(write, tag_start, prefix_len);
-                    write += prefix_len;
-                    remaining -= prefix_len;
-                }
-
-                /* Add role="figure" before closing > */
+                APPEND_N(tag_start, (size_t)(tag_end - tag_start));
                 APPEND_SAFE(" role=\"figure\"");
                 COPY_CHAR('>');
                 read = tag_end + 1;
@@ -2683,85 +2677,44 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
                 continue;
             }
 
-            /* Check if role already exists */
-            const char *role_attr = strstr(tag_start, "role=");
-            bool needs_role = (!role_attr || role_attr > tag_end);
-
-            /* Check if aria-describedby already exists */
-            const char *aria_desc = strstr(tag_start, "aria-describedby=");
-            bool has_aria_desc = (aria_desc && aria_desc < tag_end);
-
-            /* Check if we're in a table-figure context and look for figcaption */
-            bool in_table_figure = false;
-            const char *before_table = read - 1;
-            while (before_table >= html && before_table > read - 500) {
-                if (*before_table == '<' && strncmp(before_table, "<figure", 7) == 0) {
-                    const char *class_check = strstr(before_table, "class=\"table-figure\"");
-                    if (!class_check) {
-                        class_check = strstr(before_table, "class='table-figure'");
-                    }
-                    if (class_check && class_check < tag_start) {
-                        in_table_figure = true;
+            bool needs_role = !aria_find_in(tag_start, tag_end, "role=");
+            bool has_aria_desc = aria_find_in(tag_start, tag_end, "aria-describedby=") != NULL;
+
+            /* Find the enclosing table-figure, if any */
+            const char *this_figure_start = NULL;
+            const char *find_fig = read - 1;
+            while (find_fig >= html && find_fig > read - 500) {
+                if (*find_fig == '<' && strncmp(find_fig, "<figure", 7) == 0) {
+                    if (aria_has_table_figure_class(find_fig, tag_start)) {
+                        this_figure_start = find_fig;
                         break;
                     }
                 }
-                before_table--;
+                find_fig--;
             }
 
-            /* Find figcaption ID for this table by checking caption_list */
-            char *caption_id = NULL;
-            if (in_table_figure && !has_aria_desc) {
-                /* Find the figure_start for this table */
-                const char *this_figure_start = NULL;
-                const char *find_fig = read - 1;
-                while (find_fig >= html && find_fig > read - 500) {
-                    if (*find_fig == '<' && strncmp(find_fig, "<figure", 7) == 0) {
-                        const char *class_check = strstr(find_fig, "class=\"table-figure\"");
-                        if (!class_check) {
-                            class_check = strstr(find_fig, "class='table-figure'");
-                        }
-                        if (class_check && class_check < tag_start) {
-                            this_figure_start = find_fig;
-                            break;
-                        }
-                    }
-                    find_fig--;
-                }
-
-                /* Look for a caption in this figure (either before or after table) */
-                if (this_figure_start) {
-                    for (caption_info *cap = caption_list; cap; cap = cap->next) {
-                        if (cap->figure_start == this_figure_start) {
-                            /* Found a caption in the same figure - use it regardless of position */
-                            caption_id = strdup(cap->caption_id);
-                            break;
-                        }
+            /* Look for a caption in this figure (either before or after table) */
+            const char *caption_id = NULL;
+            if (this_figure_start && !has_aria_desc) {
+                for (caption_info *cap = caption_list; cap; cap = cap->next) {
+                    if (cap->figure_start == this_figure_start) {
+                        caption_id = cap->caption_id;
+                        break;
                     }
                 }
             }
 
             if (needs_role || caption_id) {
                 /* Copy up to just before closing >, add attributes, then close */
-                size_t prefix_len = tag_end - tag_start;
-                if (prefix_len <= remaining) {
-                    memcpy(write, tag_start, prefix_len);
-                    write += prefix_len;
-                    remaining -= prefix_len;
-                }
-
-                /* Add role="table" if needed */
+                APPEND_N(tag_start, (size_t)(tag_end - tag_start));
                 if (needs_role) {
                     APPEND_SAFE(" role=\"table\"");
                 }
-
-                /* Add aria-describedby if we found a caption ID */
                 if (caption_id) {
-                    char aria_desc_str[256];
-                    snprintf(aria_desc_str, sizeof(aria_desc_str), " aria-describedby=\"%s\"", caption_id);
-                    APPEND_SAFE(aria_desc_str);
-                    free(caption_id);
+                    APPEND_SAFE(" aria-describedby=\"");
+                    APPEND_SAFE(caption_id);
+                    COPY_CHAR('"');
                 }
-
                 COPY_CHAR('>');
                 read = tag_end + 1;
                 continue;
@@ -2786,30 +2739,17 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
                 }
             }
 
-            if (this_caption) {
-                /* Check if ID already exists in original HTML */
-                const char *id_attr = strstr(tag_start, "id=\"");
-                if (!id_attr) {
-                    id_attr = strstr(tag_start, "id='");
-                }
-
-                if (!id_attr || id_attr > tag_end) {
-                    /* No ID in original, add the one we generated/collected */
-                    size_t prefix_len = tag_end - tag_start;
-                    if (prefix_len <= remaining) {
-                        memcpy(write, tag_start, prefix_len);
-                        write += prefix_len;
-                        remaining -= prefix_len;
-                    }
-
-                    /* Add id attribute */
-                    char id_attr_str[128];
-                    snprintf(id_attr_str, sizeof(id_attr_str), " id=\"%s\"", this_caption->caption_id);
-                    APPEND_SAFE(id_attr_str);
-                    COPY_CHAR('>');
-                    read = tag_end + 1;
-                    continue;
-                }
+            if (this_caption &&
+                !aria_find_in(tag_start, tag_end, "id=\"") &&
+                !aria_find_in(tag_start, tag_end, "id='")) {
+                /* No ID in original, add the one we generated/collected */
+                APPEND_N(tag_start, (size_t)(tag_end - tag_start));
+                APPEND_SAFE(" id=\"");
+                APPEND_SAFE(this_caption->caption_id);
+                COPY_CHAR('"');
+                COPY_CHAR('>');
+                read = tag_end + 1;
+                continue;
             }
         }
 
@@ -2817,20 +2757,27 @@ char *apex_apply_aria_labels(const char *html, cmark_node *document) {
         COPY_CHAR(*read++);
     }
 
+    #undef APPEND_N
     #undef APPEND_SAFE
     #undef COPY_CHAR
 
-    *write = '\0';
-
-    /* Free caption list */
     while (caption_list) {
         caption_info *next = caption_list->next;
         free(caption_list->caption_id);
         free(caption_list);
         caption_list = next;
     }
+    return out.data;
 
-    return output;
+oom:
+    free(out.data);
+    while (caption_list) {
+        caption_info *next = caption_list->next;
+        free(caption_list->caption_id);
+        free(caption_list);
+        caption_list = next;
+    }
+    return strdup(html);
 }
 
 /* Helper: trim leading/trailing ASCII whitespace from an attribute value */

data/lib/apex/version.rb

@@ -6,7 +6,7 @@ module Apex
   # via Apex::Native.version.
   module Version
     # Current gem version.
-    VERSION = "1.0.34"
+    VERSION = "1.0.36"
   end
 
   # Shortcut to gem version string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apex-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.36
 platform: ruby
 authors:
 - Brett Terpstra