Skip to content

Commit b9ce9ba

Browse files
samizdamsamizdam
authored
Merge pull request #3 from FreeElephants/path-composition
WIP: new composition prepend / append
2 parents 1181eac + 10c1f5b commit b9ce9ba

9 files changed

Lines changed: 46 additions & 20 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.0.3] - 2025-04-26
10+
11+
### Added
12+
- Prepend / Append composition for handy path parts
13+
914
## [0.0.2] - 2025-04-22
1015

1116
### Added
@@ -16,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1621
### Added
1722
- StaticHttpClient, HostnameAwareResolver classes
1823

19-
[Unreleased]: https://github.com/FreeElephants/static-http-client/compare/0.0.2...HEAD
24+
[Unreleased]: https://github.com/FreeElephants/static-http-client/compare/0.0.3...HEAD
25+
[0.0.3]: https://github.com/FreeElephants/static-http-client/releases/tag/0.0.3
2026
[0.0.2]: https://github.com/FreeElephants/static-http-client/releases/tag/0.0.2
2127
[0.0.1]: https://github.com/FreeElephants/static-http-client/releases/tag/0.0.1

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public function test()
1919
$responseFactory,
2020
new \FreeElephants\StaticHttpClient\PathResolver\PathBuilderBasedResolver(
2121
new \FreeElephants\StaticHttpClient\PathBuilder\Composite(
22-
new \FreeElephants\StaticHttpClient\PathBuilder\BasePath(__DIR__),
23-
new \FreeElephants\StaticHttpClient\PathBuilder\HostnameAsDirectory(),
22+
new \FreeElephants\StaticHttpClient\PathBuilder\PrependBasePath(__DIR__),
23+
new \FreeElephants\StaticHttpClient\PathBuilder\PrependHostnameAsDirectory(),
2424
new \FreeElephants\StaticHttpClient\PathBuilder\AppendRequestPath(),
25-
new \FreeElephants\StaticHttpClient\PathBuilder\DefaultFileExtension('.json'),
25+
new \FreeElephants\StaticHttpClient\PathBuilder\AppendDefaultFileExtension('.json'),
2626
)
2727
)
2828
);

src/FreeElephants/StaticHttpClient/PathBuilder/DefaultFileExtension.php renamed to src/FreeElephants/StaticHttpClient/PathBuilder/AppendDefaultFileExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Psr\Http\Message\RequestInterface;
66

