RubyGems - tree_haver - Versions diffs - 3.2.4 → 3.2.6 - Mend

tree_haver 3.2.4 → 3.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data/CHANGELOG.md +35 -1
data/README.md +83 -81
data/lib/tree_haver/backends/commonmarker.rb +7 -6
data/lib/tree_haver/backends/java.rb +53 -10
data/lib/tree_haver/backends/markly.rb +10 -4
data/lib/tree_haver/version.rb +1 -1
data.tar.gz.sig +0 -0
metadata +4 -4
metadata.gz.sig +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cea4c9eec7fee0afdffcb4f6b66a7dce698af731cc23028a77f70bc71dc207e
-  data.tar.gz: 68ac3a9c026204a9f0cd42f0afc01f00478405f0be07b74c32c1a85488c7275e
+  metadata.gz: 6e544c31dc86e71be78cfcf24e7cbf8a779ef954845b736ec37ed6b550ffe714
+  data.tar.gz: 54f83ef36c8167f5071db278ce33f2603864d339a9c246a733957da41540eab4
 SHA512:
-  metadata.gz: 4f48fad6061b7d14cc8cd0b0a7c98e0457f1e65613ef8f4ea469f5cdb36e6137512b42a329f846752e9016a43a2fe6cd24e73cbcce2ecb83b17f4cc9eb3653b6
-  data.tar.gz: 68949852113d833c6d40d8bde278d08c9b4b68b6d90299af99036683b070a3eeac97a92723de435be2c9e7025f718627d9b100a5fbcbcad554e5e3c6e3b141e3
+  metadata.gz: c991da086ba12a279f461f337e7dfa9d0b98d8d6d4f4c5d3d78cc3b848a6174ed42ce71b674e8a2d4ed81c5b17289d6c3903c2ef813db86cd4557a33aa1c1599
+  data.tar.gz: 034b9f7df24e5f757013f011b7661559fed243b3fde752d95ab2cac94a0fdfc8270d9ca002d07972c74c1d5455293ac12c7472eacdc106934051cc3231d005b9

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data/CHANGELOG.md CHANGED Viewed

@@ -30,6 +30,36 @@ Please file a bug if you notice a violation of semantic versioning.
 ### Security
+## [3.2.6] - 2026-01-06
+- TAG: [v3.2.6][3.2.6t]
+- COVERAGE: 92.07% -- 2230/2422 lines in 23 files
+- BRANCH COVERAGE: 74.69% -- 788/1055 branches in 23 files
+- 90.37% documented
+### Fixed
+- **Java backend**: Fixed Optional handling in Node methods that could return nil incorrectly
+  - `child(index)`, `child_by_field_name(name)`, `parent`, `next_sibling`, `prev_sibling` now properly check for nil before attempting to unwrap Java Optional
+  - Previously, the ternary-based Optional check could fail when jtreesitter returned null directly instead of Optional.empty()
+  - This fixes JRuby test failures where `key_name` returned nil and object keys were not extracted
+## [3.2.5] - 2026-01-05
+- TAG: [v3.2.5][3.2.5t]
+- COVERAGE: 92.07% -- 2230/2422 lines in 23 files
+- BRANCH COVERAGE: 74.69% -- 788/1055 branches in 23 files
+- 90.37% documented
+### Fixed
+- **Markly backend**: `Node#text` now correctly handles container nodes (headings, paragraphs, etc.)
+  - Previously returned empty string because `string_content` was checked first (responds but returns empty for containers)
+  - Now falls through to `to_plaintext` or children concatenation when `string_content` is empty
+- **Commonmarker backend**: `Node#text` now correctly handles container nodes
+  - Previously could return empty string in edge cases
+  - Now consistently falls through to children concatenation when `string_content` is empty or raises TypeError
 ## [3.2.4] - 2026-01-04
 - TAG: [v3.2.4][3.2.4t]
