Out: Add run button

Author: SMillerDev

index.php

@@ -16,38 +16,42 @@
 use PHPDraft\Parse\JsonToHTML;
 
 define('VERSION', '0');
-$values = UI::main($argv);
-
-$apib = new ApibFileParser($values['file']);
-$apib = $apib->parse();
-
-$json = new DrafterAPI($apib);
-if (!(defined('DRAFTER_ONLINE_MODE') && DRAFTER_ONLINE_MODE === 1))
+try
 {
-    try
-    {
-        $json = new Drafter($apib);
-    }
-    catch (RuntimeException $exception)
+    $values = UI::main($argv);
+    $apib = new ApibFileParser($values['file']);
+    $apib = $apib->parse();
+
+    $json = new DrafterAPI($apib);
+    if (!(defined('DRAFTER_ONLINE_MODE') && DRAFTER_ONLINE_MODE === 1))
     {
-        file_put_contents('php://stderr', $exception->getMessage() . "\n");
-        $options = [
-            'y' => 'Yes',
-            'n' => 'No',
-        ];
-        $answer  = UI::ask('Do you want to use the online version? [y/n]', $options, 'y');
-        if (!$answer)
+        try
         {
-            file_put_contents('php://stderr', 'Could not find a suitable drafter version');
-            exit(1);
+            $json = new Drafter($apib);
+        }
+        catch (\PHPDraft\Parse\ResourceException $exception)
+        {
+            file_put_contents('php://stderr', $exception->getMessage() . "\n");
+            $options = [
+                'y' => 'Yes',
+                'n' => 'No',
+            ];
+            $answer  = UI::ask('Do you want to use the online version? [y/n]', $options, 'y');
+            if (!$answer)
+            {
+                throw new \RuntimeException('Could not find a suitable drafter version', 1);
+            }
         }
     }
-}
-
-$html          = new JsonToHTML($json->parseToJson());
-$html->sorting = $values['sorting'];
-$generator     = $html->get_html($values['template'], $values['image'], $values['css'], $values['js']);
 
+    $html          = new JsonToHTML($json->parseToJson());
+    $html->sorting = $values['sorting'];
+    $generator     = $html->get_html($values['template'], $values['image'], $values['css'], $values['js']);
+} catch (RuntimeException $exception)
+{
+    file_put_contents('php://stderr', $exception->getMessage().PHP_EOL);
+    exit($exception->getCode());
+}
 
 function phpdraft_var_dump(...$vars)
 {

src/PHPDraft/In/ApibFileParser.php

@@ -91,8 +91,7 @@ private function get_apib($filename)
     private function file_check($filename)
     {
         if (!file_exists($filename)) {
-            file_put_contents('php://stderr', "API File not found: $filename\n");
-            exit(1);
+            throw new \RuntimeException("API File not found: $filename", 1);
         }
     }
 

src/PHPDraft/Model/HTTPRequest.php

@@ -157,7 +157,6 @@ public function get_curl_command($base_url, $additional = [])
         return htmlspecialchars('curl ' . join(' ', $options) . ' ' . escapeshellarg($this->parent->build_url($base_url, true)));
     }
 
-
     /**
      * Check if item is the same as other item
      *

src/PHPDraft/Model/HTTPResponse.php

@@ -69,8 +69,10 @@ public function __construct($parent)
      */
     public function parse($object)
     {
-        if (isset($object->attributes)) {
+        if (isset($object->attributes->statusCode)) {
             $this->statuscode = intval($object->attributes->statusCode);
+        }
+        if (isset($object->attributes->headers)) {
             $this->parse_headers($object->attributes->headers);
         }
 

src/PHPDraft/Model/Transition.php

@@ -87,6 +87,7 @@ function parse($object)
 
         $this->href = (isset($object->attributes->href)) ? $object->attributes->href : $this->parent->href;
 
+
         if (isset($object->attributes->hrefVariables)) {
 
             $deps                = [];

src/PHPDraft/Out/HTML/material.css

@@ -27,6 +27,11 @@ h2.mdl-card__title-text {
     display: inline-block;
     width: 100%;
 }
+li.mdl-list__ite code{
+    font-size: 12px;
+    font-weight: normal;
+}
+
 .page-content {
     width: 80%;
     margin: 0px auto;

src/PHPDraft/Out/TemplateGenerator.php

@@ -87,8 +87,7 @@ public function get($object)
         $include = $this->find_include_file($this->template);
         if ($include === NULL)
         {
-            file_put_contents('php://stderr', "Couldn't find template '$this->template'\n");
-            exit(1);
+            throw new \RuntimeException("Couldn't find template '$this->template'", 1);
         }
 
         //Prepare base data

src/PHPDraft/Out/UI.php

@@ -47,7 +47,7 @@ public static function main($argv = [])
         if (!isset($argv[1])) {
             file_put_contents('php://stderr', 'Not enough arguments' . PHP_EOL);
             self::help();
-            exit(1);
+            throw new \RuntimeException('', 1);
         }
 
         $sorting = -1;
@@ -61,19 +61,18 @@ public static function main($argv = [])
         if (boolval(preg_match('/^\-/', $argv[1]))) {
             if (isset($options['h'])) {
                 self::help();
-                exit(0);
+                throw new \RuntimeException('', 0);
             }
 
             if (isset($options['v'])) {
                 self::version();
-                exit(0);
+                throw new \RuntimeException('', 0);
             }
 
             if (isset($options['f'])) {
                 $file = $options['f'];
             } else {
-                file_put_contents('php://stderr', 'No file to parse' . PHP_EOL);
-                exit(1);
+                throw new \RuntimeException('No file to parse', 1);
             }
         } else {
             $file = $argv[1];

src/PHPDraft/Parse/Drafter.php

@@ -28,7 +28,7 @@ public function __construct($apib)
 
         if (!$this->location())
         {
-            throw new \RuntimeException('Drafter was not installed!', 1);
+            throw new ResourceException('Drafter was not installed!', 1);
         }
 
         $this->drafter = $this->location();

src/PHPDraft/Parse/DrafterAPI.php

@@ -29,7 +29,7 @@ public function __construct($apib)
         curl_exec($ch);
 
         if (curl_errno($ch) !== CURLE_OK) {
-            throw new \RuntimeException('Drafter webservice is not available!', 1);
+            throw new ResourceException('Drafter webservice is not available!', 1);
         }
         curl_close($ch);
     }
@@ -46,7 +46,7 @@ protected function parse()
         $response = curl_exec($ch);
 
         if (curl_errno($ch) !== 0) {
-            throw new \RuntimeException('Drafter webservice failed to parse input', 1);
+            throw new ResourceException('Drafter webservice failed to parse input', 1);
         }
 
         $this->json = json_decode($response);