add isFullName check

Author: yooper

src/Corpus/NameCorpus.php

@@ -11,8 +11,18 @@
  */
 class NameCorpus extends ReadCorpusAbstract
 {
+    /**
+     *
+     * @var PDO
+     */
     protected $pdo;
 
+    /**
+     *
+     * @var array
+     */
+    protected $cache = [];
+    
     public function __construct($dir = null, $lang = 'eng') 
     {
         if(!$dir) { 
@@ -47,6 +57,20 @@ public function isLastName($name) : bool
         return $this->isName('surnames', $name);
     }
 
+    /**
+     * 
+     * @param string $name
+     * @return bool
+     */
+    public function isFullName($name) : bool
+    {
+        $tokens = explode(" ", $name);
+        if(count($tokens) < 2) { 
+            return false;
+        }
+        return $this->isFirstName(current($tokens)) && $this->isLastName(end($tokens));
+    }
+    
     /**
      * Check if the name exists
      * @param string $tableName
@@ -55,10 +79,16 @@ public function isLastName($name) : bool
      */
     protected function isName($tableName, $name) : bool
     {
-        $stmt = $this->getPdo()->prepare("SELECT name FROM $tableName WHERE name = LOWER(:name) LIMIT 1"); 
-        $stmt->bindParam(':name', $name);
-        $stmt->execute();
-        return !empty($stmt->fetchColumn());         
+        $key = "{$tableName}_{$name}";
+        if(!isset($this->cache[$key])) {
+        
+            $stmt = $this->getPdo()->prepare("SELECT name FROM $tableName WHERE name = LOWER(:name) LIMIT 1"); 
+            $stmt->bindParam(':name', $name);
+            $stmt->execute();
+            $r = !empty($stmt->fetchColumn());
+            $this->cache[$key] = $r;
+        }
+        return $this->cache[$key];
     }
 
 
@@ -71,7 +101,14 @@ public function getPdo() : PDO
             $this->pdo = new PDO("sqlite:".$this->getDir().$this->getFileNames()[0]);
         }
         return $this->pdo;
-    }    
+    }
+
+    public function __destruct() 
+    {
+        unset($this->pdo);
+        unset($this->cache);
+    }
+    
 }
 
 

tests/TextAnalysis/Corpus/NameCorpusTest.php

@@ -34,5 +34,19 @@ public function testLastNames()
         $corpus = new NameCorpus();
         $this->assertTrue($corpus->isLastName('Williamson'));
         $this->assertFalse($corpus->isLastName('baggins'));                          
-    }    
+    }   
+    
+    public function testFullNames()
+    {
+        if( getenv('SKIP_TEST')) {
+            return;
+        }    
+        
+        $corpus = new NameCorpus();
+        $this->assertTrue($corpus->isFullName('Brad Von Williamson'));
+        $this->assertFalse($corpus->isFullName('Jimbo'));        
+        $this->assertTrue($corpus->isFullName('Bradley Thomas'));
+        
+    }       
+    
 }