Refactoring

Author: JanPetterMG

src/XRobotsTagParser.php

@@ -18,7 +18,6 @@
 use GuzzleHttp;
 use vipnytt\XRobotsTagParser\Exceptions\XRobotsTagParserException;
 use vipnytt\XRobotsTagParser\Rebuild;
-use vipnytt\XRobotsTagParser\URLParser;
 use vipnytt\XRobotsTagParser\UserAgentParser;
 
 class XRobotsTagParser
@@ -57,23 +56,20 @@ class XRobotsTagParser
      */
     public function __construct($url, $userAgent = self::USERAGENT_DEFAULT, array $config = [])
     {
-        // Parse URL
-        $urlParser = new URLParser(trim($url));
-        if (!$urlParser->isValid()) {
+        $this->url = $url;
+        if (!filter_var($this->url, FILTER_VALIDATE_URL)) {
             throw new XRobotsTagParserException('Invalid URL provided');
         }
-        // Encode URL
-        $this->url = $urlParser->encode();
         // Set any optional configuration options
         $this->config = $config;
         if (isset($this->config['headers']) && is_array($this->config['headers'])) {
             $this->headers = $this->config['headers'];
         }
-        // Parse rules
-        $this->parse();
         // Set User-Agent
         $parser = new UserAgentParser($userAgent);
         $this->userAgent = $parser->match(array_keys($this->rules), self::USERAGENT_DEFAULT);
+        // Parse rules
+        $this->parse();
     }
 
     /**
@@ -239,7 +235,7 @@ public function getDirectiveMeaning($directive)
             throw new XRobotsTagParserException('Unknown directive');
         }
         $class = "XRobotsTagParser\\directives\\$directive";
-        $object = new $class($directive);
+        $object = new $class($this->directiveClasses()[$directive]);
         if (!$object instanceof XRobotsTagParser\directives\directiveInterface) {
             throw new XRobotsTagParserException('Unsupported directive class');
         }

src/XRobotsTagParser/URLParser.php

@@ -0,0 +1,36 @@
+<?php
+namespace vipnytt\XRobotsTagParser\Tests;
+
+use vipnytt\XRobotsTagParser;
+
+class DownloadTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Get rules
+     *
+     * @dataProvider generateDataForTest
+     * @param string $url
+     * @param string $userAgent
+     */
+    public function testDownload($url, $userAgent)
+    {
+        $parser = new XRobotsTagParser($url, $userAgent);
+        $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
+
+        $this->assertTrue($parser->export() == []);
+    }
+
+    /**
+     * Generate test data
+     * @return array
+     */
+    public function generateDataForTest()
+    {
+        return [
+            [
+                'http://example.com/',
+                'MyCustomBot',
+            ]
+        ];
+    }
+}

tests/DownloadTest.php

@@ -10,12 +10,12 @@ class ExportTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testExport($url, $bot, $options)
+    public function testExport($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertTrue($parser->export()['googlebot']['noindex']);

tests/ExportTest.php

@@ -10,12 +10,12 @@ class GetRulesTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testGetRules($url, $bot, $options)
+    public function testGetRules($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertTrue($parser->getRules(true)['noindex']);

tests/GetRulesTest.php

@@ -10,12 +10,12 @@ class MultiTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testMultipleDirectives($url, $bot, $options)
+    public function testMultipleDirectives($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertTrue($parser->getRules(true)['all']);

tests/MultiTest.php

@@ -10,12 +10,12 @@ class NoindexTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testNoIndex($url, $bot, $options)
+    public function testNoIndex($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertTrue($parser->getRules(true)['noindex']);

tests/NoindexTest.php

@@ -10,12 +10,12 @@ class NoneTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testNone($url, $bot, $options)
+    public function testNone($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertTrue($parser->getRules(true)['none']);

tests/NoneTest.php

@@ -10,12 +10,12 @@ class UnavailableAfterTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider generateDataForTest
      * @param string $url
-     * @param string $bot
+     * @param string $userAgent
      * @param array $options
      */
-    public function testUnavailableAfter($url, $bot, $options)
+    public function testUnavailableAfter($url, $userAgent, $options)
     {
-        $parser = new XRobotsTagParser($url, $bot, $options);
+        $parser = new XRobotsTagParser($url, $userAgent, $options);
         $this->assertInstanceOf('vipnytt\XRobotsTagParser', $parser);
 
         $this->assertEquals(['unavailable_after' => 'Saturday, 01-Jul-00 07:00:00 PST'], $parser->getRules(true));