Ensure data is lowercase

MattKetmo · MattKetmo · commit 0187922c1228 · 2013-04-01T11:53:36.000+02:00
diff --git a/res/throwaway_domains.txt b/res/throwaway_domains.txt
@@ -21,8 +21,8 @@
 75hosting.net
 75hosting.org
 9ox.net
-MailEater.com
-TempEMail.net
+maileater.com
+tempemail.net
 a-bc.net
 ag.us.to
 ajaxapp.net
diff --git a/src/EmailChecker/Adapter/FileAdapter.php b/src/EmailChecker/Adapter/FileAdapter.php
@@ -11,6 +11,8 @@
 
 namespace EmailChecker\Adapter;
 
+use EmailChecker\Utilities;
+
 /**
  * Throwaway email adapter build with file.
  *
@@ -29,13 +31,7 @@ public function __construct($filename)
             throw new \InvalidArgumentException(sprintf('File "%s" not found', $filename));
         }
 
-        $lines = explode(PHP_EOL, file_get_contents($filename));
-        $lines = array_map('trim', $lines);
-        $lines = array_filter($lines, function($line) {
-            return (0 === strlen($line) || '#' === $line[0]) ? false : $line;
-        });
-
-        $this->domains = $lines;
+        $this->domains = Utilities::parseLines(file_get_contents($filename));
     }
 
     /**
diff --git a/src/EmailChecker/Adapter/GaufretteAdapter.php b/src/EmailChecker/Adapter/GaufretteAdapter.php
@@ -12,6 +12,7 @@
 namespace EmailChecker\Adapter;
 
 use Gaufrette\File;
+use EmailChecker\Utilities;
 
 /**
  * Adapter for Gaufrette filesystem abstraction layer.
@@ -27,13 +28,7 @@ class GaufretteAdapter implements AdapterInterface
      */
     public function __construct(File $file)
     {
-        $lines = explode(PHP_EOL, $file->getContent());
-        $lines = array_map('trim', $lines);
-        $lines = array_filter($lines, function($line) {
-            return (0 === strlen($line) || '#' === $line[0]) ? false : $line;
-        });
-
-        $this->domains = $lines;
+        $this->domains = Utilities::parseLines($file->getContent());
     }
 
     /**
diff --git a/src/EmailChecker/Utilities.php b/src/EmailChecker/Utilities.php
@@ -38,6 +38,30 @@ static public function parseEmailAddress($email)
             throw new InvalidEmailException(sprintf('"%s" is not a valid email', $email));
         }
 
-        return array($parts['local'], $parts['domain']);
+        return array_map('strtolower', array($parts['local'], $parts['domain']));
+    }
+
+    /**
+     * Parse content and extract lines.
+     *
+     * @param  string $content The content to parse
+     *
+     * @return array Array of cleaned string
+     */
+    static public function parseLines($content)
+    {
+        // Split by line
+        $lines = explode(PHP_EOL, $content);
+
+        // Trim and convert to lowercase
+        $lines = array_map('trim', $lines);
+        $lines = array_map('strtolower', $lines);
+
+        // Remove empty lines and comments
+        $lines = array_filter($lines, function($line) {
+            return (0 === strlen($line) || '#' === $line[0]) ? false : $line;
+        });
+
+        return $lines;
     }
 }
diff --git a/tests/EmailChecker/Tests/Adpater/FileAdapterTest.php b/tests/EmailChecker/Tests/Adpater/FileAdapterTest.php
@@ -45,6 +45,7 @@ public static function throwawayDomains()
             array('jetable.org'),
             array('mailjet.org'),
             array('dummy-space.ext'),
+            array('yopmail.com'),
         );
     }
 
diff --git a/tests/EmailChecker/Tests/Adpater/GaufretteAdapterTest.php b/tests/EmailChecker/Tests/Adpater/GaufretteAdapterTest.php
@@ -51,6 +51,7 @@ public static function throwawayDomains()
             array('jetable.org'),
             array('mailjet.org'),
             array('dummy-space.ext'),
+            array('yopmail.com'),
         );
     }
 
diff --git a/tests/fixtures/throwaway_domains.txt b/tests/fixtures/throwaway_domains.txt
@@ -2,4 +2,5 @@
 jetable.org
 mailjet.org
   dummy-space.ext
-#comment.ext
+#comment.ext
+Yopmail.com

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace EmailChecker\Adapter;`
`13`	`13`
	`14`	`+use EmailChecker\Utilities;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Throwaway email adapter build with file.`
`16`	`18`	`*`
`@@ -29,13 +31,7 @@ public function __construct($filename)`
`29`	`31`	`throw new \InvalidArgumentException(sprintf('File "%s" not found', $filename));`
`30`	`32`	`}`
`31`	`33`
`32`		`- $lines = explode(PHP_EOL, file_get_contents($filename));`
`33`		`- $lines = array_map('trim', $lines);`
`34`		`- $lines = array_filter($lines, function($line) {`
`35`		`- return (0 === strlen($line) \|\| '#' === $line[0]) ? false : $line;`
`36`		`- });`
`37`		`-`
`38`		`- $this->domains = $lines;`
	`34`	`+ $this->domains = Utilities::parseLines(file_get_contents($filename));`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public static function throwawayDomains()`
`45`	`45`	`array('jetable.org'),`
`46`	`46`	`array('mailjet.org'),`
`47`	`47`	`array('dummy-space.ext'),`
	`48`	`+ array('yopmail.com'),`
`48`	`49`	`);`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public static function throwawayDomains()`
`51`	`51`	`array('jetable.org'),`
`52`	`52`	`array('mailjet.org'),`
`53`	`53`	`array('dummy-space.ext'),`
	`54`	`+ array('yopmail.com'),`
`54`	`55`	`);`
`55`	`56`	`}`
`56`	`57`