Merge pull request #3 from caxy/feature-add_new_configuration

Added ability to configure specialCaseChars and groupDiffs, and cleaned ...

Author: mgersten-caxy

DependencyInjection/Configuration.php

@@ -26,6 +26,10 @@ public function getConfigTreeBuilder()
                     ->prototype('scalar')->end()
                 ->end()
                 ->scalarNode('encoding')->end()
+                ->arrayNode('special_case_chars')
+                    ->prototype('scalar')->end()
+                ->end()
+                ->booleanNode('group_diffs')->end()
             ->end();
 
         return $treeBuilder;

Service/HtmlDiffService.php

@@ -7,33 +7,69 @@
 
 class HtmlDiffService
 {
+    const PARAMETER_SPECIAL_CASE_TAGS = 'special_case_tags';
+    const PARAMETER_SPECIAL_CASE_CHARS = 'special_case_chars';
+    const PARAMETER_ENCODING = 'encoding';
+    const PARAMETER_GROUP_DIFFS = 'group_diffs';
+    
     protected $container;
 
-    protected $specialCaseTags = array('strong', 'b', 'i', 'big', 'small', 'u', 'sub', 'sup', 'strike', 's', 'p');
+    protected $specialCaseTags = HtmlDiff::defaultSpecialCaseTags;
+    
+    protected $specialCaseChars = HtmlDiff::defaultSpecialCaseChars;
+    
+    protected $groupDiffs = HtmlDiff::defaultGroupDiffs;
 
     protected $encoding = 'UTF-8';
 
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-
-        $encoding = $this->container->getParameter('caxy_html_diff.encoding');
-        if (!empty($encoding)) {
-            $this->encoding = $encoding;
-        }
-
-        $specialCaseTags = $this->container->getParameter('caxy_html_diff.special_case_tags');
-        if (!empty($specialCaseTags)) {
-            $this->specialCaseTags = $specialCaseTags;
+        
+        $this->loadParameter(self::PARAMETER_ENCODING, $this->encoding);
+        $this->loadParameter(self::PARAMETER_SPECIAL_CASE_TAGS, $this->specialCaseTags);
+        $this->loadParameter(self::PARAMETER_SPECIAL_CASE_CHARS, $this->specialCaseChars);
+        $this->loadParameter(self::PARAMETER_GROUP_DIFFS, $this->groupDiffs);
+    }
+    
+    public function loadParameter($param, &$property)
+    {
+        $param = 'caxy_html_diff.' . $param;
+        if ($this->container->hasParameter($param)) {
+            $property = $this->container->getParameter($param);
         }
     }
 
-    public function diff($oldText, $newText)
+    public function diff($oldText, $newText, $groupDiffs = null, $specialCaseChars = null)
     {
-        $diff = new HtmlDiff($oldText, $newText, $this->encoding, $this->specialCaseTags);
+        if ($groupDiffs === null) {
+            $groupDiffs = $this->groupDiffs;
+        }
+        
+        if ($specialCaseChars === null) {
+            $specialCaseChars = $this->specialCaseChars;
+        }
+        
+        $diff = new HtmlDiff($oldText, $newText, $this->encoding, $this->specialCaseTags, $groupDiffs);
+        
+        if ($specialCaseChars !== null) {
+            $diff->setSpecialCaseChars($specialCaseChars);
+        }
 
         return $diff->build();
     }
+    
+    public function getGroupDiffs()
+    {
+        return $this->groupDiffs;
+    }
+    
+    public function setGroupDiffs($boolean)
+    {
+        $this->groupDiffs = $boolean;
+        
+        return $this;
+    }
 
     public function getEncoding()
     {
@@ -70,4 +106,28 @@ public function removeSpecialCaseTag($tag)
         return $this;
     }
 
+    public function setSpecialCaseChars(array $chars)
+    {
+        $this->specialCaseChars = $chars;
+    }
+    
+    public function getSpecialCaseChars()
+    {
+        return $this->specialCaseChars;
+    }
+    
+    public function addSpecialCaseChar($char)
+    {
+        if (!in_array($char, $this->specialCaseChars)) {
+            $this->specialCaseChars[] = $char;
+        }
+    }
+    
+    public function removeSpecialCaseChar($char)
+    {
+        $key = array_search($char, $this->specialCaseChars);
+        if ($key !== false) {
+            unset($this->specialCaseChars[$key]);
+        }
+    }
 }

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/framework-bundle": "~2.1",
-        "caxy/php-htmldiff": "*"
+        "caxy/php-htmldiff": ">=0.0.1"
     },
     "target-dir": "Caxy/HtmlDiffBundle",
     "autoload": {