Added testGenerateEventUrl and refactored code for readability.

Author: Dan0sz

src/Proxy.php

@@ -114,12 +114,7 @@ public function do_request( $name = 'pageview', $domain = '', $url = '', $props
 
 		// URL is required, so if no $url was set and no referer was found, attempt to create it from the REQUEST_URI server variable.
 		if ( empty( $body[ 'u' ] ) ) {
-			$parts          = parse_url( $_SERVER[ 'REQUEST_URI' ] );
-			$home_url_parts = parse_url( get_home_url() );
-
-			if ( isset( $home_url_parts[ 'scheme' ] ) && isset( $home_url_parts[ 'host' ] ) && isset( $parts[ 'path' ] ) ) {
-				$body[ 'u' ] = $home_url_parts[ 'scheme' ] . '://' . $home_url_parts [ 'host' ] . $parts[ 'path' ];
-			}
+			$body[ 'u' ] = $this->generate_event_url(); // @codeCoverageIgnore
 		}
 
 		// Revenue events use a different approach.
@@ -134,6 +129,23 @@ public function do_request( $name = 'pageview', $domain = '', $url = '', $props
 		return $this->send_event( $request );
 	}
 
+	/**
+	 * Attempts to generate the Event URL from available resources.
+	 *
+	 * @return string
+	 */
+	public function generate_event_url() {
+		$url            = '';
+		$parts          = parse_url( $_SERVER[ 'REQUEST_URI' ] );
+		$home_url_parts = parse_url( get_home_url() );
+
+		if ( isset( $home_url_parts[ 'scheme' ] ) && isset( $home_url_parts[ 'host' ] ) && isset( $parts[ 'path' ] ) ) {
+			$url = $home_url_parts[ 'scheme' ] . '://' . $home_url_parts [ 'host' ] . $parts[ 'path' ];
+		}
+
+		return $url;
+	}
+
 	/**
 	 * Formats and sends $request to the Plausible API.
 	 *

tests/integration/ProxyTest.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package Plausible Analytics Unit Tests - ClientFactory
+ */
+
+namespace Plausible\Analytics\Tests\Integration;
+
+use Plausible\Analytics\Tests\TestCase;
+use Plausible\Analytics\WP\Proxy;
+
+class ProxyTest extends TestCase {
+	/**
+	 * @see Proxy::generate_event_url()
+	 * @return void
+	 */
+	public function testGenerateEventUrl() {
+		$proxy = new Proxy( false );
+
+		$url = $proxy->generate_event_url();
+
+		$this->assertEquals( 'http://example.org', $url );
+
+		$_SERVER[ 'REQUEST_URI' ] = '/test';
+
+		$url = $proxy->generate_event_url();
+
+		$this->assertEquals( 'http://example.org/test', $url );
+	}
+}