diff --git a/src/bundle/Resources/config/settings/fieldtype_services.yaml b/src/bundle/Resources/config/settings/fieldtype_services.yaml index 0ee71f70..c38a5d9c 100644 --- a/src/bundle/Resources/config/settings/fieldtype_services.yaml +++ b/src/bundle/Resources/config/settings/fieldtype_services.yaml @@ -70,3 +70,22 @@ services: Ibexa\FieldTypeRichText\RichText\TextExtractor\FullTextExtractor: ~ + Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface: + alias: Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\AggregateFilter + + Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterFactoryInterface: + alias: Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodeFilterFactory + + Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodeFilterFactory: ~ + + Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\AggregateFilter: + arguments: + $filters: !tagged ibexa.field_type.richtext.text_extractor.node_filter + + ibexa.field_type.richtext.text_extractor.node_filter.template: + class: Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface + factory: ['@Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterFactoryInterface', 'createPathFilter'] + arguments: ['eztemplate', 'ezconfig'] + tags: + - { name: ibexa.field_type.richtext.text_extractor.node_filter } + diff --git a/src/contracts/RichText/TextExtractor/NodeFilterFactoryInterface.php b/src/contracts/RichText/TextExtractor/NodeFilterFactoryInterface.php new file mode 100644 index 00000000..fae43431 --- /dev/null +++ b/src/contracts/RichText/TextExtractor/NodeFilterFactoryInterface.php @@ -0,0 +1,14 @@ +filter = $filter; + } + public function extractText(DOMDocument $document): string { return null !== $document->documentElement @@ -28,8 +36,12 @@ public function extractText(DOMDocument $document): string private function extractTextFromNode(DOMNode $node): string { - $text = ''; + if ($this->filter->filter($node) === true) { + // Node is excluded + return ''; + } + $text = ''; if ($node->childNodes !== null && $node->childNodes->count() > 0) { foreach ($node->childNodes as $child) { $text .= $this->extractTextFromNode($child); diff --git a/src/lib/RichText/TextExtractor/NodeFilter/AggregateFilter.php b/src/lib/RichText/TextExtractor/NodeFilter/AggregateFilter.php new file mode 100644 index 00000000..8d1a8586 --- /dev/null +++ b/src/lib/RichText/TextExtractor/NodeFilter/AggregateFilter.php @@ -0,0 +1,37 @@ +filters = $filters; + } + + public function filter(DOMNode $node): bool + { + foreach ($this->filters as $filter) { + if ($filter->filter($node)) { + return true; + } + } + + return false; + } +} diff --git a/src/lib/RichText/TextExtractor/NodeFilter/NodeFilterFactory.php b/src/lib/RichText/TextExtractor/NodeFilter/NodeFilterFactory.php new file mode 100644 index 00000000..5d37f580 --- /dev/null +++ b/src/lib/RichText/TextExtractor/NodeFilter/NodeFilterFactory.php @@ -0,0 +1,20 @@ +path = array_reverse($path); + } + + public function filter(DOMNode $node): bool + { + foreach ($this->path as $name) { + if ($node === null || $node->nodeName !== $name) { + return false; + } + + $node = $node->parentNode; + } + + return true; + } +} diff --git a/tests/lib/RichText/TextExtractor/FullTextExtractorTest.php b/tests/lib/RichText/TextExtractor/FullTextExtractorTest.php index afb3c9ab..71c8e03f 100644 --- a/tests/lib/RichText/TextExtractor/FullTextExtractorTest.php +++ b/tests/lib/RichText/TextExtractor/FullTextExtractorTest.php @@ -8,13 +8,17 @@ namespace Ibexa\Tests\FieldTypeRichText\RichText\TextExtractor; +use Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface; use Ibexa\FieldTypeRichText\RichText\TextExtractor\FullTextExtractor; final class FullTextExtractorTest extends BaseTest { protected function setUp(): void { - $this->textExtractor = new FullTextExtractor(); + $filter = $this->createMock(NodeFilterInterface::class); + $filter->method('filter')->willReturn(false); + + $this->textExtractor = new FullTextExtractor($filter); } public function providerForTestExtractText(): array diff --git a/tests/lib/RichText/TextExtractor/NodeFilter/AggregateFilterTest.php b/tests/lib/RichText/TextExtractor/NodeFilter/AggregateFilterTest.php new file mode 100644 index 00000000..1d6c4823 --- /dev/null +++ b/tests/lib/RichText/TextExtractor/NodeFilter/AggregateFilterTest.php @@ -0,0 +1,33 @@ +createMock(DOMNode::class); + + $filterA = $this->createMock(NodeFilterInterface::class); + $filterA->expects(self::once())->method('filter')->with($node)->willReturn(false); + $filterB = $this->createMock(NodeFilterInterface::class); + $filterB->expects(self::once())->method('filter')->with($node)->willReturn(true); + $filterC = $this->createMock(NodeFilterInterface::class); + $filterC->expects(self::never())->method('filter'); + + $aggregateFilter = new AggregateFilter([$filterA, $filterB, $filterC]); + + self::assertTrue($aggregateFilter->filter($node)); + } +} diff --git a/tests/lib/RichText/TextExtractor/NodeFilter/NodePathFilterTest.php b/tests/lib/RichText/TextExtractor/NodeFilter/NodePathFilterTest.php new file mode 100644 index 00000000..4ddc63cb --- /dev/null +++ b/tests/lib/RichText/TextExtractor/NodeFilter/NodePathFilterTest.php @@ -0,0 +1,46 @@ +loadXML(''); + + $nodeA = $this->getNode($document, '//a'); + $nodeB = $this->getNode($document, '//b'); + $nodeC = $this->getNode($document, '//c'); + + self::assertFalse((new NodePathFilter('b', 'c'))->filter($nodeB)); + self::assertTrue((new NodePathFilter('b', 'c'))->filter($nodeC)); + self::assertFalse((new NodePathFilter('a', 'b', 'c', 'd'))->filter($nodeA)); + } + + private function getNode(DOMDocument $document, string $expression): DOMNode + { + $xpath = new DOMXPath($document); + + $results = $xpath->query($expression); + if ($results instanceof DOMNodeList) { + /** @var \DOMNode */ + return $results->item(0); + } + + self::fail("Expression '$expression' did not return a node."); + } +}