Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xpath abbreviate: add support for string literal that contains double-quote #96

Merged
merged 3 commits into from
May 26, 2023
Merged

xpath abbreviate: add support for string literal that contains double-quote #96

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b32affc
Add XPathParser#QuoteLiteral.
pulver May 25, 2023
d50d7f3
PR Feedback.
pulver May 26, 2023
d6a02b9
Make quote_literal private.
pulver May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/rexml/parsers/xpathparser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def predicate_to_string( path, &block )
when :literal
path.shift
string << " "
string << path.shift.inspect
string << QuoteLiteral(path.shift)
string << " "
else
string << " "
Expand Down Expand Up @@ -363,6 +363,18 @@ def Predicate path, parsed
path
end

def QuoteLiteral literal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use snake_case?

Suggested change
def QuoteLiteral literal
def quote_literal(literal)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And could you move this method to before #LocalPath (the line 192)?
Method in #LocationPath to #FunctionCall are for syntaxes in XPath. I don't want to mix this and them.

case literal
when String
# Xpath 1.0 does not support escape characters.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Xpath 1.0 does not support escape characters.
# XPath 1.0 does not support escape characters.

# Assumes literal does not contain both single and double quotes.
pattern = literal.include?('"') ? "'%s'" : '"%s"'
pattern % literal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use string interpolation instead of String#%?

Suggested change
pattern = literal.include?('"') ? "'%s'" : '"%s"'
pattern % literal
if literal.include?("'")
"\"#{literal}\""
else
"'#{literal}'"
end

else
literal.inspect
end
end

# The following return arrays of true/false, a 1-1 mapping of the
# supplied nodeset, except for axe(), which returns a filtered
# nodeset
Expand Down