Changeset 465

Timestamp:

01/14/08 11:55:15 (10 months ago)

Author:

bermiferrer

Message:

Adding support for class names on the DiffHelper? plugin

Files:

• plugins/diff_helper/lib/diff_helper.php (modified) (2 diffs)
• plugins/diff_helper/test/diff_helper_tests.php (modified) (1 diff)

plugins/diff_helper/lib/diff_helper.php

@@ -32 +32 @@
-    function diff($from_text, $to_text, $options = array())
-    {
+        $default_options = array(
+            'insert_class' => '',
+            'delete_class' => '',
+        );
+        $options = array_merge($default_options, $options);
+    
-        require_once('PEAR'.DS.'Text'.DS.'Diff.php');
-        require_once('PEAR'.DS.'Text'.DS.'Diff'.DS.'Renderer.php');
@@ -42 +48 @@
-
-        $Renderer =& new Text_Diff_Renderer_inline();
+        $Renderer->_ins_prefix = empty($options['insert_class']) ? '<ins>' : '<ins class="'.$options['insert_class'].'">';
+        $Renderer->_del_prefix = empty($options['delete_class']) ? '<del>' : '<del class="'.$options['delete_class'].'">';
-        return trim($Renderer->render(new Text_Diff($from_text, $to_text)),"\n");
-

plugins/diff_helper/test/diff_helper_tests.php

@@ -25 +25 @@
-    }
-
+    function test_should_add_classes_to_insert_and_delete_tags()
+    {
+        $original = 'open source';
+        $modified = 'Open Source';
+        $expected_diff = '<del class="version-1">open source</del><ins class="version-2">Open Source</ins>';
+
+        $generated_diff = $this->diff_helper->diff($original, $modified, array('insert_class'=>'version-2','delete_class'=>'version-1'));
+        $this->assertEqual($generated_diff, $expected_diff);
+    }
+
-    function test_should_return_diff_html()
-    {