@@ -885,7 +915,11 @@ Despite the major version bump to 3.0.0 (following semver due to the breaking `L
 - Initial release
-[Unreleased]: https://github.com/kettle-rb/tree_haver/compare/v3.2.4...HEAD
+[Unreleased]: https://github.com/kettle-rb/tree_haver/compare/v3.2.6...HEAD
+[3.2.6]: https://github.com/kettle-rb/tree_haver/compare/v3.2.5...v3.2.6
+[3.2.6t]: https://github.com/kettle-rb/tree_haver/releases/tag/v3.2.6
+[3.2.5]: https://github.com/kettle-rb/tree_haver/compare/v3.2.4...v3.2.5
+[3.2.5t]: https://github.com/kettle-rb/tree_haver/releases/tag/v3.2.5
 [3.2.4]: https://github.com/kettle-rb/tree_haver/compare/v3.2.3...v3.2.4
 [3.2.4t]: https://github.com/kettle-rb/tree_haver/releases/tag/v3.2.4
 [3.2.3]: https://github.com/kettle-rb/tree_haver/compare/v3.2.2...v3.2.3

data/README.md CHANGED Viewed

@@ -141,8 +141,8 @@ The Rust backend uses [tree\_stump](https://github.com/joker1007/tree_stump), wh
   - **JRuby**: Cannot load native `.so` extensions (runs on JVM)
   - **TruffleRuby**: magnus/rb-sys are incompatible with TruffleRuby's C API emulation
-NOTE: `tree_stump` currently requires unreleased fixes in the `main` branch.
+    NOTE: `tree_stump` currently requires unreleased fixes in the `main` branch.
+<!-- end list -->
 ``` ruby
 # Add to your Gemfile for Rust backend (MRI only)
 gem "tree_stump", github: "joker1007/tree_stump", branch: "main"
@@ -155,7 +155,6 @@ gem "tree_stump", github: "joker1007/tree_stump", branch: "main"
 Requires the `ffi` gem and a system installation of `libtree-sitter`.
   - **TruffleRuby**: TruffleRuby's FFI implementation doesn't support `STRUCT_BY_VALUE` return types, which tree-sitter's C API uses for functions like `ts_tree_root_node` and `ts_node_child`.
 <!-- end list -->
 ``` ruby
 # Add to your Gemfile for FFI backend (MRI and JRuby)
@@ -185,9 +184,9 @@ gem "citrus", "~> 3.0"
 #### Java Backend (JRuby only)
-**Requires jtreesitter >= 0.26.0** from Maven Central. Older versions are not supported due to breaking API changes.
+**Requires jtreesitter \>= 0.26.0** from Maven Central. Older versions are not supported due to breaking API changes.
-```ruby
+``` ruby
 # No gem dependency - uses JRuby's built-in Java integration
 # Download the JAR:
 # curl -L -o jtreesitter-0.26.0.jar \
@@ -198,9 +197,8 @@ gem "citrus", "~> 3.0"
 ```
 **Also requires**:
-- Tree-sitter runtime library (`libtree-sitter.so`) version 0.26+ (must match jtreesitter version)
-- Grammar `.so` files built against tree-sitter 0.26+ (or rebuilt with `tree-sitter generate`)
+  - Tree-sitter runtime library (`libtree-sitter.so`) version 0.26+ (must match jtreesitter version)
+  - Grammar `.so` files built against tree-sitter 0.26+ (or rebuilt with `tree-sitter generate`)
 ### Backend Platform Compatibility
 Not all backends work on all Ruby platforms. Here's a complete compatibility matrix:
@@ -210,7 +208,7 @@ Not all backends work on all Ruby platforms. Here's a complete compatibility mat
 | **MRI** ([ruby\_tree\_sitter](https://github.com/Faveod/ruby-tree-sitter)) | ✅ | ❌ | ❌ | ✅ | C extension, MRI only |
 | **Rust** ([tree\_stump](https://github.com/joker1007/tree_stump)) | ✅ | ❌ | ❌ | ✅ | magnus/rb-sys incompatible with non-MRI |
 | **FFI** | ✅ | ✅ | ❌ | ⚠️ | TruffleRuby FFI doesn't support `STRUCT_BY_VALUE` |
-| **Java** ([jtreesitter](https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter)) | ❌ | ✅ | ❌ | ✅ | JRuby only, requires jtreesitter >= 0.26.0 |
+| **Java** ([jtreesitter](https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter)) | ❌ | ✅ | ❌ | ✅ | JRuby only, requires jtreesitter \>= 0.26.0 |
 | **Prism** | ✅ | ✅ | ✅ | ✅ | Ruby parsing, stdlib in Ruby 3.4+ |
 | **Psych** | ✅ | ✅ | ✅ | ✅ | YAML parsing, stdlib |
 | **Citrus** | ✅ | ✅ | ✅ | ⚠️ | Pure Ruby, no native dependencies |
@@ -227,7 +225,7 @@ Not all backends work on all Ruby platforms. Here's a complete compatibility mat
 All tree-sitter backends (MRI, Rust, FFI, Java) require the tree-sitter runtime library. **Version 0.26+ is required** for the Java backend (to match jtreesitter 0.26.0). Other backends may work with 0.24+, but 0.26+ is recommended for consistency.
-```bash
+``` bash
 # Check your tree-sitter version
 tree-sitter --version  # Should be 0.26.0 or newer for Java backend
@@ -243,16 +241,15 @@ dnf install tree-sitter tree-sitter-devel
 #### jtreesitter (Java Backend)
-**The Java backend requires jtreesitter >= 0.26.0.** This version introduced breaking API changes:
-- `Parser.parse()` returns `Optional<Tree>` instead of `Tree`
-- `Tree.getRootNode()` returns `Node` directly (not `Optional<Node>`)
-- `Node.getChild()`, `getParent()`, `getNextSibling()`, `getPrevSibling()` return `Optional<Node>`
-- `Language.load(name)` was removed; use `SymbolLookup` API instead
+**The Java backend requires jtreesitter \>= 0.26.0.** This version introduced breaking API changes:
-Older versions of jtreesitter are **NOT supported**.
-```bash
+  - `Parser.parse()` returns `Optional<Tree>` instead of `Tree`
+  - `Tree.getRootNode()` returns `Node` directly (not `Optional<Node>`)
+  - `Node.getChild()`, `getParent()`, `getNextSibling()`, `getPrevSibling()` return `Optional<Node>`
+  - `Language.load(name)` was removed; use `SymbolLookup` API instead
+    Older versions of jtreesitter are **NOT supported**.
+<!-- end list -->
+``` bash
 # Download jtreesitter 0.26.0 from Maven Central
 curl -L -o jtreesitter-0.26.0.jar \
   "https://repo1.maven.org/maven2/io/github/tree-sitter/jtreesitter/0.26.0/jtreesitter-0.26.0.jar"
@@ -263,7 +260,7 @@ bin/setup-jtreesitter
 Set the environment variable to point to your JAR directory:
-```bash
+``` bash
 export TREE_SITTER_JAVA_JARS_DIR=/path/to/jars
 ```
@@ -273,14 +270,11 @@ export TREE_SITTER_JAVA_JARS_DIR=/path/to/jars
 Tree-sitter 0.24+ changed how language ABI versions are reported (from `ts_language_version()` to `ts_language_abi_version()`). For the Java backend with jtreesitter 0.26.0, grammars must be built against tree-sitter 0.26+. If you get errors like:
-```
-Failed to load tree_sitter_toml
-Version mismatch detected: The grammar was built against tree-sitter < 0.26
-```
+    Failed to load tree_sitter_toml
+    Version mismatch detected: The grammar was built against tree-sitter < 0.26
 You need to rebuild the grammar from source:
-```bash
+``` bash
 # Use the provided build script
 bin/build-grammar toml
@@ -306,21 +300,18 @@ TruffleRuby has **no working tree-sitter backend**:
   - **FFI**: TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE` return types (used by `ts_tree_root_node`, `ts_node_child`, etc.)
   - **MRI/Rust**: C and Rust extensions require MRI's C API internals (`RBasic.flags`, `rb_gc_writebarrier`, etc.) that TruffleRuby doesn't expose
-TruffleRuby users should use: **Prism** (Ruby), **Psych** (YAML), **Citrus** (TOML via toml-rb), or potentially **Commonmarker/Markly** (Markdown).
+    TruffleRuby users should use: **Prism** (Ruby), **Psych** (YAML), **Citrus** (TOML via toml-rb), or potentially **Commonmarker/Markly** (Markdown).
 #### JRuby Limitations
 JRuby runs on the JVM and **cannot load native `.so` extensions via Ruby's C API**:
   - **MRI/Rust**: C and Rust extensions simply cannot be loaded
   - **FFI**: Works\! JRuby has excellent FFI support
-  - **Java**: Works\! The Java backend uses jtreesitter (requires >= 0.26.0)
-JRuby users should use: **Java backend** (best performance, full API) or **FFI backend** for tree-sitter, plus **Prism**, **Psych**, **Citrus** for other formats.
-[ruby_tree_sitter]: https://github.com/Faveod/ruby-tree-sitter
-[tree_stump]: https://github.com/joker1007/tree_stump
-[jtreesitter]: https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter
+  - **Java**: Works\! The Java backend uses jtreesitter (requires \>= 0.26.0)
+    JRuby users should use: **Java backend** (best performance, full API) or **FFI backend** for tree-sitter, plus **Prism**, **Psych**, **Citrus** for other formats.
+    [ruby\_tree\_sitter](https://github.com/Faveod/ruby-tree-sitter): https://github.com/Faveod/ruby-tree-sitter
+    [tree\_stump](https://github.com/joker1007/tree_stump): https://github.com/joker1007/tree\_stump
+    \[jtreesitter\]: https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter
 ### Why TreeHaver?
 tree-sitter is a powerful parser generator that creates incremental parsers for many programming languages. However, integrating it into Ruby applications can be challenging:
@@ -328,28 +319,27 @@ tree-sitter is a powerful parser generator that creates incremental parsers for
   - MRI-based C extensions don't work on JRuby
   - FFI-based solutions may not be optimal for MRI
   - Managing different backends for different Ruby implementations is cumbersome
-TreeHaver solves these problems by providing a unified API that automatically selects the appropriate backend for your Ruby implementation, allowing you to write code once and run it anywhere.
+    TreeHaver solves these problems by providing a unified API that automatically selects the appropriate backend for your Ruby implementation, allowing you to write code once and run it anywhere.
 ### The `*-merge` Gem Family
 The `*-merge` gem family provides intelligent, AST-based merging for various file formats. At the foundation is [tree_haver][tree_haver], which provides a unified cross-Ruby parsing API that works seamlessly across MRI, JRuby, and TruffleRuby.
-| Gem                                      | Format   | Parser Backend(s)                                                                                   | Description                                                                      |
-|------------------------------------------|----------|-----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
-| [tree_haver][tree_haver]                 | Multi    | MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus                                  | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
-| [ast-merge][ast-merge]                   | Text     | internal                                                                                            | **Infrastructure**: Shared base classes and merge logic for all `*-merge` gems   |
-| [prism-merge][prism-merge]               | Ruby     | [Prism][prism]                                                                                      | Smart merge for Ruby source files                                                |
-| [psych-merge][psych-merge]               | YAML     | [Psych][psych]                                                                                      | Smart merge for YAML files                                                       |
-| [json-merge][json-merge]                 | JSON     | [tree-sitter-json][ts-json] (via tree_haver)                                                        | Smart merge for JSON files                                                       |
-| [jsonc-merge][jsonc-merge]               | JSONC    | [tree-sitter-jsonc][ts-jsonc] (via tree_haver)                                                      | ⚠️ Proof of concept; Smart merge for JSON with Comments                          |
-| [bash-merge][bash-merge]                 | Bash     | [tree-sitter-bash][ts-bash] (via tree_haver)                                                        | Smart merge for Bash scripts                                                     |
-| [rbs-merge][rbs-merge]                   | RBS      | [RBS][rbs]                                                                                          | Smart merge for Ruby type signatures                                             |
-| [dotenv-merge][dotenv-merge]             | Dotenv   | internal                                                                                            | Smart merge for `.env` files                                                     |
-| [toml-merge][toml-merge]                 | TOML     | [Citrus + toml-rb][toml-rb] (default, via tree_haver), [tree-sitter-toml][ts-toml] (via tree_haver) | Smart merge for TOML files                                                       |
-| [markdown-merge][markdown-merge]         | Markdown | [Commonmarker][commonmarker] / [Markly][markly] (via tree_haver)                                    | **Foundation**: Shared base for Markdown mergers with inner code block merging   |
-| [markly-merge][markly-merge]             | Markdown | [Markly][markly] (via tree_haver)                                                                   | Smart merge for Markdown (CommonMark via cmark-gfm C)                            |
-| [commonmarker-merge][commonmarker-merge] | Markdown | [Commonmarker][commonmarker] (via tree_haver)                                                       | Smart merge for Markdown (CommonMark via comrak Rust)                            |
+| Gem                                      | Language<br>/ Format | Parser Backend(s)                                                                                   | Description                                                                      |
+|------------------------------------------|----------------------|-----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
+| [tree_haver][tree_haver]                 | Multi                | MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus                                  | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
+| [ast-merge][ast-merge]                   | Text                 | internal                                                                                            | **Infrastructure**: Shared base classes and merge logic for all `*-merge` gems   |
+| [bash-merge][bash-merge]                 | Bash                 | [tree-sitter-bash][ts-bash] (via tree_haver)                                                        | Smart merge for Bash scripts                                                     |
+| [commonmarker-merge][commonmarker-merge] | Markdown             | [Commonmarker][commonmarker] (via tree_haver)                                                       | Smart merge for Markdown (CommonMark via comrak Rust)                            |
+| [dotenv-merge][dotenv-merge]             | Dotenv               | internal                                                                                            | Smart merge for `.env` files                                                     |
+| [json-merge][json-merge]                 | JSON                 | [tree-sitter-json][ts-json] (via tree_haver)                                                        | Smart merge for JSON files                                                       |
+| [jsonc-merge][jsonc-merge]               | JSONC                | [tree-sitter-jsonc][ts-jsonc] (via tree_haver)                                                      | ⚠️ Proof of concept; Smart merge for JSON with Comments                          |
+| [markdown-merge][markdown-merge]         | Markdown             | [Commonmarker][commonmarker] / [Markly][markly] (via tree_haver)                                    | **Foundation**: Shared base for Markdown mergers with inner code block merging   |
+| [markly-merge][markly-merge]             | Markdown             | [Markly][markly] (via tree_haver)                                                                   | Smart merge for Markdown (CommonMark via cmark-gfm C)                            |
+| [prism-merge][prism-merge]               | Ruby                 | [Prism][prism] (`prism` std lib gem)                                                                | Smart merge for Ruby source files                                                |
+| [psych-merge][psych-merge]               | YAML                 | [Psych][psych] (`psych` std lib gem)                                                                | Smart merge for YAML files                                                       |
+| [rbs-merge][rbs-merge]                   | RBS                  | [tree-sitter-bash][ts-rbs] (via tree_haver), [RBS][rbs] (`rbs` std lib gem)                         | Smart merge for Ruby type signatures                                             |
+| [toml-merge][toml-merge]                 | TOML                 | [Citrus + toml-rb][toml-rb] (default, via tree_haver), [tree-sitter-toml][ts-toml] (via tree_haver) | Smart merge for TOML files                                                       |
 **Example implementations** for the gem templating use case:
@@ -412,7 +402,7 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
 **Note:** Java backend works with grammar `.so` files built against tree-sitter 0.24+. The grammars must be rebuilt with `tree-sitter generate` if they were compiled against older tree-sitter versions. FFI is recommended for JRuby as it's easier to set up.
-**Note:** TreeHaver can use `ruby_tree_sitter` (MRI) or `tree_stump` (MRI) as backends, or `java-tree-sitter` / `jtreesitter` >= 0.26.0 ([docs](https://tree-sitter.github.io/java-tree-sitter/), [maven](https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter), [source](https://github.com/tree-sitter/java-tree-sitter), JRuby), or FFI on any backend, giving you TreeHaver's unified API, grammar discovery, and security features, plus full access to incremental parsing when using those backends.
+**Note:** TreeHaver can use `ruby_tree_sitter` (MRI) or `tree_stump` (MRI) as backends, or `java-tree-sitter` / `jtreesitter` \>= 0.26.0 ([docs](https://tree-sitter.github.io/java-tree-sitter/), [maven](https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter), [source](https://github.com/tree-sitter/java-tree-sitter), JRuby), or FFI on any backend, giving you TreeHaver's unified API, grammar discovery, and security features, plus full access to incremental parsing when using those backends.
 **Note:** `tree_stump` currently requires unreleased fixes in the `main` branch.
@@ -421,28 +411,42 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
 **Choose TreeHaver when:**
   - You need JRuby or TruffleRuby support
   - You're building a library that should work across Ruby implementations
   - You want automatic grammar discovery and security validations
   - You want flexibility to switch backends without code changes
   - You need incremental parsing with a unified API
-**Choose ruby\_tree\_sitter directly when:**
+    **Choose ruby\_tree\_sitter directly when:**
   - You only target MRI Ruby
   - You need the full Query API without abstraction
   - You want the most battle-tested C bindings
   - You don't need TreeHaver's grammar discovery
-**Choose tree\_stump directly when:**
+    **Choose tree\_stump directly when:**
   - You only target MRI Ruby
   - You prefer Rust-based native extensions
   - You want precompiled binaries without system dependencies
   - You don't need TreeHaver's grammar discovery
   - **Note:** `tree_stump` currently requires unreleased fixes in the `main` branch.
-**Choose citrus directly when:**
+    **Choose citrus directly when:**
   - You need zero native dependencies (pure Ruby)
   - You're using a Citrus grammar (not tree-sitter grammars)
   - Performance is less critical than portability
   - You don't need TreeHaver's unified API
 ## 💡 Info you can shake a stick at
@@ -495,12 +499,16 @@ The maintainers of this and thousands of other packages are working with Tidelif
 [![Get help from me on Tidelift](https://img.shields.io/badge/Tidelift_and_Sonar-Enterprise_Support-FD3456?style=for-the-badge&logo=sonar&logoColor=white)](https://tidelift.com/subscription/pkg/rubygems-tree_haver?utm_source=rubygems-tree_haver&utm_medium=referral&utm_campaign=readme)
   - 💡Subscribe for support guarantees covering *all* your FLOSS dependencies
   - 💡Tidelift is part of [Sonar](https://blog.tidelift.com/tidelift-joins-sonar)
   - 💡Tidelift pays maintainers to maintain the software you depend on\!<br/>📊`@`Pointy Haired Boss: An [enterprise support](https://tidelift.com/subscription/pkg/rubygems-tree_haver?utm_source=rubygems-tree_haver&utm_medium=referral&utm_campaign=readme) subscription is "[never gonna let you down](https://www.youtube.com/watch?v=dQw4w9WgXcQ)", and *supports* open source maintainers
-Alternatively:
+    Alternatively:
   - [![Live Chat on Discord](https://img.shields.io/discord/1373797679469170758?style=for-the-badge&logo=discord)](https://discord.gg/3qme4XHNKN)
   - [![Get help from me on Upwork](https://img.shields.io/badge/UpWork-13544E?style=for-the-badge&logo=Upwork&logoColor=white)](https://www.upwork.com/freelancers/~014942e9b056abdf86?mp_source=share)
   - [![Get help from me on Codementor](https://img.shields.io/badge/CodeMentor-Get_Help-1abc9c?style=for-the-badge&logo=CodeMentor&logoColor=white)](https://www.codementor.io/peterboling?utm_source=github&utm_medium=button&utm_term=peterboling&utm_campaign=github)
 </details>
@@ -567,7 +575,7 @@ TreeHaver supports 10 parsing backends, each with different trade-offs. The `aut
 | **MRI** | C extension via ruby\_tree\_sitter | ⚡ Fastest | MRI only | [JSON](examples/mri_json.rb) · [JSONC](examples/mri_jsonc.rb) · \~\~Bash\~\~\* · [TOML](examples/mri_toml.rb) |
 | **Rust** | Precompiled via tree\_stump | ⚡ Very Fast | ✅ Good | [JSON](examples/rust_json.rb) · [JSONC](examples/rust_jsonc.rb) · \~\~Bash\~\~\* · [TOML](examples/rust_toml.rb) |
 | **FFI** | Dynamic linking via FFI | 🔵 Fast | ✅ Universal | [JSON](examples/ffi_json.rb) · [JSONC](examples/ffi_jsonc.rb) · [Bash](examples/ffi_bash.rb) · [TOML](examples/ffi_toml.rb) |
-| **Java** | JNI bindings (jtreesitter >= 0.26.0) | ⚡ Very Fast | JRuby only | [JSON](examples/java_json.rb) · [JSONC](examples/java_jsonc.rb) · [Bash](examples/java_bash.rb) · [TOML](examples/java_toml.rb) |
+| **Java** | JNI bindings (jtreesitter \>= 0.26.0) | ⚡ Very Fast | JRuby only | [JSON](examples/java_json.rb) · [JSONC](examples/java_jsonc.rb) · [Bash](examples/java_bash.rb) · [TOML](examples/java_toml.rb) |
 #### Language-Specific Backends (Native Parser Integration)
@@ -584,8 +592,8 @@ TreeHaver supports 10 parsing backends, each with different trade-offs. The `aut
 **Known Issues:**
   - \*MRI + Bash: ABI incompatibility (use FFI instead)
   - \*Rust + Bash: Version mismatch (use FFI instead)
-**Backend Requirements:**
+    **Backend Requirements:**
+<!-- end list -->
 ``` ruby
 # Tree-sitter backends
 gem "ruby_tree_sitter", "~> 2.0"  # MRI backend
@@ -659,7 +667,6 @@ This is particularly useful for:
   - **Performance comparison**: Benchmark different backends
   - **Fallback scenarios**: Try one backend, fall back to another
   - **Thread isolation**: Each thread can use a different backend safely
 <!-- end list -->
 ``` ruby
 # Example: Testing with multiple backends
@@ -729,10 +736,9 @@ The `find_library_path_safe` method only returns paths in trusted directories.
   - `/usr/lib/x86_64-linux-gnu`, `/usr/lib/aarch64-linux-gnu`
   - `/usr/local/lib`
   - `/opt/homebrew/lib`, `/opt/local/lib`
-**Adding custom trusted directories:**
-For non-standard installations (Homebrew on Linux, luarocks, mise, asdf, etc.), register additional trusted directories:
+    **Adding custom trusted directories:**
+    For non-standard installations (Homebrew on Linux, luarocks, mise, asdf, etc.), register additional trusted directories:
+<!-- end list -->
 ``` ruby
 # Programmatically at application startup
 TreeHaver::PathValidator.add_trusted_directory("/home/linuxbrew/.linuxbrew/Cellar")
@@ -826,7 +832,6 @@ When loading a language grammar, if you don't specify the `symbol:` parameter, T
 1.  **`TREE_SITTER_LANG_SYMBOL`**: Explicit symbol override
 2.  Guessed from filename (e.g., `libtree-sitter-toml.so` → `tree_sitter_toml`)
 3.  Default fallback (`tree_sitter_toml`)
 <!-- end list -->
 ``` bash
 export TREE_SITTER_LANG_SYMBOL=tree_sitter_toml
@@ -845,10 +850,10 @@ export TREE_SITTER_JSON_PATH=/usr/local/lib/libtree-sitter-json.so
 For the Java backend on JRuby, you need:
-1. **jtreesitter >= 0.26.0** JAR from Maven Central
-2. **Tree-sitter runtime library** (`libtree-sitter.so`) version 0.26+
-3. **Grammar `.so` files** built against tree-sitter 0.26+
+1.  **jtreesitter \>= 0.26.0** JAR from Maven Central
+2.  **Tree-sitter runtime library** (`libtree-sitter.so`) version 0.26+
+3.  **Grammar `.so` files** built against tree-sitter 0.26+
+<!-- end list -->
 ``` bash
 # Download jtreesitter JAR (or use bin/setup-jtreesitter)
 export TREE_SITTER_JAVA_JARS_DIR=/path/to/java-tree-sitter/jars
@@ -864,7 +869,7 @@ export TREE_SITTER_TOML_PATH=/path/to/libtree-sitter-toml.so
 If you get "version mismatch" errors, rebuild the grammar:
-```bash
+``` bash
 # Use the provided build script
 bin/build-grammar toml
@@ -1047,7 +1052,6 @@ end
     └── TreeHaver::Error              # Base error class
         ├── TreeHaver::NotAvailable   # Backend/grammar not available
         └── TreeHaver::BackendConflict # Backend incompatibility detected
 **Compatibility Mode Behavior:**
 The compat mode (`require "tree_haver/compat"`) creates aliases but **does not change the exception hierarchy**:
@@ -1084,14 +1088,13 @@ end
     ```
 2.  **Never rely on `rescue => e`** to catch TreeHaver errors (it won't work)
-**Why inherit from Exception?**
-Following ruby\_tree\_sitter's reasoning:
+    **Why inherit from Exception?**
+    Following ruby\_tree\_sitter's reasoning:
+<!-- end list -->
   - **Thread safety**: Prevents accidental catching in thread cleanup code
   - **Signal handling**: Ensures parsing errors don't interfere with SIGTERM/SIGINT
   - **Intentional handling**: Forces developers to explicitly handle parsing errors
-See `lib/tree_haver/compat.rb` for compatibility layer documentation.
+    See `lib/tree_haver/compat.rb` for compatibility layer documentation.
 ## 🔧 Basic Usage
 ### Quick Start
@@ -1309,7 +1312,6 @@ This flexibility is useful for:
   - **Versioning**: Register different grammar versions (e.g., `:ruby_2`, `:ruby_3`)
   - **Testing**: Use unique names to avoid collisions between tests
   - **Context-specific naming**: Use names that make sense for your application
 <!-- end list -->
 ``` ruby
 # Register the same TOML grammar under different names for different purposes
@@ -1506,8 +1508,8 @@ The Java backend will work with:
   - Grammar JARs built specifically for java-tree-sitter / jtreesitter (self-contained, [docs](https://tree-sitter.github.io/java-tree-sitter/), [maven](https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter), [source](https://github.com/tree-sitter/java-tree-sitter))
   - Grammar `.so` files that statically link tree-sitter
-**Option 3: Citrus Backend (pure Ruby, portable)**
+    **Option 3: Citrus Backend (pure Ruby, portable)**
+<!-- end list -->
 ``` ruby
 # Gemfile
 gem "tree_haver"
@@ -2095,7 +2097,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.421-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.422-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/tree_haver/backends/commonmarker.rb CHANGED Viewed

@@ -231,15 +231,16 @@ module TreeHaver
           # Container nodes don't have string_content and will raise TypeError
           if @inner_node.respond_to?(:string_content)
             begin
-              @inner_node.string_content.to_s
+              content = @inner_node.string_content.to_s
+              # If string_content is non-empty, use it (leaf node)
+              return content unless content.empty?
             rescue TypeError
-              # Container node - concatenate children's text
-              children.map(&:text).join
+              # Container node - fall through to concatenate children
             end
-          else
-            # For container nodes, concatenate children's text
-            children.map(&:text).join
           end
+          # For container nodes, concatenate children's text
+          children.map(&:text).join
         end
         # Get child nodes

data/lib/tree_haver/backends/java.rb CHANGED Viewed

@@ -640,8 +640,17 @@ module TreeHaver
         def child(index)
           # jtreesitter 0.26.0: getChild returns Optional<Node> or throws IndexOutOfBoundsException
           result = @impl.getChild(index)
-          return unless result.respond_to?(:isPresent) ? result.isPresent : result
-          java_node = result.respond_to?(:get) ? result.get : result
+          return if result.nil?
+          # Handle Java Optional
+          if result.respond_to?(:isPresent)
+            return unless result.isPresent
+            java_node = result.get
+          else
+            # Direct Node return (some jtreesitter versions)
+            java_node = result
+          end
           Node.new(java_node)
         rescue ::Java::JavaLang::IndexOutOfBoundsException
           nil
@@ -653,9 +662,19 @@ module TreeHaver
         # @return [Node, nil] the child node or nil if not found
         def child_by_field_name(name)
           # jtreesitter 0.26.0: getChildByFieldName returns Optional<Node>
+          # However, some versions or scenarios may return null directly
           result = @impl.getChildByFieldName(name)
-          return unless result.respond_to?(:isPresent) ? result.isPresent : result
-          java_node = result.respond_to?(:get) ? result.get : result
+          return if result.nil?
+          # Handle Java Optional
+          if result.respond_to?(:isPresent)
+            return unless result.isPresent
+            java_node = result.get
+          else
+            # Direct Node return (some jtreesitter versions)
+            java_node = result
+          end
           Node.new(java_node)
         end
@@ -727,8 +746,16 @@ module TreeHaver
         def parent
           # jtreesitter 0.26.0: getParent returns Optional<Node>
           result = @impl.getParent
-          return unless result.respond_to?(:isPresent) ? result.isPresent : result
-          java_node = result.respond_to?(:get) ? result.get : result
+          return if result.nil?
+          # Handle Java Optional
+          if result.respond_to?(:isPresent)
+            return unless result.isPresent
+            java_node = result.get
+          else
+            java_node = result
+          end
           Node.new(java_node)
         end
@@ -738,8 +765,16 @@ module TreeHaver
         def next_sibling
           # jtreesitter 0.26.0: getNextSibling returns Optional<Node>
           result = @impl.getNextSibling
-          return unless result.respond_to?(:isPresent) ? result.isPresent : result
-          java_node = result.respond_to?(:get) ? result.get : result
+          return if result.nil?
+          # Handle Java Optional
+          if result.respond_to?(:isPresent)
+            return unless result.isPresent
+            java_node = result.get
+          else
+            java_node = result
+          end
           Node.new(java_node)
         end
@@ -749,8 +784,16 @@ module TreeHaver
         def prev_sibling
           # jtreesitter 0.26.0: getPrevSibling returns Optional<Node>
           result = @impl.getPrevSibling
-          return unless result.respond_to?(:isPresent) ? result.isPresent : result
-          java_node = result.respond_to?(:get) ? result.get : result
+          return if result.nil?
+          # Handle Java Optional
+          if result.respond_to?(:isPresent)
+            return unless result.isPresent
+            java_node = result.get
+          else
+            java_node = result
+          end
           Node.new(java_node)
         end

data/lib/tree_haver/backends/markly.rb CHANGED Viewed

@@ -288,11 +288,17 @@ module TreeHaver
         #
         # @return [String] Node text
         def text
-          # Markly nodes have string_content for leaf nodes
+          # Markly nodes have string_content for leaf nodes (text, code, etc.)
+          # Container nodes (heading, paragraph, etc.) have empty string_content
+          # and need to use to_plaintext or concatenate children's text.
           if @inner_node.respond_to?(:string_content)
-            @inner_node.string_content.to_s
-          elsif @inner_node.respond_to?(:to_plaintext)
-            # For container nodes, use to_plaintext or concatenate
+            content = @inner_node.string_content.to_s
+            # If string_content is non-empty, use it (leaf node)
+            return content unless content.empty?
+          end
+          # For container nodes, use to_plaintext or concatenate children
+          if @inner_node.respond_to?(:to_plaintext)
             begin
               @inner_node.to_plaintext
             rescue

data/lib/tree_haver/version.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module TreeHaver
     # Current version of the tree_haver gem
     #
     # @return [String] the version string (e.g., "3.0.0")
-    VERSION = "3.2.4"
+    VERSION = "3.2.6"
   end
   # Traditional location for VERSION constant

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_haver
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - Peter H. Boling
@@ -293,10 +293,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://tree-haver.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/tree_haver/tree/v3.2.4
-  changelog_uri: https://github.com/kettle-rb/tree_haver/blob/v3.2.4/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/tree_haver/tree/v3.2.6
+  changelog_uri: https://github.com/kettle-rb/tree_haver/blob/v3.2.6/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/tree_haver/issues
-  documentation_uri: https://www.rubydoc.info/gems/tree_haver/3.2.4
+  documentation_uri: https://www.rubydoc.info/gems/tree_haver/3.2.6
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/tree_haver/wiki
   news_uri: https://www.railsbling.com/tags/tree_haver

metadata.gz.sig CHANGED Viewed

Binary file