Tidy

RELEASE-NOTES.md

@@ -1,6 +1,6 @@
 This file contains the RELEASE-NOTES of the Semantic External Query Lookup (a.k.a. SEQL) extension.
 
-### 1.0.0 (2015-??-??)
+### 1.0.0 (2016-??-??)
 
 - Initial release
-- Added `ByAskApiHttpRequestQueryLookup` to retrieve query results from an external endpoint specified in `$GLOBALS['seqlgExternalRepositoryEndpoints']`
+- Added `ByHttpRequestQueryLookup` to retrieve query results from an external endpoint specified in `$GLOBALS['seqlgExternalRepositoryEndpoints']`

SemanticExternalQueryLookup.php

@@ -39,8 +39,8 @@
 	);
 
 	// Alias to keep LocalSettings independent from the internal NS usage
-	class_alias( 'SEQL\ByAskApiHttpRequestQueryLookup', 'SMWExternalQueryLookup' ); // deprecated
-	class_alias( 'SEQL\ByAskApiHttpRequestQueryLookup', 'SMWExternalAskQueryLookup' );
+	class_alias( 'SEQL\ByHttpRequestQueryLookup', 'SMWExternalQueryLookup' ); // deprecated
+	class_alias( 'SEQL\ByHttpRequestQueryLookup', 'SMWExternalAskQueryLookup' );
 
 	// Register message files
 	$GLOBALS['wgMessagesDirs']['semantic-external-query-lookup'] = __DIR__ . '/i18n';

src/ByAskApiHttpRequest/CannedResultArray.php → src/ByHttpRequest/CannedResultArray.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest;
+namespace SEQL\ByHttpRequest;
 
 use SMW\DataValueFactory;
 use SMW\DIProperty;

src/ByAskApiHttpRequest/JsonResponseParser.php → src/ByHttpRequest/JsonResponseParser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest;
+namespace SEQL\ByHttpRequest;
 
 use SEQL\DataValueDeserializer;
 use SMW\DIProperty;

src/ByAskApiHttpRequest/QueryResult.php → src/ByHttpRequest/QueryResult.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest;
+namespace SEQL\ByHttpRequest;
 
 use SMWInfolink as Infolink;
 use SMWQueryResult as RootQueryResult;

src/ByAskApiHttpRequest/QueryResultFetcher.php → src/ByHttpRequest/QueryResultFetcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest;
+namespace SEQL\ByHttpRequest;
 
 use Onoi\HttpRequest\HttpRequestFactory;
 use SEQL\QueryEncoder;
