unit tests

Author: SamHausmann

examples/language.php

@@ -22,7 +22,7 @@
 $customHeaders = [];
 $customHeaders[0] = $appHeader;
 $params->set('content', $content);
-//$params->loadCustomHeaders($customHeaders);
+$params->loadCustomHeaders($customHeaders);
 
 try {
     $result = $api->language($params);

source/rosette/api/Api.php

@@ -332,11 +332,15 @@ private function callEndpoint($parameters, $subUrl)
         $resultObject = '';
 
         // if custom headers exist, add them
-        /*if($parameters->customHeaders != null){
+        if($parameters->customHeaders != null){
             foreach ($parameters->customHeaders as $key => $value) {
-                array_push($this->headers, $value);
+                if(strpos($value, "X") === 0 && strpos($value, "-") === 1){
+                    array_push($this->headers, $value);
+                } else {
+                    throw new RosetteException("Custom headers must start with \"X-\"");
+                }
             }
-        }*/
+        }
 
         if (strlen($parameters->getMultiPartContent()) > 0) {
             $content = $parameters->getMultiPartContent();

source/rosette/api/DocumentParameters.php

@@ -56,7 +56,7 @@ class DocumentParameters extends RosetteParamsSetBase
     /**
      * @var array customHeaders to allow user to provide custom headers for an API request
      */
-    //public $customHeaders;
+    public $customHeaders;
 
     /**
      * Constructor.
@@ -171,8 +171,8 @@ public function loadDocumentString($stringData, $multiPart = false)
      * @throws RosetteException
      */
 
-    /*public function loadCustomHeaders($headers)
+    public function loadCustomHeaders($headers)
     {
         $this->customHeaders = $headers;
-    }*/
+    }
 }

source/rosette/api/NameSimilarityParameters.php

@@ -37,7 +37,7 @@ class NameSimilarityParameters extends RosetteParamsSetBase
     /**
      * @var array customHeaders to allow user to provide custom headers for an API request
      */
-    //public $customHeaders;
+    public $customHeaders;
     /**
      * constructor.
      *
@@ -82,8 +82,8 @@ public function validate()
      * @throws RosetteException
      */
 
-    /*public function loadCustomHeaders($headers)
+    public function loadCustomHeaders($headers)
     {
         $this->customHeaders = $headers;
-    }*/
+    }
 }

source/rosette/api/NameTranslationParameters.php

@@ -61,7 +61,7 @@ class NameTranslationParameters extends RosetteParamsSetBase
     /**
      * @var array customHeaders to allow user to provide custom headers for an API request
      */
-    //public $customHeaders;
+    public $customHeaders;
     /**
      * constructor.
      */
@@ -100,8 +100,8 @@ public function validate()
      * @throws RosetteException
      */
 
-    /*public function loadCustomHeaders($headers)
+    public function loadCustomHeaders($headers)
     {
         $this->customHeaders = $headers;
-    }*/
+    }
 }

spec/rosette/api/ApiSpec.php

@@ -272,4 +272,18 @@ public function it_fails_with_non_200_response($params, $request)
         $this->setMockRequest($request);
         $this->shouldThrow('rosette\api\RosetteException')->duringRelationships($params);
     }
+
+    public function it_fails_with_incorrectly_formatted_custom_header($params, $request)
+    {
+        $params->beADoubleOf('\rosette\api\DocumentParameters');
+        $params->contentUri = 'http://some.dummysite.com';
+        $appHeader = [];
+        $appHeader = "RosetteAPI-App: php-app";
+        $customHeaders = [];
+        $customHeaders[0] = $appHeader;
+        $params->set('content', "some content");
+        $params->loadCustomHeaders($customHeaders);
+        $this->shouldThrow('rosette\api\RosetteException')->duringLanguage($params);
+
+    }
 }