Updated dependencies.

Author: Martin Brecht-Precht

composer.json

@@ -24,7 +24,7 @@
   },
   "require": {
     "php": ">=5.3",
-    "markdom/handler-interface": "^1.0.9",
+    "markdom/handler-interface": "^1.0.10",
     "markenwerk/stack-util": "~1.0",
     "markenwerk/string-builder": "^1.0.4",
     "markenwerk/json-pretty-printer": "~1.0",

example/commonmark-01.php

@@ -8,8 +8,6 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 $handler = new CommonmarkHandler();
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher
-	->setDispatchCommentBlocks(false)
-	->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/commonmark-02.php

@@ -8,6 +8,6 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 $handler = new CommonmarkHandler();
-$dispatcher = new CommonmarkDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.md');
+$dispatcher = new CommonmarkDispatcher(file_get_contents(__DIR__ . '/example-data.md'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/debug.php

@@ -8,6 +8,6 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 $handler = new DebugHandler();
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/html.php

@@ -11,6 +11,6 @@
 $handler
 	->setEscapeHtml(false)
 	->setBreakSoftBreaks(false);
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/json.php

@@ -11,6 +11,6 @@
 $handler
 	->setPrettyPrint(true)
 	->setEscapeUnicode(true);
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/xhtml.php

@@ -11,6 +11,6 @@
 $handler
 	->setEscapeHtml(true)
 	->setBreakSoftBreaks(true);
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult());

example/xml.php

@@ -10,6 +10,6 @@
 $handler = new XmlHandler();
 $handler
 	->setPrettyPrint(true);
-$dispatcher = new JsonDispatcher($handler);
-$dispatcher->processFile(__DIR__ . '/example-data.json');
+$dispatcher = new JsonDispatcher(file_get_contents(__DIR__ . '/example-data.json'));
+$dispatcher->dispatchTo($handler);
 fwrite(STDOUT, $handler->getResult()->saveXML());

src/Dispatcher/AbstractDispatcher.php

@@ -5,36 +5,36 @@
 use League\CommonMark\DocParser;
 use League\CommonMark\Environment;
 use Markdom\Dispatcher\CommonmarkUtil\DocumentProcessor;
-use Markdom\Dispatcher\Exception\DispatcherException;
 use Markdom\Dispatcher\HtmlProcessor\HtmlProcessorInterface;
+use Markdom\DispatcherInterface\DispatcherInterface;
 use Markdom\HandlerInterface\HandlerInterface;
 
 /**
  * Class CommonmarkDispatcher
  *
  * @package Markdom\Dispatcher
  */
-class CommonmarkDispatcher extends AbstractDispatcher
+class CommonmarkDispatcher implements DispatcherInterface
 {
 
 	/**
-	 * @var HandlerInterface
+	 * @var HtmlProcessorInterface
 	 */
-	private $markdomHandler;
+	private $htmlProcessor = null;
 
 	/**
-	 * @var HtmlProcessorInterface
+	 * @var string
 	 */
-	private $htmlProcessor = null;
+	private $commonmarkString;
 
 	/**
-	 * Parser constructor.
+	 * CommonmarkDispatcher constructor.
 	 *
-	 * @param HandlerInterface $commonmarkHandler
+	 * @param string $commonmarkString
 	 */
-	public function __construct(HandlerInterface $commonmarkHandler)
+	public function __construct($commonmarkString)
 	{
-		$this->markdomHandler = $commonmarkHandler;
+		$this->commonmarkString = $commonmarkString;
 	}
 
 	/**
@@ -56,34 +56,26 @@ public function setHtmlProcessor($htmlProcessor)
 	}
 
 	/**
-	 * @param string $sourceFile
-	 * @return $this
-	 * @throws DispatcherException
+	 * @return bool
 	 */
-	public function processFile($sourceFile)
+	public function isReusable()
 	{
-		if (!file_exists($sourceFile)) {
-			throw new DispatcherException('Source file not found');
-		}
-		if (!is_readable($sourceFile)) {
-			throw new DispatcherException('Source file not readable');
-		}
-		return $this->process(file_get_contents($sourceFile));
+		return true;
 	}
 
 	/**
-	 * @param string $source
-	 * @return $this
+	 * @param HandlerInterface $markdomHandler
+	 * @return mixed
 	 */
-	public function process($source)
+	public function dispatchTo(HandlerInterface $markdomHandler)
 	{
 		$commonMarkEnvironment = Environment::createCommonMarkEnvironment();
 		$commonMarkEnvironment->addDocumentProcessor(
-			new DocumentProcessor($this->markdomHandler, $this->getDispatchCommentBlocks(), $this->htmlProcessor)
+			new DocumentProcessor($markdomHandler, $this->htmlProcessor)
 		);
 		$docParser = new DocParser($commonMarkEnvironment);
-		$docParser->parse($source);
-		return $this;
+		$docParser->parse($this->commonmarkString);
+		return $markdomHandler->getResult();
 	}
 
 }