Skip to content

Rename range object to indicate usage #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2020
Merged

Rename range object to indicate usage #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Driver/DropzoneUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Closure;
use CodingSocks\ChunkUploader\Helper\ChunkHelpers;
use CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange;
use CodingSocks\ChunkUploader\Range\DropzoneRange;
use CodingSocks\ChunkUploader\Response\PercentageJsonResponse;
use CodingSocks\ChunkUploader\StorageConfig;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -128,7 +128,7 @@ private function saveMonolith(UploadedFile $file, StorageConfig $config, Closure
private function saveChunk(UploadedFile $file, Request $request, StorageConfig $config, Closure $fileUploaded = null): Response
{
try {
$range = new ZeroBasedRequestBodyRange(
$range = new DropzoneRange(
$request,
'dzchunkindex',
'dztotalchunkcount',
Expand Down
6 changes: 3 additions & 3 deletions src/Driver/ResumableJsUploadDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Closure;
use CodingSocks\ChunkUploader\Helper\ChunkHelpers;
use CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange;
use CodingSocks\ChunkUploader\Range\ResumableJsRange;
use CodingSocks\ChunkUploader\Response\PercentageJsonResponse;
use CodingSocks\ChunkUploader\StorageConfig;
use Illuminate\Http\JsonResponse;
Expand Down Expand Up @@ -90,7 +90,7 @@ public function resume(Request $request, StorageConfig $config): Response
$this->validateChunkRequest($request);

try {
$range = new OneBasedRequestBodyRange(
$range = new ResumableJsRange(
$request->query,
$this->buildParameterName('chunk-number'),
$this->buildParameterName('total-chunks'),
Expand Down Expand Up @@ -154,7 +154,7 @@ private function validateChunkRequest(Request $request): void
private function saveChunk(UploadedFile $file, Request $request, StorageConfig $config, Closure $fileUploaded = null): Response
{
try {
$range = new OneBasedRequestBodyRange(
$range = new ResumableJsRange(
$request,
$this->buildParameterName('chunk-number'),
$this->buildParameterName('total-chunks'),
Expand Down
2 changes: 1 addition & 1 deletion src/Range/ZeroBasedRequestBodyRange.php → src/Range/DropzoneRange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use InvalidArgumentException;

class ZeroBasedRequestBodyRange extends RequestBodyRange
class DropzoneRange extends RequestBodyRange
{
/**
* @param string $indexKey
Expand Down
2 changes: 1 addition & 1 deletion src/Range/OneBasedRequestBodyRange.php → src/Range/ResumableJsRange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use InvalidArgumentException;

class OneBasedRequestBodyRange extends RequestBodyRange
class ResumableJsRange extends RequestBodyRange
{
/**
* @param string $numberOfChunksKey
Expand Down
10 changes: 5 additions & 5 deletions ...s/Range/ZeroBasedRequestBodyRangeTest.php → tests/Range/DropzoneRangeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace CodingSocks\ChunkUploader\Tests\Range;

use CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange;
use CodingSocks\ChunkUploader\Range\DropzoneRange;
use Illuminate\Http\Request;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\ParameterBag;

class ZeroBasedRequestBodyRangeTest extends TestCase
class DropzoneRangeTest extends TestCase
{
public function invalidArgumentProvider()
{
Expand Down Expand Up @@ -117,7 +117,7 @@ public function testCreateFromRequest()
'totalSize' => 190,
]);

$range = new ZeroBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
$range = new DropzoneRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');

$this->assertEquals(80, $range->getStart());
$this->assertEquals(99, $range->getEnd());
Expand All @@ -130,7 +130,7 @@ public function testCreateFromRequest()
* @param int $chunkSize
* @param float $totalSize
*
* @return \CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange
* @return \CodingSocks\ChunkUploader\Range\DropzoneRange
*/
private function createRequestBodyRange(int $index, int $numberOfChunks, int $chunkSize, float $totalSize)
{
Expand All @@ -141,6 +141,6 @@ private function createRequestBodyRange(int $index, int $numberOfChunks, int $ch
'totalSize' => (string) $totalSize,
]);

return new ZeroBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
return new DropzoneRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
}
}
10 changes: 5 additions & 5 deletions tests/Range/OneBasedRequestBodyRangeTest.php → tests/Range/ResumableJsRangeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace CodingSocks\ChunkUploader\Tests\Range;

use CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange;
use CodingSocks\ChunkUploader\Range\ResumableJsRange;
use Illuminate\Http\Request;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\ParameterBag;

class OneBasedRequestBodyRangeTest extends TestCase
class ResumableJsRangeTest extends TestCase
{
public function invalidArgumentProvider()
{
Expand Down Expand Up @@ -116,7 +116,7 @@ public function testCreateFromRequest()
'totalSize' => 190,
]);

$range = new OneBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
$range = new ResumableJsRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');

$this->assertEquals(80, $range->getStart());
$this->assertEquals(99, $range->getEnd());
Expand All @@ -129,7 +129,7 @@ public function testCreateFromRequest()
* @param int $chunkSize
* @param float $totalSize
*
* @return \CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange
* @return \CodingSocks\ChunkUploader\Range\ResumableJsRange
*/
private function createRequestBodyRange(int $index, int $numberOfChunks, int $chunkSize, float $totalSize)
{
Expand All @@ -140,6 +140,6 @@ private function createRequestBodyRange(int $index, int $numberOfChunks, int $ch
'totalSize' => (string) $totalSize,
]);

return new OneBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
return new ResumableJsRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize');
}
}