tree_haver 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5491d352853baeea6501864dec4d703cfd57fea279d6e16edf104c2f1d533c90
-  data.tar.gz: 5c71898a5022f0459bc502bfeb977d7fc7e909ffb3fd0c30fe0b4e2055811fe9
+  metadata.gz: 6e544c31dc86e71be78cfcf24e7cbf8a779ef954845b736ec37ed6b550ffe714
+  data.tar.gz: 54f83ef36c8167f5071db278ce33f2603864d339a9c246a733957da41540eab4
 SHA512:
-  metadata.gz: c3ebc956fca1d0e57925f3a152aa2465bb0b86c5fcb0fc1622fe0f038d00214d38c04cb2c52bdbb08250074d48bbd2096353bf14d5d70a0b3a7ae9b58997e79a
-  data.tar.gz: 53192de159ce84a508b9795a866ab01ea23af4de7f9b8c4f2be077a7dff1cc394959462926a948a89c84670668beb2a7c2b5eac9f735c39ffabc6f99c6fe9cbb
+  metadata.gz: c991da086ba12a279f461f337e7dfa9d0b98d8d6d4f4c5d3d78cc3b848a6174ed42ce71b674e8a2d4ed81c5b17289d6c3903c2ef813db86cd4557a33aa1c1599
+  data.tar.gz: 034b9f7df24e5f757013f011b7661559fed243b3fde752d95ab2cac94a0fdfc8270d9ca002d07972c74c1d5455293ac12c7472eacdc106934051cc3231d005b9

data/CHANGELOG.md

@@ -30,6 +30,20 @@ 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]
@@ -901,7 +915,9 @@ 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.5...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

data/lib/tree_haver/backends/java.rb

@@ -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/version.rb

@@ -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.5"
+    VERSION = "3.2.6"
   end
 
   # Traditional location for VERSION constant

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_haver
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  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.5
-  changelog_uri: https://github.com/kettle-rb/tree_haver/blob/v3.2.5/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.5
+  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