Added support for deleting all registered functions in a namespace.

F21 · F21 · commit 2f40e4e47ca1 · 2013-05-19T16:00:21.000+10:00
diff --git a/lib/triagens/ArangoDb/AqlUserFunction.php b/lib/triagens/ArangoDb/AqlUserFunction.php
@@ -145,19 +145,25 @@ public function register($name = null, $code = null)
      *
      * If $name is passed, it will override the object's property with the passed one
      *
-     * @param null $name
+     * @param string $name
+     * @param boolean $namespace
      *
      * @throws Exception throw exception if the request fails
      *
      * @return mixed true if successful without a return value or the return value if one was set in the action
      */
-    public function unregister($name = null)
+    public function unregister($name = null, $namespace = false)
     {
         if (is_null($name)) {
             $name = $this->getName();
         }
+
         $url = UrlHelper::buildUrl(Urls::URL_AQL_USER_FUNCTION, $name);
 
+        if($namespace){
+            $url = UrlHelper::appendParamsUrl($url, array('group' => true));
+        }
+
         $response      = $this->_connection->delete($url);
         $responseArray = $response->getJson();
 
diff --git a/tests/AqlUserFunctionTest.php b/tests/AqlUserFunctionTest.php
@@ -290,6 +290,40 @@ public function testGetAQLFunctionsWithNamespaceFilter()
         $userFunction->unregister($name2);
     }
 
+    /**
+     * Unregister all AQL functions on a namespace.
+     */
+    public function testUnregisterAQLFunctionsOnNamespace()
+    {
+
+        $name1 = 'myFunctions:myFunction1';
+        $name2 = 'myFunctions:myFunction2';
+        $code = 'function (celsius) { return celsius * 1.8 + 32; }';
+
+        //Setup
+        $userFunction = new AqlUserFunction($this->connection);
+
+        $userFunction->name = $name1;
+        $userFunction->code = $code;
+
+        $result = $userFunction->register();
+
+        $userFunction = new AqlUserFunction($this->connection);
+
+        $userFunction->name = $name2;
+        $userFunction->code = $code;
+
+        $result = $userFunction->register();
+
+        $functions = $userFunction->getRegisteredUserFunctions('myFunctions');
+        $this->assertCount(2, $functions, "myFunctions namespace should only contain 2 functions.");
+
+        $userFunction->unregister('myFunctions', true);
+
+        $functions = $userFunction->getRegisteredUserFunctions('myFunctions');
+        $this->assertEmpty($functions, "myFunctions namespace should only contain no functions.");
+    }
+
     public function tearDown()
     {
 

Original file line number	Diff line number	Diff line change
`@@ -145,19 +145,25 @@ public function register($name = null, $code = null)`
`145`	`145`	`*`
`146`	`146`	`* If $name is passed, it will override the object's property with the passed one`
`147`	`147`	`*`
`148`		`- * @param null $name`
	`148`	`+ * @param string $name`
	`149`	`+ * @param boolean $namespace`
`149`	`150`	`*`
`150`	`151`	`* @throws Exception throw exception if the request fails`
`151`	`152`	`*`
`152`	`153`	`* @return mixed true if successful without a return value or the return value if one was set in the action`
`153`	`154`	`*/`
`154`		`- public function unregister($name = null)`
	`155`	`+ public function unregister($name = null, $namespace = false)`
`155`	`156`	`{`
`156`	`157`	`if (is_null($name)) {`
`157`	`158`	`$name = $this->getName();`
`158`	`159`	`}`
	`160`	`+`
`159`	`161`	`$url = UrlHelper::buildUrl(Urls::URL_AQL_USER_FUNCTION, $name);`
`160`	`162`
	`163`	`+ if($namespace){`
	`164`	`+ $url = UrlHelper::appendParamsUrl($url, array('group' => true));`
	`165`	`+ }`
	`166`	`+`
`161`	`167`	`$response = $this->_connection->delete($url);`
`162`	`168`	`$responseArray = $response->getJson();`
`163`	`169`