From: Krzysztof Wilczynski Date: Fri, 29 Apr 2011 23:59:18 +0000 (+0100) Subject: Moved to unless from if not plus removed surplus empty lines. X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=21e39aaeac2fb545b80a47f55f5e77a2872f65fc;p=puppet-stdlib.git Moved to unless from if not plus removed surplus empty lines. Signed-off-by: Krzysztof Wilczynski --- diff --git a/unique.rb b/unique.rb index ce7ea70..a922c94 100644 --- a/unique.rb +++ b/unique.rb @@ -13,21 +13,19 @@ module Puppet::Parser::Functions value = arguments[0] klass = value.class - if not [Array, String].include?(klass) - raise(Puppet::ParseError, 'unique(): Requires either an ' + + unless [Array, String].include?(klass) + raise(Puppet::ParseError, 'unique(): Requires either ' + 'array or string to work with') end result = value.clone - string_type = value.is_a?(String) ? true : false + string = value.is_a?(String) ? true : false # We turn any string value into an array to be able to shuffle ... - result = string_type ? result.split('') : result - - result = result.uniq - - result = string_type ? result.join : result + result = string ? result.split('') : result + result = result.uniq # Remove duplicates ... + result = string ? result.join : result return result end