Parser factory now expects data file path as argument

udger · Jul 16, 2016 · 20c5133 · 20c5133
1 parent 4ae2864
commit 20c5133
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/examples/account.php b/examples/account.php
@@ -2,7 +2,7 @@
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
-$factory = new Udger\ParserFactory();
+$factory = new Udger\ParserFactory(sys_get_temp_dir() . "/udgercache/udgerdb_v3.dat");
 $parser = $factory->getParser();
 
 try {

diff --git a/examples/parse.php b/examples/parse.php
@@ -3,15 +3,10 @@
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 // creates a new UdgerParser object
-$factory = new Udger\ParserFactory();
+$factory = new Udger\ParserFactory(sys_get_temp_dir() . "/udgercache/udgerdb_v3.dat");
 $parser = $factory->getParser();
 
-
-
-
 try {
-    // set data file
-    $parser->setDataFile(sys_get_temp_dir() . "/udgercache/udgerdb_v3.dat");   
     $parser->setUA('Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36');
     $parser->setIP("66.249.64.1");
 

diff --git a/src/ParserFactory.php b/src/ParserFactory.php
@@ -24,18 +24,24 @@ class ParserFactory {
      */
     private $logger;
 
+    /**
+     * @var string $dataFile path to the data file
+     */
+    private $dataFile;
+
     /**
      * 
+     * @param string $dataFile path to the data file
      * @param LoggerInterface $logger
      */
-    public function __construct($logger = null)
+    public function __construct($dataFile, $logger = null)
     {
         if (is_null($logger)) {
             // create a log channel
             $logger = new Logger($this->loggerName);
             $logger->pushHandler(new NullHandler());
         }
-
+        $this->dataFile = $dataFile;
         $this->logger = $logger;
     }
 
@@ -45,6 +51,8 @@ public function __construct($logger = null)
      */
     public function getParser()
     {   
-        return new Parser($this->logger, new Helper\IP());
+        $parser = new Parser($this->logger, new Helper\IP());
+        $parser->setDataFile($this->dataFile);
+        return $parser;
     }
 }
diff --git a/tests/unit/ParserFactoryTest.php b/tests/unit/ParserFactoryTest.php
@@ -19,11 +19,17 @@ class ParserFactoryTest extends \Codeception\TestCase\Test {
 
     protected function _before()
     {
-        $this->factory = new ParserFactory();
+        $this->factory = new ParserFactory("/dev/null");
     }
 
     public function testGetParser()
     {
         $this->assertInstanceOf("Udger\Parser", $this->factory->getParser());
     }
+
+    public function testNewFactoryWithoutPathShouldFail()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Exception');
+        new ParserFactory();
+    }
 }