opdavies/oliverdavies.uk-old-sculpin
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Change filters into functions

Browse source
This commit is contained in:
Oliver Davies 2019-12-27 13:56:51 +00:00
parent 7955042ec0
commit 1c3d7f820f
4 changed files with 39 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
app/src/Talk/TwigExtension/TalksExtension.php
View file

@ -30,16 +30,9 @@ class TalksExtension extends AbstractExtension
{
return [
new TwigFunction('get_all_talks', [$this, 'getAllTalks']),
];
}
public function getFilters()
{
return [
new TwigFilter('pastEvents', [$this, 'filterPastEvents']),
new TwigFilter('pastTalks', [$this, 'filterPastTalks']),
new TwigFilter('upcomingEvents', [$this, 'filterUpcomingEvents']),
new TwigFilter('upcomingTalks', [$this, 'filterUpcomingTalks']),
new TwigFunction('get_upcoming_talks', [$this, 'getUpcomingTalks']),
new TwigFunction('get_past_talks', [$this, 'getPastTalks']),
new TwigFunction('get_past_talk_count', [$this, 'getPastTalkCount']),
];
}
@ -65,49 +58,47 @@ class TalksExtension extends AbstractExtension
});
}
public function filterUpcomingTalks(Collection $talks): Collection
public function getUpcomingTalks(array $talks): Collection
{
return $talks->filter(function ($talk): bool {
return $this->getAllTalks($talks)->filter(function ($talk): bool {
return $this->getLastDate($talk) >= $this->today;
})->values();
}
public function filterPastTalks(Collection $talks): Collection
public function getPastTalks(array $talks): Collection
{
return $talks->filter(function ($talk): bool {
return $this->getAllTalks($talks)->filter(function ($talk): bool {
return $this->getLastDate($talk) < $this->today;
})->values();
}
public function getAllEvents($talks): Collection
{
return $this->eventsFromTalks($talks);
}
public function getPastEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] < $this->today;
})->sortBy('date');
}
public function getPastTalkCount($talks): int
{
return $this->getPastEvents($talks)->count();
}
private function getLastDate($talk): string
{
return $this->eventsFromTalks(new Collection([$talk]))
->pluck('date')->max();
}
public function filterUpcomingEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] >= $this->today;
})->sortBy('date');
}
public function filterPastEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] < $this->today;
})->sortBy('date');
}
private function eventsFromTalks($talks): Collection
{
return (new Collection($talks))->flatMap(function ($talk): array {
return $talk['events'];
});
}
public function getAllEvents($talks): Collection
{
return $this->eventsFromTalks($talks);
}
}

38
app/tests/Talk/TwigExtension/RetrievingEventsTest.php
View file

@ -50,43 +50,7 @@ class RetrievingEventsTest extends TestCase
];
$talks = $this->extension->getAllTalks([$talkA, $talkB]);
$events = $this->extension->filterPastEvents($talks);
$this->assertInstanceOf(Collection::class, $talks);
$this->assertInstanceOf(Collection::class, $events);
$this->assertCount(2, $events);
}
/** @test */
public function get_current_or_upcoming_events()
{
$talkA = [
'title' => 'Test Driven Drupal',
'events' => [
[
'event' => 'php_south_wales',
'date' => (new DateTime('+0 days'))->getTimestamp(),
],
[
'event' => 'drupalcamp_london',
'date' => (new DateTime('-1 days'))->getTimestamp(),
],
],
];
$talkB = [
'title' => 'Taking Flight with Tailwind CSS',
'events' => [
[
'event' => 'blue_conf_2019',
'date' => (new DateTime('+2 days'))->getTimestamp(),
],
],
];
$talks = $this->extension->getAllTalks([$talkA, $talkB]);
$events = $this->extension->filterUpcomingEvents($talks);
$events = $this->extension->getPastEvents($talks);
$this->assertInstanceOf(Collection::class, $talks);
$this->assertInstanceOf(Collection::class, $events);

22
app/tests/Talk/TwigExtension/RetrievingTalksTest.php
View file

@ -91,11 +91,9 @@ class RetrievingTalksTest extends TestCase
],
];
$talks = $this->extension->getAllTalks([$pastTalk, $futureTalk]);
$filtered = $this->extension->filterPastTalks($talks);
$this->assertCount(1, $filtered);
$this->assertSame($pastTalk, $filtered->first());
$talks = $this->extension->getPastTalks([$pastTalk, $futureTalk]);
$this->assertCount(1, $talks);
$this->assertSame($pastTalk, $talks->first());
}
/** @test */
@ -122,11 +120,9 @@ class RetrievingTalksTest extends TestCase
],
];
$talks = $this->extension->getAllTalks([$pastTalk, $todayTalk, $futureTalk]);
$filtered = $this->extension->filterUpcomingTalks($talks);
$this->assertSame(2, $filtered->count());
$this->assertSame([$todayTalk, $futureTalk], $filtered->toArray());
$talks = $this->extension->getUpcomingTalks([$pastTalk, $todayTalk, $futureTalk]);
$this->assertSame(2, $talks->count());
$this->assertSame([$todayTalk, $futureTalk], $talks->toArray());
}
/** @test */
@ -140,10 +136,8 @@ class RetrievingTalksTest extends TestCase
],
];
$talks = $this->extension->getAllTalks([$talk]);
$this->assertCount(1, $this->extension->filterUpcomingTalks($talks));
$this->assertEmpty($this->extension->filterPastTalks($talks));
$this->assertCount(1, $this->extension->getUpcomingTalks([$talk]));
$this->assertEmpty($this->extension->getPastTalks([$talk]));
}
/** @test */

12
source/_pages/talks.html.twig
View file

@ -24,22 +24,22 @@ talks:
date: 2018-06-27
---
{% block content %}
{% set talks = get_all_talks(page.talks|merge(data.talks)) %}
{% set talks = page.talks|merge(data.talks) %}
<header>
<p class="lead">
After giving my first talk in September 2012, I have now given {{ talks|pastEvents|length }} presentations at various conferences and meetups,
After giving my first talk in September 2012, I have now given {{ get_past_talk_count(talks) }} presentations at various conferences and meetups,
on topics including PHP, Drupal, Git, CSS and systems administration.
</p>
</header>
<div class="spaced-y-10 mt-6">
{% include 'talks/upcoming' with {
talks: talks|upcomingTalks,
} %}
talks: get_upcoming_talks(talks),
} only %}
{% include 'talks/past' with {
talks: talks|pastTalks,
} %}
talks: get_past_talks(talks),
} only %}
</div>
{% endblock %}