5 files changed, 107 insertions, 13 deletions
diff --git a/README_DEVELOPER.markdown b/README_DEVELOPER.markdown
index e8aa27a..04349ed 100644
--- a/README_DEVELOPER.markdown
+++ b/README_DEVELOPER.markdown
@@ -7,7 +7,7 @@ almost always be evaluated in the context of Puppet and Facter working
 together.
 
 Still, we don't want to write custom facts that blow up in the users face if
-Puppet is not loaded in memory.  This is often the case if the user run
+Puppet is not loaded in memory.  This is often the case if the user runs
 `facter` without also supplying the `--puppet` flag.
 
 Ah! But Jeff, the custom fact won't be in the `$LOAD_PATH` unless the user
diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index ab8f75b..f814344 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -3,31 +3,43 @@
 #
 
 # TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-# TODO(Krzysztof Wilczynski): Support for strings and hashes too ...
 
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
-Deletes a selected element from an array.
+Deletes all instances of a given element from an array, substring from a
+string, or key from a hash.
 
 *Examples:*
 
-    delete(['a','b','c'], 'b')
+    delete(['a','b','c','b'], 'b')
+    Would return: ['a','c']
 
-Would return: ['a','c']
+    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
+    Would return: {'a'=>1,'c'=>3}
+
+    delete('abracadabra', 'bra')
+    Would return: 'acada'
     EOS
   ) do |arguments|
 
     if (arguments.size != 2) then
       raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-        "given #{arguments.size} for 2")
+        "given #{arguments.size} for 2.")
     end
 
-    a = arguments[0]
+    collection = arguments[0]
     item = arguments[1]
 
-    a.delete(item)
-    a
-
+    case collection
+    when Array, Hash
+      collection.delete item
+    when String
+      collection.gsub! item, ''
+    else
+      raise(TypeError, "delete(): First argument must be an Array, " +
+            "String, or Hash. Given an argument of class #{collection.class}.")
+    end
+    collection
   end
 end
 
diff --git a/lib/puppet/parser/functions/pick.rb b/lib/puppet/parser/functions/pick.rb
new file mode 100644
index 0000000..cbc0300
--- /dev/null
+++ b/lib/puppet/parser/functions/pick.rb
@@ -0,0 +1,29 @@
+module Puppet::Parser::Functions
+ newfunction(:pick, :type => :rvalue, :doc => <<-EOS
+
+This function is similar to a coalesce function in SQL in that it will return
+the first value in a list of values that is not undefined or an empty string
+(two things in Puppet that will return a boolean false value). Typically,
+this function is used to check for a value in the Puppet Dashboard/Enterprise
+Console, and failover to a default value like the following:
+
+  $real_jenkins_version = pick($::jenkins_version, '1.449')
+
+The value of $real_jenkins_version will first look for a top-scope variable
+called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
+Enterprise Console are brought into Puppet as top-scope variables), and,
+failing that, will use a default value of 1.449.
+
+EOS
+) do |args|
+   args = args.compact
+   args.delete(:undef)
+   args.delete(:undefined)
+   args.delete("")
+   if args[0].to_s.empty? then
+     fail "Must provide non empty value."
+   else
+     return args[0]
+   end
+ end
+end
diff --git a/spec/unit/puppet/parser/functions/delete_spec.rb b/spec/unit/puppet/parser/functions/delete_spec.rb
index 0549232..2f29c93 100755
--- a/spec/unit/puppet/parser/functions/delete_spec.rb
+++ b/spec/unit/puppet/parser/functions/delete_spec.rb
@@ -8,12 +8,31 @@ describe "the delete function" do
     Puppet::Parser::Functions.function("delete").should == "function_delete"
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
+  it "should raise a ParseError if there are fewer than 2 arguments" do
     lambda { scope.function_delete([]) }.should( raise_error(Puppet::ParseError))
   end
 
-  it "should delete an item from an array" do
-    result = scope.function_delete([['a','b','c'],'b'])
+  it "should raise a ParseError if there are greater than 2 arguments" do
+    lambda { scope.function_delete([[], 'foo', 'bar']) }.should( raise_error(Puppet::ParseError))
+  end
+
+  it "should raise a TypeError if a number is passed as the first argument" do
+    lambda { scope.function_delete([1, 'bar']) }.should( raise_error(TypeError))
+  end
+
+  it "should delete all instances of an element from an array" do
+    result = scope.function_delete([['a','b','c','b'],'b'])
     result.should(eq(['a','c']))
   end
+
+  it "should delete all instances of a substring from a string" do
+    result = scope.function_delete(['foobarbabarz','bar'])
+    result.should(eq('foobaz'))
+  end
+
+  it "should delete a key from a hash" do
+    result = scope.function_delete([{ 'a' => 1, 'b' => 2, 'c' => 3 },'b'])
+    result.should(eq({ 'a' => 1, 'c' => 3 }))
+  end
+
 end
diff --git a/spec/unit/puppet/parser/functions/pick_spec.rb b/spec/unit/puppet/parser/functions/pick_spec.rb
new file mode 100644
index 0000000..761db6b
--- /dev/null
+++ b/spec/unit/puppet/parser/functions/pick_spec.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe "the pick function" do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  it "should exist" do
+    Puppet::Parser::Functions.function("pick").should == "function_pick"
+  end
+
+  it 'should return the correct value' do
+    scope.function_pick(['first', 'second']).should == 'first'
+  end
+
+  it 'should return the correct value if the first value is empty' do
+    scope.function_pick(['', 'second']).should == 'second'
+  end
+
+  it 'should remove empty string values' do
+    scope.function_pick(['', 'first']).should == 'first'
+  end
+
+  it 'should remove :undef values' do
+    scope.function_pick([:undef, 'first']).should == 'first'
+  end
+
+  it 'should remove :undefined values' do
+    scope.function_pick([:undefined, 'first']).should == 'first'
+  end
+
+  it 'should error if no values are passed' do
+    expect { scope.function_pick([]) }.to raise_error(Puppet::Error, /Must provide non empty value./)
+  end
+end