tests for uploading, and clean up class.

Author: jasonvarga

app/Assets/Asset.php

@@ -2,7 +2,6 @@
 
 namespace Statamic\Assets;
 
-use Carbon\Carbon;
 use Stringy\Stringy;
 use Statamic\API\Str;
 use Statamic\API\URL;
@@ -12,6 +11,7 @@
 use Statamic\API\Image;
 use Statamic\Data\Data;
 use Statamic\API\Blueprint;
+use Illuminate\Support\Carbon;
 use Statamic\Data\ContainsData;
 use League\Flysystem\Filesystem;
 use League\Flysystem\Adapter\Local;
@@ -421,18 +421,15 @@ public function upload(UploadedFile $file)
 
         // If the file exists, we'll append a timestamp to prevent overwriting.
         if ($this->disk()->exists($path)) {
-            $basename = $filename . '-' . time() . '.' . $ext;
+            $basename = $filename . '-' . Carbon::now()->timestamp . '.' . $ext;
             $path = Str::removeLeft(Path::assemble($directory, $basename), '/');
         }
 
-        $this->performUpload($file, $path);
+        $this->disk()->put($path, $file);
 
         $this->path($path);
 
         event(new AssetUploaded($this));
-
-        // Legacy/Deprecated. TODO: Remove in 2.3
-        event('asset.uploaded', $path);
     }
 
     private function getSafeFilename($string)
@@ -451,36 +448,6 @@ private function getSafeFilename($string)
         return (string) $str;
     }
 
-    /**
-     * Actually perform the file upload.
-     *
-     * Saves the file to a temporary location on the local filesystem, then moves it to the
-     * right place. This is a workaround for needing to know the file extension or mime
-     * type when uploading to Amazon S3. Temporary files don't have file extensions
-     * so sending directly to S3 causes it to appear with the wrong mime type.
-     *
-     * @param UploadedFile $file
-     * @param string $path
-     * @return void
-     */
-    private function performUpload(UploadedFile $file, $path)
-    {
-        // Build up a path where the file will be temporarily stored
-        $temp = 'uploads/'.md5($file->getRealPath().microtime(true)).'.'.$file->getClientOriginalExtension();
-
-        // Upload to a temporary location
-        $temp_disk = new Filesystem(new Local(temp_path()));
-        $stream = fopen($file->getRealPath(), 'r+');
-        $temp_disk->putStream($temp, $stream);
-        fclose($stream);
-
-        // Move from the temporary location to the real container location
-        $this->disk()->put($path, $temp_disk->readStream($temp));
-
-        // Delete the temporary file
-        $temp_disk->delete($temp);
-    }
-
     /**
      * Replace the file
      *

tests/Assets/AssetTest.php

@@ -7,10 +7,13 @@
 use Tests\TestCase;
 use Statamic\Assets\Asset;
 use Statamic\Fields\Blueprint;
+use Illuminate\Http\UploadedFile;
 use Statamic\Assets\AssetContainer;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Event;
 use Facades\Statamic\Assets\Dimensions;
+use Illuminate\Support\Facades\Storage;
+use Statamic\Events\Data\AssetUploaded;
 use Tests\PreventSavingStacheItemsToDisk;
 
 class AssetTest extends TestCase
@@ -463,7 +466,35 @@ function extra_keys_get_added_to_array_when_file_exists()
     /** @test */
     function it_can_upload_a_file()
     {
-        $this->markTestIncomplete();
+        Event::fake();
+        $asset = (new Asset)->container($this->container)->path('path/to/asset.jpg');
+        Storage::disk('test')->assertMissing('path/to/asset.jpg');
+
+        $asset->upload(UploadedFile::fake()->create('asset.jpg'));
+
+        Storage::disk('test')->assertExists('path/to/asset.jpg');
+        $this->assertEquals('path/to/asset.jpg', $asset->path());
+        Event::assertDispatched(AssetUploaded::class, function ($event) use ($asset) {
+            return $event->asset = $asset;
+        });
+    }
+
+    /** @test */
+    function it_appends_timestamp_to_uploaded_files_filename_if_it_already_exists()
+    {
+        Event::fake();
+        Carbon::setTestNow(Carbon::createFromTimestamp(1549914700));
+        $asset = (new Asset)->container($this->container)->path('path/to/asset.jpg');
+        Storage::disk('test')->put('path/to/asset.jpg', '');
+        Storage::disk('test')->assertExists('path/to/asset.jpg');
+
+        $asset->upload(UploadedFile::fake()->create('asset.jpg'));
+
+        Storage::disk('test')->assertExists('path/to/asset-1549914700.jpg');
+        $this->assertEquals('path/to/asset-1549914700.jpg', $asset->path());
+        Event::assertDispatched(AssetUploaded::class, function ($event) use ($asset) {
+            return $event->asset = $asset;
+        });
     }
 
     /** @test */