added exceptions, added an always invalidating validator

Author: temp

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": ">=5.3.0",
         "mikey179/vfsStream": "1.1.*",
-        "symfony/http-foundation": "2.1.*"
+        "symfony/http-foundation": ">=2.1"
     },
     "autoload": {
         "psr-0": { "Brainbits": "src/" }

src/Brainbits/Blocking/Adapter/AdapterInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence

src/Brainbits/Blocking/Adapter/FilesystemAdapter.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence
@@ -10,7 +10,8 @@
 
 use Brainbits\Blocking\Identifier\IdentifierInterface;
 use Brainbits\Blocking\BlockInterface;
-use Brainbits\Blocking\Block;
+use Brainbits\Blocking\Exception\DirectoryNotWritableException;
+use Brainbits\Blocking\Exception\FileNotWritableException;
 
 /**
  * Filesystem block adapter
@@ -110,22 +111,36 @@ public function get(IdentifierInterface $identifier)
      */
     protected function getFilename(IdentifierInterface $identifier)
     {
-        return $this->ensureDirectoryExists($this->root) . '/' . $identifier;
+        return $this->ensureFileIsWritable($this->ensureDirectoryExists($this->root) . '/' . $identifier);
+    }
+
+    /**
+     * Ensure file is writable
+     *
+     * @param string $file
+     * @return string
+     * @throws FileNotWritableException
+     */
+    protected function ensureFileIsWritable($file)
+    {
+        if (!is_writable(dirname($file))) {
+            throw new FileNotWritableException('File ' . $file . ' not writable.');
+        }
+
+        return $file;
     }
 
     /**
      * Ensure directory exists
      *
-     * @param string $filename
+     * @param string $dirname
      * @return string
-     * @throws \Exception
+     * @throws DirectoryNotWritableException
      */
     protected function ensureDirectoryExists($dirname)
     {
-        if (!file_exists($dirname)) {
-            if (!mkdir($dirname, 0777, true)) {
-                throw new \Exception('Can\'t create block dir ' . $dirname);
-            }
+        if (!file_exists($dirname) && !mkdir($dirname, 0777, true)) {
+            throw new DirectoryNotWritableException('Can\'t create block dir ' . $dirname . '.');
         }
 
         return $dirname;

src/Brainbits/Blocking/Block.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence

src/Brainbits/Blocking/BlockInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence

src/Brainbits/Blocking/BlockableInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence

src/Brainbits/Blocking/Blocker.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the brainbits block package.
+ * This file is part of the brainbits blocking package.
  *
  * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
  * @license   http://www.brainbits.net/LICENCE     Dummy Licence
@@ -9,9 +9,10 @@
 namespace Brainbits\Blocking;
 
 use Brainbits\Blocking\Adapter\AdapterInterface;
-use Brainbits\Blocking\Validator\ValidatorInterface;
+use Brainbits\Blocking\Exception\BlockingException;
 use Brainbits\Blocking\Identifier\IdentifierInterface;
 use Brainbits\Blocking\Owner\OwnerInterface;
+use Brainbits\Blocking\Validator\ValidatorInterface;
 
 /**
  * Blocker
@@ -52,13 +53,14 @@ public function __construct(AdapterInterface $adapter, OwnerInterface $owner, Va
      *
      * @param IdentifierInterface $identifier
      * @return BlockInterface
+     * @throws BlockingException
      */
     public function block(IdentifierInterface $identifier)
     {
         if ($this->isBlocked($identifier)) {
             $block = $this->getBlock($identifier);
             if ((string)$block->getOwner() !== (string)$this->owner) {
-                throw new \Exception('Already blocked');
+                throw new BlockingException('Already blocked');
             }
             $this->adapter->touch($block);
             return $block;

src/Brainbits/Blocking/Exception/BlockingException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * This file is part of the brainbits blocking package.
+ *
+ * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * @license   http://www.brainbits.net/LICENCE     Dummy Licence
+ */
+
+namespace Brainbits\Blocking\Exception;
+
+/**
+ * Blocking exception
+ *
+ * @author Stephan Wentz <sw@brainbits.net>
+ */
+class BlockingException extends Exception
+{
+}

src/Brainbits/Blocking/Exception/DirectoryNotWritableException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * This file is part of the brainbits blocking package.
+ *
+ * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * @license   http://www.brainbits.net/LICENCE     Dummy Licence
+ */
+
+namespace Brainbits\Blocking\Exception;
+
+/**
+ * Directory not writable exception
+ *
+ * @author Stephan Wentz <sw@brainbits.net>
+ */
+class DirectoryNotWritableException extends Exception
+{
+}

src/Brainbits/Blocking/Exception/Exception.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * This file is part of the brainbits blocking package.
+ *
+ * @copyright 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * @license   http://www.brainbits.net/LICENCE     Dummy Licence
+ */
+
+namespace Brainbits\Blocking\Exception;
+
+/**
+ * Base exception
+ *
+ * @author Stephan Wentz <sw@brainbits.net>
+ */
+class Exception extends \Exception
+{
+}