7-
class DefaultFileExtension implements PathBuilderInterface
7+
class AppendDefaultFileExtension implements PathBuilderInterface
88
{
99

1010
private string $fileExtension;

‎src/FreeElephants/StaticHttpClient/PathBuilder/AppendHostnameAsDirectory.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
namespace FreeElephants\StaticHttpClient\PathBuilder;
4+
5+
use Psr\Http\Message\RequestInterface;
6+
7+
class AppendHostnameAsDirectory implements PathBuilderInterface
8+
{
9+
public function build(RequestInterface $request, string $path = ''): string
10+
{
11+
return $path . DIRECTORY_SEPARATOR . $request->getUri()->getHost();
12+
}
13+
14+
}

src/FreeElephants/StaticHttpClient/PathBuilder/BasePath.php renamed to src/FreeElephants/StaticHttpClient/PathBuilder/PrependBasePath.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44

55
use Psr\Http\Message\RequestInterface;
66

7-
class BasePath implements PathBuilderInterface
7+
class PrependBasePath implements PathBuilderInterface
88
{
99
private string $basePath;
1010

1111
public function __construct(string $basePath)
1212
{
13-
14-
$this->basePath = $basePath;
13+
$this->basePath = rtrim($basePath, DIRECTORY_SEPARATOR);
1514
}
1615

1716
public function build(RequestInterface $request, string $path = ''): string
1817
{
19-
return $this->basePath . $path;
18+
return $this->basePath . DIRECTORY_SEPARATOR . ltrim($path, DIRECTORY_SEPARATOR);
2019
}
2120
}

src/FreeElephants/StaticHttpClient/PathBuilder/HostnameAsDirectory.php renamed to src/FreeElephants/StaticHttpClient/PathBuilder/PrependHostnameAsDirectory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Psr\Http\Message\RequestInterface;
66

7-
class HostnameAsDirectory implements PathBuilderInterface
7+
class PrependHostnameAsDirectory implements PathBuilderInterface
88
{
99
public function build(RequestInterface $request, string $path = ''): string
1010
{

‎tests/FreeElephants/StaticHttpClient/PathBuilder/CompositeTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ public function testBuild(): void
1212
{
1313
$composite = new Composite(
1414
new AppendRequestPath(),
15-
new DefaultFileExtension(),
16-
new HostnameAsDirectory(),
15+
new PrependHostnameAsDirectory(),
16+
new PrependBasePath('/root'),
17+
new AppendDefaultFileExtension(),
1718
);
1819

1920
$path = $composite->build(new Request('GET', 'http://example.com/foo'));
2021

21-
$this->assertSame('example.com/foo.json', $path, 'Composite should build path from all builders');
22+
$this->assertSame('/root/example.com/foo.json', $path, 'Composite should build path from all builders');
2223
}
2324
}

‎tests/FreeElephants/StaticHttpClient/PathResolver/PathBuilderBasedResolverTest.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
use FreeElephants\StaticHttpClient\AbstractTestCase;
66
use FreeElephants\StaticHttpClient\PathBuilder\AppendRequestPath;
7-
use FreeElephants\StaticHttpClient\PathBuilder\BasePath;
7+
use FreeElephants\StaticHttpClient\PathBuilder\PrependBasePath;
88
use FreeElephants\StaticHttpClient\PathBuilder\Composite;
9-
use FreeElephants\StaticHttpClient\PathBuilder\DefaultFileExtension;
9+
use FreeElephants\StaticHttpClient\PathBuilder\AppendDefaultFileExtension;
1010
use FreeElephants\StaticHttpClient\PathBuilder\PathBuilderInterface;
11+
use FreeElephants\StaticHttpClient\PathBuilder\PrependHostnameAsDirectory;
1112
use FreeElephants\StaticHttpClient\PathResolver\Exception\UnresolvablePathException;
1213
use Nyholm\Psr7\Request;
1314
use PHPUnit\Framework\TestCase;
@@ -18,21 +19,22 @@ public function testResolve(): void
1819
{
1920
$pathBuilderBasedResolver = new PathBuilderBasedResolver(
2021
new Composite(
21-
new BasePath(self::FIXTURE_PATH),
2222
new AppendRequestPath(),
23-
new DefaultFileExtension()
23+
new PrependHostnameAsDirectory(),
24+
new PrependBasePath(self::FIXTURE_PATH),
25+
new AppendDefaultFileExtension('.html')
2426
)
2527
);
2628

27-
$actual = $pathBuilderBasedResolver->resolve(new Request('GET', 'http://example.com/foo'));
28-
$this->assertSame(self::FIXTURE_PATH . DIRECTORY_SEPARATOR . 'foo.json', $actual);
29+
$actual = $pathBuilderBasedResolver->resolve(new Request('GET', 'http://example.com/bar'));
30+
$this->assertSame(self::FIXTURE_PATH . '/example.com/bar.html', $actual);
2931
}
3032

3133
public function testUnresolvedException(): void
3234
{
3335
$pathBuilderBasedResolver = new PathBuilderBasedResolver($this->createMock(PathBuilderInterface::class));;
3436

3537
$this->expectException(UnresolvablePathException::class);
36-
$pathBuilderBasedResolver->resolve(new Request('GET', 'http://example.com/foo'));
38+
$pathBuilderBasedResolver->resolve(new Request('GET', 'http://example.com/bar'));
3739
}
3840
}

‎tests/_fixtures/example.com/bar.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<html>
2+
<head><title>bar</title></head>
3+
<body></body>
4+
</html>

0 commit comments

Comments
 (0)