diff options
author | Steve Huff <shuff@vecna.org> | 2013-03-29 10:04:05 -0400 |
---|---|---|
committer | Steve Huff <shuff@vecna.org> | 2013-03-29 12:53:56 -0400 |
commit | e6916f83fd35989db4b86dfb10716c9198994389 (patch) | |
tree | d0377c4e8abaf579ccfba824a762e3cbcf3f96bc | |
parent | 4078a6ff44c3ea8c2a071eec3bd7b02dabc770d7 (diff) |
Enable num2bool to accept numeric input
Also ignore rspec fixtures directory
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | lib/puppet/parser/functions/num2bool.rb | 3 | ||||
-rw-r--r-- | spec/unit/puppet/parser/functions/num2bool_spec.rb | 24 |
3 files changed, 25 insertions, 3 deletions
@@ -2,6 +2,7 @@ pkg/ .DS_Store metadata.json coverage/ +spec/fixtures/ Gemfile.lock .bundle/ vendor/bundle/ diff --git a/lib/puppet/parser/functions/num2bool.rb b/lib/puppet/parser/functions/num2bool.rb index 874db22..638f693 100644 --- a/lib/puppet/parser/functions/num2bool.rb +++ b/lib/puppet/parser/functions/num2bool.rb @@ -14,7 +14,8 @@ higher then 0 become true. raise(Puppet::ParseError, "num2bool(): Wrong number of arguments " + "given (#{arguments.size} for 1)") if arguments.size < 1 - number = arguments[0] + # Since we're matching against a regex, coerce to String + number = arguments[0].to_s # Only numbers allowed ... unless number.match(/^\-?\d+$/) diff --git a/spec/unit/puppet/parser/functions/num2bool_spec.rb b/spec/unit/puppet/parser/functions/num2bool_spec.rb index 640c689..e51ee45 100644 --- a/spec/unit/puppet/parser/functions/num2bool_spec.rb +++ b/spec/unit/puppet/parser/functions/num2bool_spec.rb @@ -12,13 +12,33 @@ describe "the num2bool function" do lambda { scope.function_num2bool([]) }.should( raise_error(Puppet::ParseError)) end - it "should return true if 1" do + it "should return true if passed string 1" do result = scope.function_num2bool(["1"]) result.should(be_true) end - it "should return false if 0" do + it "should return true if passed number 1" do + result = scope.function_num2bool([1]) + result.should(be_true) + end + + it "should return false if passed string 0" do result = scope.function_num2bool(["0"]) result.should(be_false) end + + it "should return false if passed number 0" do + result = scope.function_num2bool([0]) + result.should(be_false) + end + + it "should return false if passed string -1" do + result = scope.function_num2bool(["-1"]) + result.should(be_false) + end + + it "should return false if passed number -1" do + result = scope.function_num2bool([-1]) + result.should(be_false) + end end |