Refactoring

Author: Eugene Tupikov

composer.json

@@ -3,12 +3,13 @@
   "require": {
     "react/react": "*",
     "phroute/phroute": "*",
-    "guzzlehttp/guzzle": "~6.0"
+    "guzzlehttp/guzzle": "~6.0",
+    "arvenil/ninja-mutex": "*"
 
   },
   "autoload": {
     "psr-4": {
-      "unclead\\phpcluster\\": "src/"
+      "PhpCluster\\": "src/"
     }
   }
 }

composer.lock

@@ -2,7 +2,7 @@
 
 require __DIR__ . '/vendor/autoload.php';
 
-use unclead\phpcluster\Application;
+use PhpCluster\Application;
 
 $app = new Application($argv);
 $app->run();

server.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace unclead\phpcluster;
+namespace PhpCluster;
 
 use Exception;
 use React\EventLoop\LoopInterface;
@@ -11,9 +11,7 @@
 use React\Http\Server as HttpServer;
 use Phroute\Phroute\RouteCollector;
 use Phroute\Phroute\Dispatcher;
-use unclead\phpcluster\collections\CmdCollection;
-use unclead\phpcluster\commands\InitCollectionCommand;
-use unclead\phpcluster\controllers\CmdController;
+use PhpCluster\Command\PopulateCollectionCommand;
 use Phroute\Phroute\Exception\HttpMethodNotAllowedException;
 use Phroute\Phroute\Exception\HttpRouteNotFoundException;
 
@@ -91,9 +89,10 @@ private function initHttpServer()
 
     private function afterInit()
     {
-        $this->getLogger()->info('Sync collection with other instances in cluster');
-        $command = new InitCollectionCommand($this->getCmdCollection(), $this->getConfig());
+        $this->getLogger()->debug('Sync collection with other instances in cluster');
+        $command = new PopulateCollectionCommand($this->getCmdCollection(), $this->getConfig());
         $command->execute();
+        $this->getLogger()->debug('Current collection state: ' . $this->getCmdCollection());
     }
 
     /**
@@ -110,14 +109,14 @@ private function initRouter()
     {
         $this->router = new RouteCollector();
         $this->router->get('/cmd{id:\d+}', function($id) {
-            $controller = new CmdController($this);
+            $controller = new Controller($this);
 
             $content = $controller->actionIncrement($id);
             return $content;
         });
 
         $this->router->get('/cmd', function() {
-            $controller = new CmdController($this);
+            $controller = new Controller($this);
             $this->responseContentType = 'application/json';
             $content = $controller->actionSummary();
             return $content;
@@ -126,7 +125,7 @@ private function initRouter()
         $this->router->post('/cmd{id:\d+}', function($id) {
             $this->request->on('data', function($data) use ($id){
                 parse_str($data, $data);
-                $controller = new CmdController($this);
+                $controller = new Controller($this);
                 $content = $controller->actionUpdate($id, $data);
                 return $content;
             });

src/Application.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace unclead\phpcluster\models;
+namespace PhpCluster;
 
 /**
  * Class Cmd
- * @package unclead\phpcluster\models
+ * @package PhpCluster
  */
 class Cmd {
 
@@ -13,16 +13,31 @@ class Cmd {
      */
     private $count = 0;
 
+    /**
+     * Returns current value of counter.
+     *
+     * @return int
+     */
     public function getCount ()
     {
         return $this->count;
     }
 
+    /**
+     * Set current value of counter.
+     *
+     * @param $v
+     */
     public function setCount($v)
     {
         $this->count = $v;
     }
 
+    /**
+     * Performs increment operation and returns the result.
+     *
+     * @return int
+     */
     public function increment ()
     {
         return ++$this->count;

src/models/Cmd.php renamed to src/Cmd.php

@@ -1,12 +1,9 @@
 <?php
 
-namespace unclead\phpcluster\collections;
-
-use unclead\phpcluster\models\Cmd;
+namespace PhpCluster;
 
 /**
  * Class CmdCollection
- * @package unclead\phpcluster\collections
  */
 class CmdCollection
 {
@@ -65,4 +62,13 @@ public function isEmpty()
     {
         return count($this->data) == 0;
     }
+
+    public function __toString()
+    {
+        $result = [];
+        foreach ($this->all() as $id => $entity) {
+            $result[$id] = $entity->getCount();
+        }
+        return json_encode($result);
+    }
 }

src/collections/CmdCollection.php renamed to src/CmdCollection.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace PhpCluster\Command;
+
+/**
+ * Interface BaseCommand
+ * @package PhpCluster\Command
+ */
+interface Command
+{
+    public function execute();
+}

src/Command/Command.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace unclead\phpcluster\commands;
+namespace PhpCluster\Command;
 
-use unclead\phpcluster\models\Cmd;
+use PhpCluster\Cmd;
 
 /**
  * Class IncrementCommand
- * @package unclead\phpcluster\commands
+ * @package PhpCluster\Command
  */
-class IncrementCommand extends BaseCommand
+class IncrementCountCommand implements Command
 {
     /**
      * @var Cmd

src/commands/IncrementCommand.php renamed to src/Command/IncrementCountCommand.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace unclead\phpcluster\commands;
+namespace PhpCluster\Command;
 
 use GuzzleHttp\Client;
-use unclead\phpcluster\collections\CmdCollection;
-use unclead\phpcluster\Config;
-use unclead\phpcluster\models\Cmd;
+use PhpCluster\CmdCollection;
+use PhpCluster\Config;
+use PhpCluster\Cmd;
 
 /**
  * Class PopulateCollectionCommand
- * @package unclead\phpcluster\commands
+ * @package PhpCluster\Command
  */
-class InitCollectionCommand extends BaseCommand
+class PopulateCollectionCommand implements Command
 {
     /**
      * @var CmdCollection

src/commands/InitCollectionCommand.php renamed to src/Command/PopulateCollectionCommand.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace unclead\phpcluster\commands;
+namespace PhpCluster\Command;
 
 use GuzzleHttp\Client;
 
 /**
  * Class SyncCommand
- * @package unclead\phpcluster\commands
+ * @package PhpCluster\Command
  */
-class SyncCommand extends BaseCommand
+class SyncCommand implements Command
 {
     /**
      * @var int