Improving namespace.

Author: toni.lopez

composer.json

@@ -10,6 +10,8 @@
         }
     ],
     "autoload": {
-        "psr-0": {"Statsd": "src/"}
+        "psr-4": {
+            "Statsd\\": "src/"
+        }
     }
 }

phpunit.xml.dist

@@ -9,11 +9,11 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
         >
     <testsuites>
         <testsuite name="Statsd Test Suite">
-            <directory>./tests/Statsd/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
     <filter>

src/Statsd/Client.php renamed to src/Client.php

@@ -7,6 +7,7 @@
 
 namespace Statsd;
 
+use Exception;
 use Monolog\Logger;
 use Statsd\Client\Configuration;
 
@@ -55,7 +56,7 @@ public function addStat(array $stat)
     {
         try {
             $this->isValidStat($stat);
-        } catch (Exception) {
+        } catch (Exception $e) {
             throw new Exception('Stat is not valid: ' . $e->getMessage());
         }
 
@@ -98,7 +99,9 @@ public function sendStats()
      */
     private function isValidStat(array $stat)
     {
-        if (!preg_match('/^[a-zA-Z0-9_]+(\.[a-zA-Z0-9_]+)*$/', $stat['namespace'])) {
+        if (!isset($stat['namespace']) || !isset($stat['value']) || !isset($stat['type'])) {
+            throw new Exception('namespace, type and value are mandatory keys.');
+        } elseif (!preg_match('/^[a-zA-Z0-9_]+(\.[a-zA-Z0-9_]+)*$/', $stat['namespace'])) {
             throw new Exception(
                 "'$stat[namespace]' does not seem to be a valid prefix. Use a string of "
                 . 'alphanumerics and dots, e.g. "stats.infratools.twitterhose".'
@@ -114,7 +117,7 @@ private function isValidStat(array $stat)
      * @param array $stat
      * @return string
      */
-    private function statToString()
+    private function statToString($stat)
     {
         return sprintf('%s:%s|%s', $stat['namespace'], $stat['value'], $stat['type']);
     }

src/Statsd/Client/Configuration.php renamed to src/Client/Configuration.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @package Statsd\Tests
+ * @author toni <toni.lopez@shazam.com>
+ */
+
+namespace Statsd\Tests;
+
+use Statsd\Client;
+use Statsd\Client\Configuration;
+use Exception;
+
+/**
+ * @package Statsd\Tests
+ */
+
+class ClientTest extends \PHPUnit_Framework_TestCase
+{
+    public function providerWrongStat()
+    {
+        return array(
+            array('stat' => array()),
+            array('stat' => array('namespace' => '', 'value' => '')),
+            array('stat' => array('namespace' => 'a.namespace.W£@£$%', 'type' => 'c', 'value' => 23)),
+            array('stat' => array('namespace' => 'a.namespace', 'type' => 'something', 'value' => 23)),
+            array('stat' => array('namespace' => 'a.namespace', 'type' => 'c', 'value' => 'halal'))
+        );
+    }
+
+    /**
+     * @dataProvider providerWrongStat
+     * @expectedException Exception
+     */
+    public function testAddWrongStat(array $stat)
+    {
+        $client = new Client(new Configuration());
+        $client->addStat($stat);
+    }
+}