From f28550e78996f908b076cdc9aebcbe584c777cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Dal=C3=A9n?= <dalen@spotify.com>
Date: Wed, 10 Apr 2013 14:38:14 +0200
Subject: Add a count function

Similar to the ruby count method on arrays.
---
 spec/unit/puppet/parser/functions/count_spec.rb | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 spec/unit/puppet/parser/functions/count_spec.rb

(limited to 'spec/unit/puppet/parser/functions/count_spec.rb')

diff --git a/spec/unit/puppet/parser/functions/count_spec.rb b/spec/unit/puppet/parser/functions/count_spec.rb
new file mode 100644
index 0000000..5e4a8b9
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/count_spec.rb
@@ -0,0 +1,27 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe "the count function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("count").should == "function_count"
+  end
+
+  it "should raise a ArgumentError if there is more than 2 arguments" do
+    lambda { scope.function_count(['foo', 'bar', 'baz']) }.should( raise_error(ArgumentError))
+  end
+
+  it "should be able to count arrays" do
+    scope.function_count([["1","2","3"]]).should(eq(3))
+  end
+
+  it "should be able to count matching elements in arrays" do
+    scope.function_count([["1", "2", "2"], "2"]).should(eq(2))
+  end
+
+  it "should not count :undef, nil or empty strings" do
+    scope.function_count([["foo","bar",:undef,nil,""]]).should(eq(2))
+  end
+end
-- 
cgit v1.2.3


From 435226abfdf001bf2475be56d77027c638e93b70 Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 10 Apr 2013 14:33:08 -0700
Subject: (maint) Add the behavior for count() with arrays and hashes

Without this patch the expected behavior of the count() function when
dealing with an out of bound array index and with a hash key that does
not exist is implicitly encoded in the spec examples.  This is a problem
because the expected behavior is not clear for something similar to the
following example:

    node default {
      $ary = [ 1, 2, 3 ]
      $ary_undef = $ary[100]
      $hsh = { 'one' => 1 }
      $hsh_undef = $hsh['dne']
      $count = count(['hi', $ary_undef, $hsh_undef])
      notice "Count is ${count}"
    }

This patch addresses the problem by making the expected behavior
explicit in the examples.
---
 spec/unit/puppet/parser/functions/count_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'spec/unit/puppet/parser/functions/count_spec.rb')

diff --git a/spec/unit/puppet/parser/functions/count_spec.rb b/spec/unit/puppet/parser/functions/count_spec.rb
index 5e4a8b9..2453815 100644
--- a/spec/unit/puppet/parser/functions/count_spec.rb
+++ b/spec/unit/puppet/parser/functions/count_spec.rb
@@ -21,7 +21,11 @@ describe "the count function" do
     scope.function_count([["1", "2", "2"], "2"]).should(eq(2))
   end
 
-  it "should not count :undef, nil or empty strings" do
-    scope.function_count([["foo","bar",:undef,nil,""]]).should(eq(2))
+  it "should not count nil or empty strings" do
+    scope.function_count([["foo","bar",nil,""]]).should(eq(2))
+  end
+
+  it 'does not count an undefined hash key or an out of bound array index (which are both :undef)' do
+    expect(scope.function_count([["foo",:undef,:undef]])).to eq(1)
   end
 end
-- 
cgit v1.2.3