Rewrite and simplify the package, add tests

No support for plaintext mode, no classes in del/ins tags

Signed-off-by: Peter Legierski <[email protected]>

composer.json

@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "cogpowered/finediff": "0.0.1"
+        "cogpowered/finediff": "0.3.1",
+        "ext-tidy": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",

src/GatherContent/Htmldiff/Differ.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace GatherContent\Htmldiff;
+
+use \cogpowered\FineDiff\Diff;
+use \cogpowered\FineDiff\Granularity\Paragraph as Granularity;
+
+class Differ implements DifferInterface
+{
+    private $diff;
+
+    public function __construct(Processor $processor = null, Diff $diff = null)
+    {
+        $this->diff = $diff ?: new Diff(new Granularity, new GitDiffRenderer);
+    }
+
+    public function diff($old, $new)
+    {
+        return $this->diff->render($old, $new);
+    }
+}

src/GatherContent/Htmldiff/DifferInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace GatherContent\Htmldiff;
+
+interface DifferInterface
+{
+    public function diff($old, $new);
+}

src/GatherContent/Htmldiff/GitDiffRenderer.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * Here we try to end up with an output that looks like Git's diff.
+ * It's a modified version of \cogpowered\FineDiff\Render\Html
+ */
+
+namespace GatherContent\Htmldiff;
+
+use \cogpowered\FineDiff\Parser\OpcodeInterface;
+use \cogpowered\FineDiff\Render\Renderer;
+
+class GitDiffRenderer extends Renderer
+{
+    public function callback($opcode, $from, $from_offset, $from_len)
+    {
+        if ($opcode === 'c') {
+
+            $str = ' '.implode("\n ", explode("\n", substr($from, $from_offset, $from_len)))."\n";
+            $str = rtrim($str, "\n ")."\n";
+
+        } elseif ($opcode === 'd') {
+
+            $deletion = substr($from, $from_offset, $from_len);
+
+            if (strcspn($deletion, " \n\r") === 0) {
+
+                $deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
+            }
+
+            $str = '-'.implode("\n-", explode("\n", $deletion))."\n";
+            $str = rtrim($str, "-\n")."\n";
+
+        } else /* if ( $opcode === 'i' ) */ {
+
+            $str = '+'.implode("\n+", explode("\n", substr($from, $from_offset, $from_len)))."\n";
+            $str = rtrim($str, "+\n")."\n";
+
+        }
+
+        return $str;
+    }
+}