@@ -123,7 +123,7 @@ public function fetchQueryResult( Query $query ) {
 
 		$this->jsonResponseParser->doParse( $result  );
 
-		$queryResult = $this->queryResultFactory->newByAskApiHttpRequestQueryResult(
+		$queryResult = $this->queryResultFactory->newByHttpRequestQueryResult(
 			$query,
 			$this->jsonResponseParser
 		);

src/ByAskApiHttpRequestQueryLookup.php → src/ByHttpRequestQueryLookup.php

@@ -3,8 +3,8 @@
 namespace SEQL;
 
 use Onoi\HttpRequest\HttpRequestFactory;
-use SEQL\ByAskApiHttpRequest\JsonResponseParser;
-use SEQL\ByAskApiHttpRequest\QueryResultFetcher;
+use SEQL\ByHttpRequest\JsonResponseParser;
+use SEQL\ByHttpRequest\QueryResultFetcher;
 use SMW\SQLStore\SQLStore;
 use SMW\ApplicationFactory;
 use SMWQuery as Query;
@@ -17,7 +17,7 @@
  *
  * @author mwjames
  */
-class ByAskApiHttpRequestQueryLookup extends SQLStore {
+class ByHttpRequestQueryLookup extends SQLStore {
 
 	/**
 	 * @var QueryResultFactory

src/QueryResultFactory.php

@@ -2,8 +2,8 @@
 
 namespace SEQL;
 
-use SEQL\ByAskApiHttpRequest\JsonResponseParser;
-use SEQL\ByAskApiHttpRequest\QueryResult as ByAskApiHttpRequestQueryResult;
+use SEQL\ByHttpRequest\JsonResponseParser;
+use SEQL\ByHttpRequest\QueryResult as ByHttpRequestQueryResult;
 use SMW\Store;
 use SMWQuery as Query;
 use SMWQueryResult as QueryResult;
@@ -55,9 +55,9 @@ public function newEmptyQueryResult( Query $query ) {
 	 *
 	 * @return QueryResult
 	 */
-	public function newByAskApiHttpRequestQueryResult( Query $query, JsonResponseParser $jsonResponseParser ) {
+	public function newByHttpRequestQueryResult( Query $query, JsonResponseParser $jsonResponseParser ) {
 
-		$queryResult = new ByAskApiHttpRequestQueryResult(
+		$queryResult = new ByHttpRequestQueryResult(
 			$query->getDescription()->getPrintrequests(),
 			$query,
 			$jsonResponseParser->getResultSubjectList(),

tests/phpunit/Integration/ByAskApiHttpRequest/JsonParseOnFauxHttpResponseTest.php → tests/phpunit/Integration/ByHttpRequest/JsonParseOnFauxHttpResponseTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace SEQL\Tests\Integration\ByAskApiHttpRequest;
+namespace SEQL\Tests\Integration\ByHttpRequest;
 
 use SMW\Tests\Utils\UtilityFactory;
 use Onoi\HttpRequest\HttpRequestFactory;
-use SEQL\ByAskApiHttpRequest\QueryResultFetcher;
-use SEQL\ByAskApiHttpRequest\JsonResponseParser;
+use SEQL\ByHttpRequest\QueryResultFetcher;
+use SEQL\ByHttpRequest\JsonResponseParser;
 use SEQL\QueryResultFactory;
 use SEQL\DataValueDeserializer;
 use SEQL\HookRegistry;

tests/phpunit/Unit/ByAskApiHttpRequest/CannedResultArrayTest.php → tests/phpunit/Unit/ByHttpRequest/CannedResultArrayTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest\Tests;
+namespace SEQL\ByHttpRequest\Tests;
 
-use SEQL\ByAskApiHttpRequest\CannedResultArray;
+use SEQL\ByHttpRequest\CannedResultArray;
 use SMW\DIWikiPage;
 use SMW\DIProperty;
 use SMWDINumber as DINumber;
 
 /**
- * @covers \SEQL\ByAskApiHttpRequest\CannedResultArray
+ * @covers \SEQL\ByHttpRequest\CannedResultArray
  * @group semantic-external-query-lookup
  *
  * @license GNU GPL v2+
@@ -22,7 +22,7 @@ class CannedResultArrayTest extends \PHPUnit_Framework_TestCase {
 
 	protected function setUp() {
 
-		$this->jsonResponseParser = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequest\JsonResponseParser' )
+		$this->jsonResponseParser = $this->getMockBuilder( '\SEQL\ByHttpRequest\JsonResponseParser' )
 			->disableOriginalConstructor()
 			->getMock();
 	}
@@ -34,7 +34,7 @@ public function testCanConstruct() {
 			->getMock();
 
 		$this->assertInstanceOf(
-			'\SEQL\ByAskApiHttpRequest\CannedResultArray',
+			'\SEQL\ByHttpRequest\CannedResultArray',
 			new CannedResultArray( new DIWikiPage( 'Foo', NS_MAIN ), $printRequest, $this->jsonResponseParser )
 		);
 	}

tests/phpunit/Unit/ByAskApiHttpRequest/JsonResponseParserTest.php → tests/phpunit/Unit/ByHttpRequest/JsonResponseParserTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest\Tests;
+namespace SEQL\ByHttpRequest\Tests;
 
-use SEQL\ByAskApiHttpRequest\JsonResponseParser;
+use SEQL\ByHttpRequest\JsonResponseParser;
 use SMW\DIProperty;
 
 /**
- * @covers \SEQL\ByAskApiHttpRequest\JsonResponseParser
+ * @covers \SEQL\ByHttpRequest\JsonResponseParser
  * @group semantic-external-query-lookup
  *
  * @license GNU GPL v2+
@@ -23,7 +23,7 @@ public function testCanConstruct() {
 			->getMock();
 
 		$this->assertInstanceOf(
-			'\SEQL\ByAskApiHttpRequest\JsonResponseParser',
+			'\SEQL\ByHttpRequest\JsonResponseParser',
 			new JsonResponseParser( $dataValueDeserializer )
 		);
 	}

tests/phpunit/Unit/ByAskApiHttpRequest/QueryResultFetcherTest.php → tests/phpunit/Unit/ByHttpRequest/QueryResultFetcherTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest\Tests;
+namespace SEQL\ByHttpRequest\Tests;
 
-use SEQL\ByAskApiHttpRequest\QueryResultFetcher;
+use SEQL\ByHttpRequest\QueryResultFetcher;
 use SEQL\QueryResultFactory;
 use SMW\DIWikiPage;
 use SMW\DIProperty;
 
 /**
- * @covers \SEQL\ByAskApiHttpRequest\QueryResultFetcher
+ * @covers \SEQL\ByHttpRequest\QueryResultFetcher
  * @group semantic-external-query-lookup
  *
  * @license GNU GPL v2+
@@ -41,7 +41,7 @@ protected function setUp() {
 			->method( 'newCachedCurlRequest' )
 			->will( $this->returnValue( $this->httpRequest ) );
 
-		$this->jsonResponseParser = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequest\JsonResponseParser' )
+		$this->jsonResponseParser = $this->getMockBuilder( '\SEQL\ByHttpRequest\JsonResponseParser' )
 			->disableOriginalConstructor()
 			->getMock();
 	}
@@ -53,7 +53,7 @@ public function testCanConstruct() {
 			->getMock();
 
 		$this->assertInstanceOf(
-			'\SEQL\ByAskApiHttpRequest\QueryResultFetcher',
+			'\SEQL\ByHttpRequest\QueryResultFetcher',
 			new QueryResultFetcher( $this->httpRequestFactory, $queryResultFactory, $this->jsonResponseParser )
 		);
 	}

tests/phpunit/Unit/ByAskApiHttpRequest/QueryResultTest.php → tests/phpunit/Unit/ByHttpRequest/QueryResultTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace SEQL\ByAskApiHttpRequest\Tests;
+namespace SEQL\ByHttpRequest\Tests;
 
-use SEQL\ByAskApiHttpRequest\QueryResult;
+use SEQL\ByHttpRequest\QueryResult;
 use SMW\DIWikiPage;
 
 /**
- * @covers \SEQL\ByAskApiHttpRequest\QueryResult
+ * @covers \SEQL\ByHttpRequest\QueryResult
  * @group semantic-external-query-lookup
  *
  * @license GNU GPL v2+
@@ -35,14 +35,14 @@ public function testCanConstruct() {
 		$results = array();
 
 		$this->assertInstanceOf(
-			'\SEQL\ByAskApiHttpRequest\QueryResult',
+			'\SEQL\ByHttpRequest\QueryResult',
 			new QueryResult( $printRequests, $query, $results, $this->store, false )
 		);
 	}
 
 	public function testGetNext() {
 
-		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequest\JsonResponseParser' )
+		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByHttpRequest\JsonResponseParser' )
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -67,7 +67,7 @@ public function testGetNext() {
 
 		foreach ( $instance->getNext() as $result ) {
 			$this->assertInstanceOf(
-				'\SEQL\ByAskApiHttpRequest\CannedResultArray',
+				'\SEQL\ByHttpRequest\CannedResultArray',
 				$result
 			);
 		}
@@ -87,7 +87,7 @@ public function testToArray() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequest\JsonResponseParser' )
+		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByHttpRequest\JsonResponseParser' )
 			->disableOriginalConstructor()
 			->getMock();
 

tests/phpunit/Unit/ByAskApiHttpRequestQueryLookupTest.php → tests/phpunit/Unit/ByHttpRequestQueryLookupTest.php

@@ -5,19 +5,19 @@
 use SMWQuery as Query;
 
 /**
- * @covers \SEQL\ByAskApiHttpRequestQueryLookup
+ * @covers \SEQL\ByHttpRequestQueryLookup
  * @group semantic-external-query-lookup
  *
  * @license GNU GPL v2+
  * @since 1.0
  *
  * @author mwjames
  */
-class ByAskApiHttpRequestQueryLookupTest extends \PHPUnit_Framework_TestCase {
+class ByHttpRequestQueryLookupTest extends \PHPUnit_Framework_TestCase {
 
 	public function testCanConstruct() {
 
-		$instance = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequestQueryLookup' )
+		$instance = $this->getMockBuilder( '\SEQL\ByHttpRequestQueryLookup' )
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -41,7 +41,7 @@ public function testGetQueryResult() {
 			->method( 'getDescription' )
 			->will( $this->returnValue( $description ) );
 
-		$instance = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequestQueryLookup' )
+		$instance = $this->getMockBuilder( '\SEQL\ByHttpRequestQueryLookup' )
 			->disableOriginalConstructor()
 			->setMethods( null )
 			->getMock();
@@ -69,7 +69,7 @@ public function testGetEmptyQueryResult_MODE_DEBUG() {
 		$query->expects( $this->once() )
 			->method( 'addErrors' );
 
-		$instance = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequestQueryLookup' )
+		$instance = $this->getMockBuilder( '\SEQL\ByHttpRequestQueryLookup' )
 			->disableOriginalConstructor()
 			->setMethods( null )
 			->getMock();
@@ -108,7 +108,7 @@ public function testGetQueryResultForSimulatedInterwikiMatch() {
 			->method( 'getSortKeys' )
 			->will( $this->returnValue( array() ) );
 
-		$instance = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequestQueryLookup' )
+		$instance = $this->getMockBuilder( '\SEQL\ByHttpRequestQueryLookup' )
 			->disableOriginalConstructor()
 			->setMethods( array( 'tryToMatchInterwikiFor' ) )
 			->getMock();

tests/phpunit/Unit/QueryResultFactoryTest.php

@@ -56,7 +56,7 @@ public function testNewEmptyQueryResult() {
 
 	public function testNewByHttpLookupQueryResult() {
 
-		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByAskApiHttpRequest\JsonResponseParser' )
+		$jsonResponseParser = $this->getMockBuilder( '\SEQL\ByHttpRequest\JsonResponseParser' )
 			->disableOriginalConstructor()
 			->getMockForAbstractClass();
 
@@ -76,7 +76,7 @@ public function testNewByHttpLookupQueryResult() {
 
 		$this->assertInstanceOf(
 			'\SMWQueryResult',
-			$instance->newByAskApiHttpRequestQueryResult( $query, $jsonResponseParser )
+			$instance->newByHttpRequestQueryResult( $query, $jsonResponseParser )
 		);
 	}