Merge branch 'develop' into wip/1.2

* develop:
  Apply fix from 1.0
  Add test case for trimStringAttributes flag
  Make string attribute value auto-trimming optional (#97)

# Conflicts:
#	src/Database/Attach/File.php

Author: LukeTowers

src/Database/Attach/File.php

@@ -128,10 +128,10 @@ public function fromPost($uploadedFile)
      * @param string $filePath The path to the file.
      * @return static
      */
-    public function fromFile($filePath)
+    public function fromFile($filePath, $filename = null)
     {
         $file = new FileObj($filePath);
-        $this->file_name = $file->getFilename();
+        $this->file_name = empty($filename) ? $file->getFilename() : $filename;
         $this->file_size = $file->getSize();
         $this->content_type = $file->getMimeType();
         $this->disk_name = $this->getDiskName();
@@ -150,10 +150,11 @@ public function fromFile($filePath)
      */
     public function fromData($data, $filename)
     {
-        $tempPath = temp_path($filename);
+        $tempName = str_replace('.', '', uniqid('', true)) . '.tmp';
+        $tempPath = temp_path($tempName);
         FileHelper::put($tempPath, $data);
 
-        $file = $this->fromFile($tempPath);
+        $file = $this->fromFile($tempPath, basename($filename));
         FileHelper::delete($tempPath);
 
         return $file;

src/Database/Model.php

@@ -52,6 +52,11 @@ class Model extends EloquentModel implements ModelInterface
      */
     public $duplicateCache = true;
 
+    /**
+     * @var bool Indicates if all string model attributes will be trimmed prior to saving.
+     */
+    public $trimStringAttributes = true;
+
     /**
      * @var array The array of models booted events.
      */
@@ -1243,7 +1248,7 @@ public function setAttribute($key, $value)
         /*
          * Trim strings
          */
-        if (is_string($value)) {
+        if ($this->trimStringAttributes && is_string($value)) {
             $value = trim($value);
         }
 

tests/Database/ModelTest.php

@@ -22,6 +22,28 @@ public function testAddCasts()
         $this->assertEquals(['id' => 'int', 'foo' => 'int'], $model->getCasts());
     }
 
+    public function testStringIsTrimmed()
+    {
+        $name = "Name";
+        $nameWithSpace = "  ${name}  ";
+        $model = new TestModelGuarded();
+
+        $model->name = $nameWithSpace;
+        $model->save();
+
+        // Make sure we load the database saved model
+        $model->refresh();
+        $this->assertEquals($name, $model->name);
+
+        $model->trimStringAttributes = false;
+        $model->name = $nameWithSpace;
+        $model->save();
+
+        // Refresh the model from the database
+        $model->refresh();
+        $this->assertEquals($nameWithSpace, $model->name);
+    }
+
     public function testIsGuarded()
     {
         $model = new TestModelGuarded();