14545 - Data inputs should be optional

In the past functions without any parameters returned a function hash with and empty string as parameter. Functions without parameters now return a function hash with nil as parameter.
mstine · May 17, 2012 · 3573cfe · 3573cfe
1 parent 8e11bad
commit 3573cfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/mcollective/matcher.rb b/lib/mcollective/matcher.rb
@@ -41,7 +41,11 @@ def self.create_function_hash(function_call)
 
       # Grab function name and parameters from left compare string
       func_hash["name"], func_hash["params"] = f.split("(")
-      func_hash["params"] = func_hash["params"].gsub(")", "").gsub(/'|"/, "")
+      if func_hash["params"] == ")"
+        func_hash["params"] = nil
+      else
+        func_hash["params"] = func_hash["params"].gsub(")", "").gsub(/'|"/, "")
+      end
 
       func_hash
     end

diff --git a/spec/unit/matcher_spec.rb b/spec/unit/matcher_spec.rb
@@ -87,7 +87,7 @@ module MCollective
       it "should create a correct hash when no parameters are given" do
         result = Matcher.create_function_hash("foo()<=1")
         result["value"].should == nil
-        result["params"].should == ""
+        result["params"].should == nil
         result["r_compare"].should == "1"
         result["operator"].should == "<="
         result["name"].should == "foo"