Remove the prefix after assembling the last chunk.

Until now, the reassembled file shared the name with the very first chunk uploaded.
It had the form {prefix}_{filename}. This commit fixes this issue and addresses #21 with it.

Tests/Controller/AbstractChunkedUploadTest.php

@@ -4,8 +4,9 @@
 
 use Symfony\Component\EventDispatcher\Event;
 use Oneup\UploaderBundle\Tests\Controller\AbstractUploadTest;
-use Oneup\UploaderBundle\UploadEvents;
 use Oneup\UploaderBundle\Event\PostChunkUploadEvent;
+use Oneup\UploaderBundle\Event\PreUploadEvent;
+use Oneup\UploaderBundle\UploadEvents;
 
 abstract class AbstractChunkedUploadTest extends AbstractUploadTest
 {
@@ -17,11 +18,27 @@ abstract protected function getNextFile($i);
     public function testChunkedUpload()
     {
         // assemble a request
-        $client = $this->client;
+        $me = $this;
         $endpoint = $this->helper->endpoint($this->getConfigKey());
+        $basename = '';
 
         for ($i = 0; $i < $this->total; $i ++) {
-            $client->request('POST', $endpoint, $this->getNextRequestParameters($i), array($this->getNextFile($i)));
+            $file = $this->getNextFile($i);
+
+            if ($basename === '') {
+                $basename = $file->getClientOriginalName();
+            }
+
+            $client = static::createClient();
+            $dispatcher = $client->getContainer()->get('event_dispatcher');
+
+            $dispatcher->addListener(UploadEvents::PRE_UPLOAD, function(PreUploadEvent $event) use (&$me, $basename) {
+                $file = $event->getFile();
+
+                $me->assertEquals($file->getBasename(), $basename);
+            });
+
+            $client->request('POST', $endpoint, $this->getNextRequestParameters($i), array($file));
             $response = $client->getResponse();
 
             $this->assertTrue($response->isSuccessful());

Uploader/Chunk/ChunkManager.php

@@ -2,6 +2,7 @@
 
 namespace Oneup\UploaderBundle\Uploader\Chunk;
 
+use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Filesystem\Filesystem;
@@ -65,7 +66,11 @@ public function assembleChunks(\IteratorAggregate $chunks)
             $iterator->next();
         }
 
-        return $base;
+        // remove the prefix added by self::addChunk
+        $assembled = new File($base->getRealPath());
+        $assembled = $assembled->move($base->getPath(), preg_replace('/^(.+?)_/', '', $base->getBasename()));
+
+        return $assembled;
     }
 
     public function cleanup($path)