Refactoring, updating tests

jobapis · Sep 28, 2015 · f82d37d · f82d37d
1 parent 6f4a56c
commit f82d37d
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 33 deletions.
diff --git a/src/Govt.php b/src/Govt.php
@@ -5,6 +5,65 @@
 
 class Govt extends AbstractProvider
 {
+    /**
+     * Map of setter methods to query parameters
+     *
+     * @var array
+     */
+    protected $queryMap = [
+        'setCount' => 'size',
+        'setFrom' => 'from',
+        'setHl' => 'hl',
+        'setKeyword' => 'query',
+        'setLatLon' => 'lat_lon',
+        'setOrganizationIds' => 'organization_ids',
+        'setQuery' => 'query',
+        'setSize' => 'size',
+        'setTags' => 'tags',
+    ];
+
+    /**
+     * Current api query parameters
+     *
+     * @var array
+     */
+    protected $queryParams = [
+        'from' => null,
+        'hl' => null,
+        'lat_lon' => null,
+        'organization_ids' => null,
+        'query' => null,
+        'size' => null,
+        'tags' => null,
+    ];
+
+    /**
+     * Create new Govt jobs client.
+     *
+     * @param array $parameters
+     */
+    public function __construct($parameters = [])
+    {
+        parent::__construct($parameters);
+        array_walk($parameters, [$this, 'updateQuery']);
+    }
+
+    /**
+     * Magic method to handle get and set methods for properties
+     *
+     * @param  string $method
+     * @param  array  $parameters
+     *
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        if (isset($this->queryMap[$method], $parameters[0])) {
+            $this->updateQuery($parameters[0], $this->queryMap[$method]);
+        }
+        return parent::__call($method, $parameters);
+    }
+
     /**
      * Returns the standardized job object
      *
@@ -103,12 +162,20 @@ public function getFormat()
     }
 
     /**
-     * Get listings path
+     * Get page
      *
      * @return  string
      */
-    public function getListingsPath()
+    public function getFrom()
     {
+        if ($this->page) {
+            $from = ($this->page - 1) * $this->count;
+
+            if ($from) {
+                return $from;
+            }
+        }
+
         return null;
     }
 
@@ -129,20 +196,12 @@ public function getKeyword()
     }
 
     /**
-     * Get page
+     * Get listings path
      *
      * @return  string
      */
-    public function getFrom()
+    public function getListingsPath()
     {
-        if ($this->page) {
-            $from = ($this->page - 1) * $this->count;
-
-            if ($from) {
-                return $from;
-            }
-        }
-
         return null;
     }
 
@@ -153,22 +212,7 @@ public function getFrom()
      */
     public function getQueryString()
     {
-        $query_params = [
-            'query' => 'getKeyword',
-            'from' => 'getFrom',
-            'size' => 'getCount',
-        ];
-
-        $query_string = [];
-
-        array_walk($query_params, function ($value, $key) use (&$query_string) {
-            $computed_value = $this->$value();
-            if (!is_null($computed_value)) {
-                $query_string[$key] = $computed_value;
-            }
-        });
-
-        return http_build_query($query_string);
+        return http_build_query($this->queryParams);
     }
 
     /**
@@ -191,4 +235,20 @@ public function getVerb()
     {
         return 'GET';
     }
+
+    /**
+     * Attempts to update current query parameters.
+     *
+     * @param  string  $value
+     * @param  string  $key
+     *
+     * @return Careerbuilder
+     */
+    protected function updateQuery($value, $key)
+    {
+        if (array_key_exists($key, $this->queryParams)) {
+            $this->queryParams[$key] = $value;
+        }
+        return $this;
+    }
 }
diff --git a/tests/src/GovtTest.php b/tests/src/GovtTest.php
@@ -84,11 +84,10 @@ public function testUrlNotIncludesSizeWhenNotProvided()
 
     public function testUrlIncludesFromWhenProvided()
     {
-        $page = rand(5, 15);
-        $count = rand(10, 100);
-        $param = 'from='.(($page - 1) * $count);
+        $from = rand(10, 100);
+        $param = 'from='.$from;
 
-        $url = $this->client->setPage($page)->setCount($count)->getUrl();
+        $url = $this->client->setFrom($from)->getUrl();
 
         $this->assertContains($param, $url);
     }
@@ -97,7 +96,7 @@ public function testUrlNotIncludesFromWhenNotProvided()
     {
         $param = 'from=';
 
-        $url = $this->client->setPage(null)->getUrl();
+        $url = $this->client->setFrom(null)->getUrl();
 
         $this->assertNotContains($param, $url);
     }