Merge pull request #149 from bpedro/feature/attach-with-mime-type

Discover and include mime type when attaching files.

src/Httpful/Request.php

@@ -392,11 +392,13 @@ public function expectsType($mime)
 
     public function attach($files)
     {
+        $finfo = finfo_open(FILEINFO_MIME_TYPE);
         foreach ($files as $key => $file) {
+            $mimeType = finfo_file($finfo, $file);
             if (function_exists('curl_file_create')) {
-                $this->payload[$key] = curl_file_create($file);
+                $this->payload[$key] = curl_file_create($file, $mimeType);
             } else {
-                $this->payload[$key] = "@{$file}";
+                $this->payload[$key] = '@' . $file . ';type=' . $mimeType;
             }
         }
         $this->sendsType(Mime::UPLOAD);

tests/Httpful/HttpfulTest.php

@@ -322,13 +322,14 @@ function testParsingContentTypeUpload()
 
     function testAttach() {
         $req = Request::init();
-
-        $req->attach(array('index' => '/dir/filename'));
+        $testsPath = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..');
+        $filename = $testsPath . DIRECTORY_SEPARATOR . 'test_image.jpg';
+        $req->attach(array('index' => $filename));
         $payload = $req->payload['index'];
         // PHP 5.5  + will take advantage of CURLFile while previous
         // versions just use the string syntax
         if (is_string($payload)) {
-            $this->assertEquals($payload, '@/dir/filename');
+            $this->assertEquals($payload, '@' . $filename . ';type=image/jpeg');
         } else {
             $this->assertInstanceOf('CURLFile', $payload);
         }