mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00
Code Issues Activity

Add all the other context options allowed by the TTRSS search syntax

Browse source
This commit is contained in:
J. King 2019-02-25 10:46:43 -05:00
parent 2df7c25b66
commit f4a74eec5d
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Misc/Context.php
View file

@ -10,6 +10,7 @@ use JKingWeb\Arsse\Misc\Date;
use JKingWeb\Arsse\Misc\ValueInfo; use JKingWeb\Arsse\Misc\ValueInfo;
class Context { class Context {
public $not = null;
public $reverse = false; public $reverse = false;
public $limit = 0; public $limit = 0;
public $offset = 0; public $offset = 0;
@ -36,9 +37,16 @@ class Context {
public $annotated = null; public $annotated = null;
public $annotationTerms = null; public $annotationTerms = null;
public $searchTerms = null; public $searchTerms = null;
public $titleTerms = null;
public $authorTerms = null;
protected $props = []; protected $props = [];
public function __clone() {
// clone the negation context, if any
$this->not = $this->not ? clone $this->not : null;
}
protected function act(string $prop, int $set, $value) { protected function act(string $prop, int $set, $value) {
if ($set) { if ($set) {
if (is_null($value)) { if (is_null($value)) {
@ -198,4 +206,22 @@ class Context {
} }
return $this->act(__FUNCTION__, func_num_args(), $spec); return $this->act(__FUNCTION__, func_num_args(), $spec);
} }
public function titleTerms(array $spec = null) {
if (isset($spec)) {
$spec = $this->cleanStringArray($spec);
}
return $this->act(__FUNCTION__, func_num_args(), $spec);
}
public function authorTerms(array $spec = null) {
if (isset($spec)) {
$spec = $this->cleanStringArray($spec);
}
return $this->act(__FUNCTION__, func_num_args(), $spec);
}
public function not(self $spec = null) {
return $this->act(__FUNCTION__, func_num_args(), $spec);
}
} }

9
tests/cases/Misc/TestContext.php
View file

@ -14,7 +14,7 @@ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest {
public function testVerifyInitialState() { public function testVerifyInitialState() {
$c = new Context; $c = new Context;
foreach ((new \ReflectionObject($c))->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) { foreach ((new \ReflectionObject($c))->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) {
if ($m->isConstructor() || $m->isStatic()) { if ($m->isStatic() || strpos($m->name, "__") === 0) {
continue; continue;
} }
$method = $m->name; $method = $m->name;
@ -51,11 +51,14 @@ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest {
'annotated' => true, 'annotated' => true,
'searchTerms' => ["foo", "bar"], 'searchTerms' => ["foo", "bar"],
'annotationTerms' => ["foo", "bar"], 'annotationTerms' => ["foo", "bar"],
'titleTerms' => ["foo", "bar"],
'authorTerms' => ["foo", "bar"],
'not' => (new Context)->subscription(5),
]; ];
$times = ['modifiedSince','notModifiedSince','markedSince','notMarkedSince']; $times = ['modifiedSince','notModifiedSince','markedSince','notMarkedSince'];
$c = new Context; $c = new Context;
foreach ((new \ReflectionObject($c))->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) { foreach ((new \ReflectionObject($c))->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) {
if ($m->isConstructor() || $m->isStatic()) { if ($m->isStatic() || strpos($m->name, "__") === 0) {
continue; continue;
} }
$method = $m->name; $method = $m->name;
@ -84,7 +87,7 @@ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest {
} }
public function testCleanStringArrayValues() { public function testCleanStringArrayValues() {
$methods = ["searchTerms", "annotationTerms"]; $methods = ["searchTerms", "annotationTerms", "titleTerms", "authorTerms"];
$now = new \DateTime; $now = new \DateTime;
$in = [1, 3.0, "ook", 0, true, false, null, $now, ""]; $in = [1, 3.0, "ook", 0, true, false, null, $now, ""];
$out = ["1", "3", "ook", "0", valueInfo::normalize($now, ValueInfo::T_STRING)]; $out = ["1", "3", "ook", "0", valueInfo::normalize($now, ValueInfo::T_STRING)];