- Fixed tests.

- Automatically saves model to DB.
leadthread · Aug 25, 2016 · 026fc9e · 026fc9e
1 parent 4d10736
commit 026fc9e
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,5 +2,9 @@
 
 All notable changes to `laravel-upload` will be documented in this file.
 
-### 1.0.0
-- Initial release and connected with packagist
+### 0.0.2
+- Fixed tests.
+- Automatically saves model to DB.
+
+### 0.0.1
+- Initial release and connected with packagist.
diff --git a/migrations/2016_01_01_000000_create_uploads_tables.php b/migrations/2016_01_01_000000_create_uploads_tables.php
@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateUploadsTables extends Migration {
+class CreateUploadsTables extends Migration
+{
 
     /**
      * Run the migrations.
@@ -12,7 +13,7 @@ class CreateUploadsTables extends Migration {
      */
     public function up()
     {
-        Schema::create(config('upload.table'), function(Blueprint $table) {
+        Schema::create(config('upload.table'), function (Blueprint $table) {
             $table->increments('id')->unsigned();
             $table->string('mime');
             $table->string('path');
@@ -33,5 +34,4 @@ public function down()
     {
         Schema::drop(config('upload.table'));
     }
-
-}
+}
diff --git a/src/Facades/Upload.php b/src/Facades/Upload.php
@@ -18,4 +18,4 @@ protected static function getFacadeAccessor()
     {
         return 'upload';
     }
-}
+}
diff --git a/src/Models/File.php b/src/Models/File.php
@@ -1,28 +1,28 @@
-<?php 
+<?php
 
 namespace Zenapply\Upload\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class File extends Model
 {
-	protected $table;
-	protected $guarded = ['id'];
+    protected $table;
+    protected $guarded = ['id'];
 
-	public function __construct(array $attributes = [])
+    public function __construct(array $attributes = [])
     {
-    	if(empty($this->table)){
-	        $this->table = config('upload.table');
-    	}
+        if (empty($this->table)) {
+            $this->table = config('upload.table');
+        }
         parent::__construct($attributes);
     }
 
-// [
-// 	'mime'
-// 	'path'
-// 	'disk'
-// 	'filename'
-// 	'extension'
-// 	'fingerprint'
-// ]
-}
+    // [
+    //  'mime'
+    //  'path'
+    //  'disk'
+    //  'filename'
+    //  'extension'
+    //  'fingerprint'
+    // ]
+}
diff --git a/src/Providers/Upload.php b/src/Providers/Upload.php
@@ -7,20 +7,25 @@
 
 class Upload extends ServiceProvider
 {
-    public function register() {
+    public function register()
+    {
         $this->mergeConfigFrom(__DIR__ . '/../../config/upload.php', 'upload');
 
-        $this->app->singleton('upload', function() {
-            return new UploadMaster;
-        });
+        $this->app->singleton(
+            'upload',
+            function () {
+                return new UploadMaster;
+            }
+        );
     }
 
     public function boot()
     {
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__ . '/../../config/upload.php' => base_path('config/upload.php'),
             __DIR__ . '/../../migrations/2016_01_01_000000_create_uploads_tables.php' => base_path('database/migrations/2016_01_01_000000_create_uploads_tables.php'),
-
-        ]);   
+            ]
+        );
     }
-}
+}
diff --git a/src/Upload.php b/src/Upload.php
@@ -7,69 +7,78 @@
 use Exception;
 use Zenapply\Upload\Models\File;
 
