Merge branch 'clairecoloma-master2', ref #13

CHANGELOG.md

@@ -3,6 +3,8 @@ CHANGELOG
 
 ### ??? ###
 
+* new NoSpaceBeforeComma fixer, cleaning badly placed spaces close to commas
+
 ### 0.1.4 (2014-06-17) ###
 
 * add HHVM tests on travis

README.md

@@ -107,6 +107,11 @@ FrenchNoBreakSpace
 Replace some classic spaces by non breaking spaces following the French typographic code.
 No break space are placed before `:`, thin no break space before `;`, `!` and `?`.
 
+NoSpaceBeforeComma
+------------------
+
+Remove space before `,` and make sure there is only one space after.
+
 Hyphen (automatic hyphenation)
 ------------------------------
 
@@ -143,7 +148,7 @@ en_GB
 -----
 
 ```php
-$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'EnglishQuotes', 'CurlyQuote', 'Hyphen', 'Trademark'));
+$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'EnglishQuotes', 'NoSpaceBeforeComma', 'CurlyQuote', 'Hyphen', 'Trademark'));
 $fixer->setLocale('en_GB'); // Needed by the Hyphen Fixer
 ```
 
@@ -153,7 +158,7 @@ fr_FR
 Those rules apply most of the recommendations of "Abrégé du code typographique à l'usage de la presse", ISBN: 9782351130667.
 
 ```php
-$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'FrenchQuotes', 'FrenchNoBreakSpace', 'CurlyQuote', 'Hyphen', 'Trademark'));
+$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'FrenchQuotes', 'FrenchNoBreakSpace', 'NoSpaceBeforeComma', 'CurlyQuote', 'Hyphen', 'Trademark'));
 $fixer->setLocale('fr_FR'); // Needed by the Hyphen Fixer
 ```
 
@@ -163,7 +168,7 @@ fr_CA
 Mostly the same as fr_FR, but the space before punctuation points is not mandatory.
 
 ```php
-$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'FrenchQuotes', 'CurlyQuote', 'Hyphen', 'Trademark'));
+$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'FrenchQuotes', 'NoSpaceBeforeComma', 'CurlyQuote', 'Hyphen', 'Trademark'));
 $fixer->setLocale('fr_CA'); // Needed by the Hyphen Fixer
 ```
 
@@ -173,7 +178,7 @@ de_DE
 Mostly the same as en_GB, according to [Typefacts](http://typefacts.com/) and [Wikipedia](http://de.wikipedia.org/wiki/Typografie_f%C3%BCr_digitale_Texte).
 
 ```php
-$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'GermanQuotes', 'CurlyQuote', 'Hyphen', 'Trademark'));
+$fixer = new Fixer(array('Ellipsis', 'Dimension', 'Dash', 'GermanQuotes', 'NoSpaceBeforeComma', 'CurlyQuote', 'Hyphen', 'Trademark'));
 $fixer->setLocale('de_DE'); // Needed by the Hyphen Fixer
 ```
 

src/JoliTypo/Fixer/NoSpaceBeforeComma.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace JoliTypo\Fixer;
+
+use JoliTypo\Fixer;
+use JoliTypo\FixerInterface;
+use JoliTypo\StateBag;
+
+/**
+ * No space before comma (,)
+ *
+ * @package JoliTypo\Fixer
+ */
+class NoSpaceBeforeComma implements FixerInterface
+{
+    public function fix($content, StateBag $state_bag = null)
+    {
+        $content = preg_replace('@(\w+) *(,) *@mu', '$1$2 ', $content);
+
+        return $content;
+    }
+}

tests/JoliTypo/Tests/Fixer/NoSpaceBeforeCommaTest.php

@@ -0,0 +1,20 @@
+<?php
+namespace JoliTypo\Tests\Fixer;
+
+use JoliTypo\Fixer;
+
+/**
+ * @package JoliTypo\Tests\Fixer
+ */
+class NoSpaceBeforeCommaTest extends \PHPUnit_Framework_TestCase
+{
+    public function testSimpleString()
+    {
+        $fixer = new Fixer\NoSpaceBeforeComma();
+        $this->assertInstanceOf('JoliTypo\Fixer\NoSpaceBeforeComma', $fixer);
+
+        $this->assertEquals("Superman, you're my hero", $fixer->fix("Superman,you're my hero"));
+        $this->assertEquals("Superman, you're my hero", $fixer->fix("Superman ,you're my hero"));
+        $this->assertEquals("Superman, you're my hero", $fixer->fix("Superman  ,  you're my hero"));
+    }
+}