opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #310 from kainz/master

Browse source 
URI.escape for the array case was incorrect.
This commit is contained in:
Morgan Haskel 2015-03-03 16:06:46 -08:00
commit b8547b7c29
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puppet/parser/functions/uriescape.rb
View file

@ -22,7 +22,7 @@ module Puppet::Parser::Functions
if value.is_a?(Array)
# Numbers in Puppet are often string-encoded which is troublesome ...
result = value.collect { |i| i.is_a?(String) ? URI.escape(i,unsafe) : i }
result = value.collect { |i| i.is_a?(String) ? URI.escape(i) : i }
else
result = URI.escape(value)
end

7
spec/functions/uriescape_spec.rb
View file

@ -17,6 +17,13 @@ describe "the uriescape function" do
expect(result).to(eq(':/?%23[]@!$&\'()*+,;=%20%22%7B%7D'))
end
it "should uriescape an array of strings, while not touching up nonstrings" do
teststring = ":/?#[]@!$&'()*+,;= \"{}"
expectstring = ':/?%23[]@!$&\'()*+,;=%20%22%7B%7D'
result = scope.function_uriescape([[teststring, teststring, 1]])
expect(result).to(eq([expectstring, expectstring, 1]))
end
it "should do nothing if a string is already safe" do
result = scope.function_uriescape(["ABCdef"])
expect(result).to(eq('ABCdef'))