-class Upload {
-
-	protected $config = [];
-
-	public function __construct(){
-		$this->config = config('upload');
-
-	}
-
-	public function create(UploadedFile $file){
-		$disk        = $this->config['disk'];
-		$filename    = $this->getRandomString(32);
-		$extension   = $file->extension();
-		$directory   = $this->getRandomDirectory();
-		$contents    = file_get_contents($file);
-		$mime        = mime_content_type($file->path());
-		$fingerprint = md5_file($file->path());
-
-		$path = "/{$directory}/{$filename}.{$extension}";
-
-	    $result = $this->getDisk()->put($path, $contents);
-
-	    if($result === false){
-	    	throw new Exception("Could not save the file on the disk! Disk: ".$disk);
-	    }
-
-	    $model = new File([
-	    	"filename" => $filename,
-	    	"mime" => $mime,
-			"path" => $path,
-			"disk" => $disk,
-			"extension" => $extension,
-			"fingerprint" => $fingerprint,
-	    ]);
-
-	    return $model;
-	}
-
-	public function read($id){
-		// Code go here
-	}
-
-	public function destroy($id){
-		// Code go here
-	}
-
-	protected function getDisk(){
-		return Storage::disk($this->config['disk']);
-	}
-
-	protected function getRandomString($len = 16){
-		$alphanum = array_merge(range('a','z'),range('0','9'));
-		$str = "";
-		for($i = 0; $i < $len; $i++){
-			$str.=$alphanum[array_rand($alphanum)];
-		}
-		return $str;
-	}
-
-	protected function getRandomDirectory(){
-		$directory1 = $this->getRandomString(1);
-		$directory2 = $this->getRandomString(1);
-		return "{$directory1}/{$directory2}";
-	}
+class Upload
+{
+    protected $config = [];
+
+    public function __construct()
+    {
+        $this->config = config('upload');
+    }
+
+    public function create(UploadedFile $file)
+    {
+        $disk        = $this->config['disk'];
+        $filename    = $this->getRandomString(32);
+        $extension   = $file->extension();
+        $directory   = $this->getRandomDirectory();
+        $contents    = file_get_contents($file);
+        $mime        = mime_content_type($file->path());
+        $fingerprint = md5_file($file->path());
+
+        $path = "/{$directory}/{$filename}.{$extension}";
+
+        $result = $this->getDisk()->put($path, $contents);
+
+        if ($result === false) {
+            throw new Exception("Could not save the file on the disk! Disk: ".$disk);
+        }
+
+        $model = new File(
+            [
+            "filename" => $filename,
+            "mime" => $mime,
+            "path" => $path,
+            "disk" => $disk,
+            "extension" => $extension,
+            "fingerprint" => $fingerprint,
+            ]
+        );
+
+        $model->save();
+
+        return $model;
+    }
+
+    public function read($id)
+    {
+        // Code go here
+    }
+
+    public function destroy($id)
+    {
+        // Code go here
+    }
+
+    protected function getDisk()
+    {
+        return Storage::disk($this->config['disk']);
+    }
+
+    protected function getRandomString($len = 16)
+    {
+        $alphanum = array_merge(range('a', 'z'), range('0', '9'));
+        $str = "";
+        for ($i = 0; $i < $len; $i++) {
+            $str.=$alphanum[array_rand($alphanum)];
+        }
+        return $str;
+    }
+
+    protected function getRandomDirectory()
+    {
+        $directory1 = $this->getRandomString(1);
+        $directory2 = $this->getRandomString(1);
+        return "{$directory1}/{$directory2}";
+    }
 }
-
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -37,42 +37,53 @@ protected function getPackageAliases($app)
         ];
     }
 
-    protected function migrate(){
-        $this->artisan('migrate', [
+    protected function migrate()
+    {
+        $this->artisan(
+            'migrate', [
             '--database' => 'testbench',
-            '--realpath' => realpath(__DIR__.'/migrations'),
-        ]);
+            '--realpath' => realpath(__DIR__.'/../migrations'),
+            ]
+        );
     }
 
-    protected function migrateReset(){
+    protected function migrateReset()
+    {
         $this->artisan('migrate:reset');
     }
 
     /**
      * Define environment setup.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param  \Illuminate\Foundation\Application $app
      * @return void
      */
     protected function getEnvironmentSetUp($app)
     {
-        $app['config']->set('upload', [
+        $app['config']->set(
+            'upload', [
+            'table' => 'uploads',
             'disk'=>'test'
-        ]);
+            ]
+        );
 
         $app['config']->set('database.default', 'testbench');
-        $app['config']->set('database.connections.testbench', [
+        $app['config']->set(
+            'database.connections.testbench', [
             'driver'   => 'sqlite',
             'database' => ':memory:',
             'prefix'   => '',
-        ]);
+            ]
+        );
 
-        $app['config']->set('filesystems.disks', [
+        $app['config']->set(
+            'filesystems.disks', [
             'test' => [
                 'driver' => 'local',
                 'root'   => __DIR__.'/tmp',
             ],
-        ]);
+            ]
+        );
     }
 
     /**