Merge pull request #18 from xp-forge/feature/json_io

Extend Json::read() and Json::write() to accept files and streams

Author: thekid

src/main/php/text/json/Json.class.php

@@ -1,5 +1,9 @@
 <?php namespace text\json;
 
+use io\File;
+use io\streams\{InputStream, OutputStream};
+use lang\IllegalArgumentException;
+
 /**
  * Simple entry point class
  *
@@ -11,25 +15,42 @@ abstract class Json {
   /**
    * Reads from an input
    *
-   * @param  string|text.json.Input $input
+   * @param  string|text.json.Input|io.File|io.stream.InputStream $input
    * @return var
    */
   public static function read($input) {
     if ($input instanceof Input) {
-      return $input->read();
+      // NOOP
+    } else if ($input instanceof File) {
+      $input= new FileInput($input);
+    } else if ($input instanceof InputStream) {
+      $input= new StreamInput($input);
     } else {
-      return (new StringInput($input))->read();
+      $input= new StringInput((string)$input);
     }
+
+    return $input->read();
   }
 
   /**
    * Writes to an output and returns the output
    *
    * @param  var $value
-   * @param  text.json.Output $output
+   * @param  text.json.Output|io.File|io.stream.OutputStream $output
    * @return text.json.Output The given output
+   * @throws lang.IllegalArgumentException
    */
-  public static function write($value, Output $output) {
+  public static function write($value, $output) {
+    if ($output instanceof Output) {
+      // NOOP
+    } else if ($output instanceof File) {
+      $output= new FileOutput($output);
+    } else if ($output instanceof OutputStream) {
+      $output= new StreamOutput($output);
+    } else {
+      throw new IllegalArgumentException('Expected an Output, File or OutputStream, have '.typeof($output));
+    }
+
     $output->write($value);
     return $output;
   }

src/test/php/text/json/unittest/JsonTest.class.php

@@ -1,8 +1,11 @@
 <?php namespace text\json\unittest;
 
-use lang\FormatException;
+use io\streams\{MemoryInputStream, MemoryOutputStream};
+use io\{Files, TempFile};
+use lang\{FormatException, IllegalArgumentException};
 use test\{Assert, Expect, Test};
 use text\json\{Format, Json, StringInput, StringOutput};
+use util\Bytes;
 
 class JsonTest {
 
@@ -16,6 +19,26 @@ public function read_string() {
     Assert::equals('Test', Json::read('"Test"'));
   }
 
+  #[Test]
+  public function read_casts_input_to_string() {
+    Assert::equals('Test', Json::read(new Bytes('"Test"')));
+  }
+
+  #[Test]
+  public function read_file() {
+    $file= new TempFile();
+    try {
+      Assert::equals('Test', Json::read($file->containing('"Test"')));
+    } finally {
+      $file->unlink();
+    }
+  }
+
+  #[Test]
+  public function read_stream() {
+    Assert::equals('Test', Json::read(new MemoryInputStream('"Test"')));
+  }
+
   #[Test, Expect(FormatException::class)]
   public function read_malformed_string() {
     Json::read('this.is.not.json');
@@ -31,6 +54,26 @@ public function write_output() {
     Assert::equals('"Test"', Json::write('Test', new StringOutput())->bytes());
   }
 
+  #[Test]
+  public function write_file() {
+    $file= new TempFile();
+    try {
+      Assert::equals('"Test"', Files::read(Json::write('Test', $file)->file()));
+    } finally {
+      $file->unlink();
+    }
+  }
+
+  #[Test]
+  public function write_stream() {
+    Assert::equals('"Test"', Json::write('Test', new MemoryOutputStream())->stream()->bytes());
+  }
+
+  #[Test, Expect(IllegalArgumentException::class)]
+  public function write_incorrect_type() {
+    Json::write('Test', $this);
+  }
+
   #[Test]
   public function of_string() {
     Assert::equals('"Test"', Json::of('Test'));