Check for numeric values as empty fails on those

xbezdick · Sep 28, 2015 · 6f1d164 · 6f1d164
1 parent 48b658f
commit 6f1d164
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/puppet/parser/functions/empty.rb b/lib/puppet/parser/functions/empty.rb
@@ -13,14 +13,18 @@ module Puppet::Parser::Functions
 
     value = arguments[0]
 
-    unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String)
+    unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String) || value.is_a?(Numeric)
       raise(Puppet::ParseError, 'empty(): Requires either ' +
-        'array, hash or string to work with')
+        'array, hash, string or integer to work with')
     end
 
-    result = value.empty?
+    if value.is_a?(Numeric)
+      return false
+    else
+      result = value.empty?
 
-    return result
+      return result
+    end
   end
 end
 

diff --git a/spec/functions/empty_spec.rb b/spec/functions/empty_spec.rb
@@ -3,11 +3,11 @@
 describe 'empty' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params(0).and_raise_error(Puppet::ParseError) }
   it {
     pending("Current implementation ignores parameters after the first.")
     is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError)
   }
+  it { is_expected.to run.with_params(0).and_return(false) }
   it { is_expected.to run.with_params('').and_return(true) }
   it { is_expected.to run.with_params('one').and_return(false) }