Refactor in JasperPHP::execute() and create a Exceptions

Author: rafaelqueiroz

src/Exception/ErrorCommandExecutable.php

@@ -0,0 +1,14 @@
+<?php
+namespace JasperPHP\Exception;
+/**
+ * Class ErrorCommandExecutable
+ * @package JasperPHP\Exception
+ */
+class ErrorCommandExecutable extends \Exception
+{
+    public function __construct($message = "", $code = 0, Exception $previous = null)
+    {
+        $message = 'Your report has an error and couldn \'t be processed!\ Try to output the command using the function `output();` and run it manually in the console.';
+        parent::__construct($message, $code, $previous);
+    }
+}

src/Exception/InvalidCommandExecutable.php

@@ -0,0 +1,21 @@
+<?php
+namespace JasperPHP\Exception;
+/**
+ * Class InvalidCommandExecutable
+ * @package JasperPHP\Exception
+ */
+class InvalidCommandExecutable extends \Exception
+{
+
+    /**
+     * InvalidCommandExecutable constructor.
+     * @param string $message
+     * @param int $code
+     * @param Exception|null $previous
+     */
+    public function __construct($message = "", $code = 0, Exception $previous = null)
+    {
+        $message = 'Cannot execute a blank command';
+        parent::__construct($message, $code, $previous);
+    }
+}

src/Exception/InvalidResourceDirectory.php

@@ -0,0 +1,22 @@
+<?php
+namespace JasperPHP\Exception;
+/**
+ * Class InvalidResourceDirectory
+ * @package JasperPHP\Exception
+ */
+class InvalidResourceDirectory extends \Exception
+{
+
+    /**
+     * Invalid Resource Directory constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param Exception|null $previous
+     */
+    public function __construct($message = "", $code = 0, Exception $previous = null)
+    {
+        $message = 'Invalid resource directory';
+        parent::__construct($message, $code, $previous);
+    }
+}

src/JasperPHP.php

@@ -1,5 +1,6 @@
 <?php
 namespace JasperPHP;
+
 /**
  * Class JasperPHP
  *
@@ -192,26 +193,54 @@ public function output()
         return $this->the_command;
     }
 
-    public function execute($run_as_user = false)
+    /**
+     * @param bool $user
+     * @return mixed
+     * @throws Exception\InvalidCommandExecutable
+     * @throws Exception\InvalidResourceDirectory
+     * @throws Exception\ErrorCommandExecutable
+     */
+    public function execute($user = false)
     {
-        if ($run_as_user !== false && strlen($run_as_user > 0) && !$this->windows) {
-            $this->the_command = 'su -u ' . $run_as_user . " -c \"" . $this->the_command . "\"";
-        }
+        $this->validateExecute();
+        $this->addUserToCommand($user);
 
+        $command = $this->the_command;
         $output = [];
         $return_var = 0;
 
-        if (is_dir($this->path_executable)) {
-            chdir($this->path_executable);
-            exec($this->the_command, $output, $return_var);
-        } else {
-            throw new \Exception('Invalid resource directory.', 1);
+        chdir($this->path_executable);
+        exec($command, $output, $return_var);
+        if ($return_var !== 0) {
+            throw new \JasperPHP\Exception\ErrorCommandExecutable();
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $user
+     */
+    protected function addUserToCommand($user)
+    {
+        if ($user && !$this->windows) {
+            $this->the_command = 'su -u ' . $user . " -c \"" . $this->the_command . "\"";
         }
+    }
 
-        if ($return_var != 0) {
-            throw new \Exception('Your report has an error and couldn \'t be processed!\ Try to output the command using the function `output();` and run it manually in the console.', 1);
+    /**
+     * @throws Exception\InvalidCommandExecutable
+     * @throws Exception\InvalidResourceDirectory
+     */
+    protected function validateExecute()
+    {
+        if (!$this->the_command) {
+            throw new \JasperPHP\Exception\InvalidCommandExecutable();
+        }
+        if (!is_dir ($this->path_executable)) {
+            throw new \JasperPHP\Exception\InvalidResourceDirectory();
         }
 
-        return $output;
     }
+
 }

tests/JasperPHP/JasperPHPTest.php

@@ -17,4 +17,26 @@ public function testConstructor()
         $this->assertInstanceOf(JasperPHP::class, new JasperPHP());
     }
 
+    /**
+     *
+     */
+    public function testExecuteWithoutCompile()
+    {
+        $this->setExpectedException(\JasperPHP\Exception\InvalidCommandExecutable::class);
+
+        $jasper = new JasperPHP();
+        $jasper->execute();
+    }
+
+    /**
+     *
+     */
+    public function testExecuteWithCompileAndWrongInput()
+    {
+        $this->setExpectedException(\JasperPHP\Exception\ErrorCommandExecutable::class);
+
+        $jasper = new JasperPHP();
+        $jasper->compile('hello_world.jrxml')->execute();
+    }
+
 }