Remove config file

Author: SMillerDev

.gitignore

@@ -10,5 +10,4 @@
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-config.json
 *.pem

config.json.sample

@@ -3,7 +3,6 @@
  * Set up include path for source handling
  */
 set_include_path(get_include_path().":".__DIR__.'/src/');
-$config = json_decode(file_get_contents(__DIR__."/config.json"));
 
 /**
  * Set up required classes (with the autoloader)

index.php

@@ -17,11 +17,11 @@ class Drafter
      */
     public $json;
     /**
-     * Configuration
+     * Temp directory
      *
      * @var array
      */
-    protected $config;
+    protected $tmp_dir;
     /**
      * The API Blueprint input
      *
@@ -43,15 +43,15 @@ class Drafter
      */
     public function __construct($apib)
     {
-        global $config;
-        $this->config = &$config;
         $this->apib   = $apib;
 
         if (!$this->location())
         {
             throw new \RuntimeException("Drafter was not installed!", 1);
         }
         $this->drafter = $this->location();
+
+        $this->tmp_dir = sys_get_temp_dir().'/drafter';
     }
 
     /**
@@ -74,21 +74,19 @@ function location()
      */
     public function parseToJson()
     {
-        $tmp_dir = $this->config->tmpdir;
-
-        if (!file_exists($tmp_dir))
+        if (!file_exists($this->tmp_dir))
         {
-            mkdir($tmp_dir);
+            mkdir($this->tmp_dir);
         }
 
-        file_put_contents($tmp_dir . '/index.apib', $this->apib);
+        file_put_contents($this->tmp_dir . '/index.apib', $this->apib);
 
-        shell_exec($this->drafter . ' ' . $tmp_dir . '/index.apib -f json -o ' . $tmp_dir . '/index.json 2> /dev/null');
-        $this->json = json_decode(file_get_contents($tmp_dir . '/index.json'));
+        shell_exec($this->drafter . ' ' . $this->tmp_dir . '/index.apib -f json -o ' . $this->tmp_dir . '/index.json 2> /dev/null');
+        $this->json = json_decode(file_get_contents($this->tmp_dir . '/index.json'));
 
         if (json_last_error() !== JSON_ERROR_NONE)
         {
-            file_put_contents('php://stdout', "ERROR: invalid json in " . $tmp_dir . '/index.json');
+            file_put_contents('php://stdout', "ERROR: invalid json in " . $this->tmp_dir . '/index.json');
             throw new \RuntimeException("Drafter generated invalid JSON (" . json_last_error_msg() . ")", 2);
         }
 

src/PHPDraft/Parse/Drafter.php

@@ -24,12 +24,12 @@ class DrafterTest extends TestBase
      */
     public function setUp()
     {
-        global $config;
-        $config->tmpdir = TEST_STATICS;
+        $this->mock_function('sys_get_temp_dir', 'return "'.TEST_STATICS.'";');
         $this->mock_function('shell_exec', 'return "/some/dir/drafter\n";');
-        $this->class      = new Drafter(file_get_contents(TEST_STATICS . '/apib'));
+        $this->class      = new Drafter(file_get_contents(TEST_STATICS . '/drafter/apib'));
         $this->reflection = new ReflectionClass('PHPDraft\Parse\Drafter');
         $this->unmock_function('shell_exec');
+        $this->unmock_function('sys_get_temp_dir');
     }
 
     /**
@@ -48,7 +48,7 @@ public function testSetupCorrectly()
     {
         $property = $this->reflection->getProperty('apib');
         $property->setAccessible(TRUE);
-        $this->assertEquals(file_get_contents(TEST_STATICS . '/apib'), $property->getValue($this->class));
+        $this->assertEquals(file_get_contents(TEST_STATICS . '/drafter/apib'), $property->getValue($this->class));
     }
 
     /**
@@ -65,9 +65,9 @@ public function testPreRunStringIsEmpty()
     public function testParseToJSON()
     {
         $this->mock_function('shell_exec', 'return "";');
-        file_put_contents(TEST_STATICS.'/index.json', file_get_contents(TEST_STATICS.'/json'));
+        file_put_contents(TEST_STATICS.'/drafter/index.json', file_get_contents(TEST_STATICS.'/drafter/json'));
         $this->class->parseToJson();
-        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS.'/json')), $this->class->json);
+        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS.'/drafter/json')), $this->class->json);
         $this->unmock_function('shell_exec');
     }
 
@@ -82,7 +82,7 @@ public function testParseToJSON()
     public function testParseToJSONWithErrors()
     {
         $this->mock_function('shell_exec', 'return "";');
-        file_put_contents(TEST_STATICS.'/index.json', file_get_contents(TEST_STATICS.'/json_errors'));
+        file_put_contents(TEST_STATICS.'/drafter/index.json', file_get_contents(TEST_STATICS.'/drafter/json_errors'));
         $this->class->parseToJson();
         $this->expectOutputString("WARNING: ignoring unrecognized block\nWARNING: no headers specified\nWARNING: ignoring unrecognized block\nWARNING: empty request message-body");
         $this->unmock_function('shell_exec');

src/PHPDraft/Parse/Tests/DrafterTest.php

@@ -31,7 +31,7 @@ class JsonToHTMLTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $this->class = new JsonToHTML(json_decode(file_get_contents(TEST_STATICS . '/json')));
+        $this->class = new JsonToHTML(json_decode(file_get_contents(TEST_STATICS . '/drafter/json')));
         $this->reflection = new ReflectionClass('PHPDraft\Parse\JsonToHTML');
     }
 
@@ -51,7 +51,7 @@ public function testSetupCorrectly()
     {
         $property = $this->reflection->getProperty('object');
         $property->setAccessible(TRUE);
-        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS . '/json')), $property->getValue($this->class));
+        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS . '/drafter/json')), $property->getValue($this->class));
     }
 
 }

src/PHPDraft/Parse/Tests/JsonToHTMLTest.php

@@ -24,8 +24,6 @@
 // Load and setup class file autloader
 require_once 'PHPDraft/Core/Autoloader.php';
 
-$config = json_decode(file_get_contents($base."/config.json"));
-
 if (defined('TEST_STATICS') === FALSE)
 {
     define('TEST_STATICS', __DIR__ . '/statics');