summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-11-07 09:44:51 -0800
committerJeff McCune <jeff@puppetlabs.com>2012-11-07 09:44:51 -0800
commit34b9cb8b94a43636a07ad13db0cc5417ee1cbe17 (patch)
tree611f21f881341b3ac8167111869e6f0c57f666a8 /lib
parent23cf7d0ac19df403f05cf3fa93b674f56c2f8e89 (diff)
parent0b3e8f59a915fe4536a571234c1eea031b4ad6bb (diff)
downloadpuppet-stdlib-34b9cb8b94a43636a07ad13db0cc5417ee1cbe17.tar.gz
puppet-stdlib-34b9cb8b94a43636a07ad13db0cc5417ee1cbe17.tar.bz2
Merge branch '4.x'
* 4.x: Add function, uriescape, to URI.escape strings. Redmine #17459 Add function, uriescape, to URI.escape strings. Redmine #17459 Add function, uriescape, to URI.escape strings. Redmine #17459 Update CHANGELOG, Modulefile for 3.1.1
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions/uriescape.rb36
1 files changed, 36 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/uriescape.rb b/lib/puppet/parser/functions/uriescape.rb
new file mode 100644
index 0000000..67b93a6
--- /dev/null
+++ b/lib/puppet/parser/functions/uriescape.rb
@@ -0,0 +1,36 @@
+#
+# uriescape.rb
+#
+require 'uri'
+
+module Puppet::Parser::Functions
+ newfunction(:uriescape, :type => :rvalue, :doc => <<-EOS
+ Urlencodes a string or array of strings.
+ Requires either a single string or an array as an input.
+ EOS
+ ) do |arguments|
+
+ raise(Puppet::ParseError, "uriescape(): Wrong number of arguments " +
+ "given (#{arguments.size} for 1)") if arguments.size < 1
+
+ value = arguments[0]
+ klass = value.class
+ unsafe = ":/?#[]@!$&'()*+,;= "
+
+ unless [Array, String].include?(klass)
+ raise(Puppet::ParseError, 'uriescape(): Requires either ' +
+ 'array or string to work with')
+ end
+
+ 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 }
+ else
+ result = URI.escape(value,unsafe)
+ end
+
+ return result
+ end
+end
+
+# vim: set ts=2 sw=2 et :