summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-08-12 11:08:35 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-08-12 11:13:46 -0700
commit2cfa408909cd8a1d465e76d0487fea204f55b844 (patch)
treef98397e1e913cef0953d3640eca0b10e475a0283 /lib
parent4ad1da83f9326b883ef97a3642a889af068137e4 (diff)
downloadpuppet-stdlib-2cfa408909cd8a1d465e76d0487fea204f55b844.tar.gz
puppet-stdlib-2cfa408909cd8a1d465e76d0487fea204f55b844.tar.bz2
(maint) Explicitly unpack validate_slength args
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions/validate_slength.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/puppet/parser/functions/validate_slength.rb b/lib/puppet/parser/functions/validate_slength.rb
index 22c9d52..8c8569a 100644
--- a/lib/puppet/parser/functions/validate_slength.rb
+++ b/lib/puppet/parser/functions/validate_slength.rb
@@ -23,19 +23,21 @@ module Puppet::Parser::Functions
raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
- unless (args[0].is_a?(String) or args[0].is_a?(Array))
- raise Puppet::ParseError, "validate_slength(): please pass a string, or an array of strings - what you passed didn't work for me at all - #{args[0].class}"
+ input, max_length, min_length = *args
+
+ unless (input.is_a?(String) or input.is_a?(Array))
+ raise Puppet::ParseError, "validate_slength(): please pass a string, or an array of strings - what you passed didn't work for me at all - #{input.class}"
end
begin
- max_length = args[1].to_i
+ max_length = max_length.to_i
rescue NoMethodError => e
raise Puppet::ParseError, "validate_slength(): Couldn't convert whatever you passed as the max length parameter to an integer - sorry: " + e.message
end
unless args.length == 2
begin
- min_length = Integer(args[2])
+ min_length = Integer(min_length)
rescue StandardError => e
raise Puppet::ParseError, "validate_slength(): Couldn't convert whatever you passed as the min length parameter to an integer - sorry: " + e.message
end
@@ -47,11 +49,11 @@ module Puppet::Parser::Functions
raise Puppet::ParseError, "validate_slength(): please pass a positive number as min_length" unless min_length >= 0
raise Puppet::ParseError, "validate_slength(): please pass a min length that is smaller than the maximum" unless min_length <= max_length
- case args[0]
+ case input
when String
- raise Puppet::ParseError, "validate_slength(): #{args[0].inspect} is #{args[0].length} characters. It should have been between #{min_length} and #{max_length} characters" unless args[0].length <= max_length and min_length <= args[0].length
+ raise Puppet::ParseError, "validate_slength(): #{input.inspect} is #{input.length} characters. It should have been between #{min_length} and #{max_length} characters" unless input.length <= max_length and min_length <= input.length
when Array
- args[0].each do |arg|
+ input.each do |arg|
if arg.is_a?(String)
unless ( arg.is_a?(String) and arg.length <= max_length and min_length <= arg.length)
raise Puppet::ParseError, "validate_slength(): #{arg.inspect} is #{arg.length} characters. It should have been between #{min_length} and #{max_length} characters"
@@ -61,7 +63,7 @@ module Puppet::Parser::Functions
end
end
else
- raise Puppet::ParseError, "validate_slength(): please pass a string, or an array of strings - what you passed didn't work for me at all - #{args[0].class}"
+ raise Puppet::ParseError, "validate_slength(): please pass a string, or an array of strings - what you passed didn't work for me at all - #{input.class}"
end
end
end