Extract the search code from the context

I figured that the code for the search could be extracted from the context to have separation of concern.
It supports multiple keywords. It suports also multiple tag keywords.

2 files changed, 276 insertions, 236 deletions

diff --git a/tests/app/Models/ContextTest.php b/tests/app/Models/ContextTest.php
index c5da6f667..4dc8b7757 100644
--- a/tests/app/Models/ContextTest.php
+++ b/tests/app/Models/ContextTest.php
@@ -1,241 +1,5 @@
 <?php
 
-require_once(LIB_PATH . '/lib_date.php');
-
 class ContextTest extends \PHPUnit_Framework_TestCase {
 
-	private $context;
-
-	public function setUp() {
-		$this->context = new FreshRSS_Context();
-	}
-
-	public function testParseSearch_whenEmpty_returnsEmptyArray() {
-		$this->assertCount(0, $this->context->parseSearch());
-	}
-
-	/**
-	 * @dataProvider provideMultipleKeywordSearch
-	 * @param string $search
-	 * @param string $expected_values
-	 */
-	public function testParseSearch_whenMultipleKeywords_returnArrayWithMultipleValues($search, $expected_values) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_values, $parsed_search);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideMultipleKeywordSearch() {
-		return array(
-		    array(
-			'intitle:word1 author:word2',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word2 intitle:word1',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word1 inurl:word2',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'inurl:word2 author:word1',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'date:2008-01-01/2008-02-01 pubdate:2007-01-01/2007-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'inurl:word1 author:word2 intitle:word3 pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01 hello world',
-			array(
-			    'inurl' => 'word1',
-			    'author' => 'word2',
-			    'intitle' => 'word3',
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			    'search' => 'hello world',
-			),
-		    ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideIntitleSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenIntitleKeyword_returnArrayWithIntitleValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['intitle']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideIntitleSearch() {
-		return array(
-		    array('intitle:word1', 'word1'),
-		    array('intitle:word1 word2', 'word1'),
-		    array('intitle:"word1 word2"', 'word1 word2'),
-		    array("intitle:'word1 word2'", 'word1 word2'),
-		    array('word1 intitle:word2', 'word2'),
-		    array('word1 intitle:word2 word3', 'word2'),
-		    array('word1 intitle:"word2 word3"', 'word2 word3'),
-		    array("word1 intitle:'word2 word3'", 'word2 word3'),
-		    array('intitle:word1 intitle:word2', 'word1'),
-		    array('intitle: word1 word2', ''),
-		    array('intitle:123', '123'),
-		    array('intitle:"word1 word2" word3"', 'word1 word2'),
-		    array("intitle:'word1 word2' word3'", 'word1 word2'),
-		    array('intitle:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideAuthorSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenAuthorKeyword_returnArrayWithAuthorValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['author']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideAuthorSearch() {
-		return array(
-		    array('author:word1', 'word1'),
-		    array('author:word1 word2', 'word1'),
-		    array('author:"word1 word2"', 'word1 word2'),
-		    array("author:'word1 word2'", 'word1 word2'),
-		    array('word1 author:word2', 'word2'),
-		    array('word1 author:word2 word3', 'word2'),
-		    array('word1 author:"word2 word3"', 'word2 word3'),
-		    array("word1 author:'word2 word3'", 'word2 word3'),
-		    array('author:word1 author:word2', 'word1'),
-		    array('author: word1 word2', ''),
-		    array('author:123', '123'),
-		    array('author:"word1 word2" word3"', 'word1 word2'),
-		    array("author:'word1 word2' word3'", 'word1 word2'),
-		    array('author:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("author:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideInurlSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenInurlKeyword_returnArrayWithInurlValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['inurl']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideInurlSearch() {
-		return array(
-		    array('inurl:word1', 'word1'),
-		    array('inurl: word1', ''),
-		    array('inurl:123', '123'),
-		    array('inurl:word1 word2', 'word1'),
-		    array('inurl:"word1 word2"', '"word1'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideDateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenDateKeyword_returnArrayWithDateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_date']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_date']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideDateSearch() {
-		return array(
-		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('date:2007-03-01/', '1172725200', ''),
-		    array('date:/2008-05-11', '', '1210564799'),
-		);
-	}
-
-	/**
-	 * @dataProvider providePubdateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenPubdateKeyword_returnArrayWithPubdateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_pubdate']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_pubdate']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function providePubdateSearch() {
-		return array(
-		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('pubdate:2007-03-01/', '1172725200', ''),
-		    array('pubdate:/2008-05-11', '', '1210564799'),
-		);
-	}
-
 }
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
new file mode 100644
index 000000000..6ddfc0370
--- /dev/null
+++ b/tests/app/Models/SearchTest.php
@@ -0,0 +1,276 @@
+<?php
+
+require_once(LIB_PATH . '/lib_date.php');
+
+class SearchTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider provideEmptyInput
+	 * @param string|null $input
+	 */
+	public function test__construct_whenInputIsEmpty_getsOnlyNullValues($input) {
+		$search = new FreshRSS_Search($input);
+		$this->assertNull($search->getRawInput());
+		$this->assertNull($search->getIntitle());
+		$this->assertNull($search->getMinDate());
+		$this->assertNull($search->getMaxDate());
+		$this->assertNull($search->getMinPubdate());
+		$this->assertNull($search->getMaxPubdate());
+		$this->assertNull($search->getAuthor());
+		$this->assertNull($search->getTags());
+		$this->assertNull($search->getSearch());
+	}
+
+	/**
+	 * Return an array of values for the search object.
+	 * Here is the description of the values
+	 * @return array
+	 */
+	public function provideEmptyInput() {
+		return array(
+		    array(''),
+		    array(null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideIntitleSearch
+	 * @param string $input
+	 * @param string $intitle_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsIntitle_setsIntitlePropery($input, $intitle_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideIntitleSearch() {
+		return array(
+		    array('intitle:word1', 'word1', null),
+		    array('intitle:word1 word2', 'word1', 'word2'),
+		    array('intitle:"word1 word2"', 'word1 word2', null),
+		    array("intitle:'word1 word2'", 'word1 word2', null),
+		    array('word1 intitle:word2', 'word2', 'word1'),
+		    array('word1 intitle:word2 word3', 'word2', 'word1 word3'),
+		    array('word1 intitle:"word2 word3"', 'word2 word3', 'word1'),
+		    array("word1 intitle:'word2 word3'", 'word2 word3', 'word1'),
+		    array('intitle:word1 intitle:word2', 'word1', 'intitle:word2'),
+		    array('intitle: word1 word2', null, 'word1 word2'),
+		    array('intitle:123', '123', null),
+		    array('intitle:"word1 word2" word3"', 'word1 word2', 'word3"'),
+		    array("intitle:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('intitle:"word1 word2\' word3"', "word1 word2' word3", null),
+		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3', null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAuthorSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsAuthor_setsAuthorValue($input, $author_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideAuthorSearch() {
+		return array(
+		    array('author:word1', 'word1', null),
+		    array('author:word1 word2', 'word1', 'word2'),
+		    array('author:"word1 word2"', 'word1 word2', null),
+		    array("author:'word1 word2'", 'word1 word2', null),
+		    array('word1 author:word2', 'word2', 'word1'),
+		    array('word1 author:word2 word3', 'word2', 'word1 word3'),
+		    array('word1 author:"word2 word3"', 'word2 word3', 'word1'),
+		    array("word1 author:'word2 word3'", 'word2 word3', 'word1'),
+		    array('author:word1 author:word2', 'word1', 'author:word2'),
+		    array('author: word1 word2', null, 'word1 word2'),
+		    array('author:123', '123', null),
+		    array('author:"word1 word2" word3"', 'word1 word2', 'word3"'),
+		    array("author:'word1 word2' word3'", 'word1 word2', "word3'"),
+		    array('author:"word1 word2\' word3"', "word1 word2' word3", null),
+		    array("author:'word1 word2\" word3'", 'word1 word2" word3', null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideInurlSearch
+	 * @param string $input
+	 * @param string $inurl_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsInurl_setsInurlValue($input, $inurl_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideInurlSearch() {
+		return array(
+		    array('inurl:word1', 'word1', null),
+		    array('inurl: word1', null, 'word1'),
+		    array('inurl:123', '123', null),
+		    array('inurl:word1 word2', 'word1', 'word2'),
+		    array('inurl:"word1 word2"', '"word1', 'word2"'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideDateSearch
+	 * @param string $input
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 */
+	public function test__construct_whenInputContainsDate_setsDateValues($input, $min_date_value, $max_date_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideDateSearch() {
+		return array(
+		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('date:2007-03-01/', '1172725200', ''),
+		    array('date:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+	/**
+	 * @dataProvider providePubdateSearch
+	 * @param string $input
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 */
+	public function test__construct_whenInputContainsPubdate_setsPubdateValues($input, $min_pubdate_value, $max_pubdate_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePubdateSearch() {
+		return array(
+		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
+		    array('pubdate:2007-03-01/', '1172725200', ''),
+		    array('pubdate:/2008-05-11', '', '1210564799'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideTagsSearch
+	 * @param string $input
+	 * @param string $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsTags_setsTagsValue($input, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideTagsSearch() {
+		return array(
+		    array('#word1', array('word1'), null),
+		    array('# word1', null, '# word1'),
+		    array('#123', array('123'), null),
+		    array('#word1 word2', array('word1'), 'word2'),
+		    array('#"word1 word2"', array('"word1'), 'word2"'),
+		    array('#word1 #word2', array('word1', 'word2'), null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMultipleSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 * @param string $intitle_value
+	 * @param string $inurl_value
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 * @param array $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsMultipleKeywords_setsValues($input, $author_value, $min_date_value, $max_date_value, $intitle_value, $inurl_value, $min_pubdate_value, $max_pubdate_value, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	public function provideMultipleSearch() {
+		return array(
+		    array(
+			'author:word1 date:2007-03-01/2008-05-11 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 #word5',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			null,
+		    ),
+		    array(
+			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 date:2007-03-01/2008-05-11',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			'word6',
+		    ),
+		    array(
+			'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 word7 date:2007-03-01/2008-05-11',
+			'word1',
+			'1172725200',
+			'1210564799',
+			'word2',
+			'word3',
+			'1172725200',
+			'1210564799',
+			array('word4', 'word5'),
+			'word6 word7',
+		    ),
+		);
+	}
+
+}