Fix XPath normalize-space function#324
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR changes how normalize-space() behaves in REXML’s XPath functions and updates the associated test expectation to match the new behavior.
Changes:
- Simplifies
Functions::normalize_spaceto always coerce viastring()and return a single normalized string. - Updates the
test_normalize_space_stringsassertion to only expect one normalized value.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| test/functions/test_base.rb | Updates expected result for normalize-space(//text()) to a single string. |
| lib/rexml/functions.rb | Replaces array-aware normalization logic with a single-string implementation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| else | ||
| string.to_s.strip.gsub(/\s+/um, ' ') | ||
| end | ||
| string(string).strip.gsub(/\s+/um, ' ') |
| "Dessert after dinner", | ||
| ], | ||
| normalized_texts) | ||
| assert_equal(["breakfast boosts concentration"], normalized_texts) |
tompng
force-pushed
the
fix_normalize_spaces
branch
from
4117f05 to
5df57c1
Compare
naitoh
reviewed
Jun 7, 2026
| "Dessert after dinner", | ||
| ], | ||
| normalized_texts) | ||
| normalized_text = REXML::XPath.each(REXML::Document.new(source), "normalize-space(//text())").to_a |
Contributor
There was a problem hiding this comment.
normalized_text has not been tested.
| @@ -263,12 +263,7 @@ def Functions::string_length( string ) | |||
| end | |||
|
|
|||
| def Functions::normalize_space( string=nil ) | |||
Contributor
There was a problem hiding this comment.
If it is called without any arguments, as in normalize-space(), this causes a problem.
- master
require "nokogiri"
require "rexml"
xml = <<-XML
<root>
<item> apple </item>
<item> orange </item>
<item> banana </item>
</root>
XML
puts Nokogiri::XML.parse(xml).xpath("//item/text()[normalize-space()='orange']")
#=> " orange "
puts REXML::XPath.first(doc, "//item/text()[normalize-space()='orange']")
#=> " orange "
- this PR
puts REXML::XPath.first(doc, "//item/text()[normalize-space()='orange']")
#=> ""
Member
Author
There was a problem hiding this comment.
Nice catch! Fixed and test added.
It should return normalized string of the first node, just like other functions such as `string()` and `number()`
tompng
force-pushed
the
fix_normalize_spaces
branch
from
5df57c1 to
6bdcd64
Compare
Comment on lines
+265
to
+266
| def Functions::normalize_space( object=@@context[:node] ) | ||
| string(object).strip.gsub(/\s+/um, ' ') |
Comment on lines
+265
to
+266
| def Functions::normalize_space( object=@@context[:node] ) | ||
| string(object).strip.gsub(/\s+/um, ' ') |
naitoh
pushed a commit
that referenced
this pull request
Jun 9, 2026
Similar to #324 Values should be nodeset(Array) or primitive, not `[primitive]` Also removes these workarounds related to primitive wrapped in array ```ruby # Workaround to handle single primitive value wrapped in an array result = result[0] if result.kind_of? Array and result.length == 1 # Workaround to handle multiple primitive values wrapped in an array # Arrays are always nodeset, so `if result.size > 0` is enough if result.size > 0 and result.inject(false) {|k,s| s or k} ``` It works even wrapping with an array, but leaving it will be a blocker of implementing delayed nodeset ordering.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It should return normalized string of the first node, just like other functions such as
string()andnumber()This bug is a blocker of implementing delayed nodeset ordering.