Merge branch '3.2.x' into 3.x

* 3.2.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation

Author: Jeff McCune

lib/puppet/parser/functions/is_float.rb

@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
 
     value = arguments[0]
 
-    if value != value.to_f.to_s then
+    if value != value.to_f.to_s and !value.is_a? Float then
       return false
     else
       return true

lib/puppet/parser/functions/is_integer.rb

@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
 
     value = arguments[0]
 
-    if value != value.to_i.to_s then
+    if value != value.to_i.to_s and !value.is_a? Fixnum then
       return false
     else
       return true

lib/puppet/parser/functions/is_numeric.rb

@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
 
     value = arguments[0]
 
-    if value == value.to_f.to_s or value == value.to_i.to_s then
+    if value == value.to_f.to_s or value == value.to_i.to_s or value.is_a? Numeric then
       return true
     else
       return false

spec/unit/puppet/parser/functions/is_float_spec.rb

@@ -26,4 +26,8 @@
     result = scope.function_is_float(["3"])
     result.should(eq(false))
   end
+  it "should return true if a float is created from an arithmetical operation" do
+    result = scope.function_is_float([3.2*2])
+    result.should(eq(true))
+  end
 end

spec/unit/puppet/parser/functions/is_integer_spec.rb

@@ -26,4 +26,9 @@
     result = scope.function_is_integer(["asdf"])
     result.should(eq(false))
   end
+
+  it "should return true if an integer is created from an arithmetical operation" do
+    result = scope.function_is_integer([3*2])
+    result.should(eq(true))
+  end
 end

spec/unit/puppet/parser/functions/is_numeric_spec.rb

@@ -22,6 +22,16 @@
     result.should(eq(true))
   end
 
+  it "should return true if an integer is created from an arithmetical operation" do
+    result = scope.function_is_numeric([3*2])
+    result.should(eq(true))
+  end
+
+  it "should return true if a float is created from an arithmetical operation" do
+    result = scope.function_is_numeric([3.2*2])
+    result.should(eq(true))
+  end
+
   it "should return false if a string" do
     result = scope.function_is_numeric(["asdf"])
     result.should(eq(false))