Add Service Provider

Add ability to receive file attachments

Author: mpociot

composer.json

@@ -19,6 +19,8 @@
         "botman/botman": "~2.0"
     },
     "require-dev": {
+        "botman/studio-addons": "~1.0",
+        "illuminate/contracts": "~5.5.0",
         "phpunit/phpunit": "~5.0",
         "mockery/mockery": "dev-master",
         "botman/driver-facebook": "dev-master",
@@ -37,5 +39,12 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "cs": "php-cs-fixer fix"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "BotMan\\Drivers\\Web\\Providers\\WebServiceProvider"
+            ]
+        }
     }
 }

src/Providers/WebServiceProvider.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace BotMan\Drivers\Web\Providers;
+
+use BotMan\Drivers\Web\WebDriver;
+use Illuminate\Support\ServiceProvider;
+use BotMan\BotMan\Drivers\DriverManager;
+use BotMan\Studio\Providers\StudioServiceProvider;
+
+class WebServiceProvider extends ServiceProvider
+{
+    /**
+     * Perform post-registration booting of services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        if (! $this->isRunningInBotManStudio()) {
+            $this->loadDrivers();
+
+            $this->publishes([
+                __DIR__.'/../../stubs/web.php' => config_path('botman/web.php'),
+            ]);
+
+            $this->mergeConfigFrom(__DIR__.'/../../stubs/web.php', 'botman.web');
+        }
+    }
+
+    /**
+     * Load BotMan drivers.
+     */
+    protected function loadDrivers()
+    {
+        DriverManager::loadDriver(WebDriver::class);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isRunningInBotManStudio()
+    {
+        return class_exists(StudioServiceProvider::class);
+    }
+}

src/WebDriver.php

@@ -2,6 +2,7 @@
 
 namespace BotMan\Drivers\Web;
 
+use BotMan\BotMan\Messages\Attachments\File;
 use BotMan\BotMan\Users\User;
 use Illuminate\Support\Collection;
 use BotMan\BotMan\Drivers\HttpDriver;
@@ -24,6 +25,7 @@ class WebDriver extends HttpDriver
     const ATTACHMENT_IMAGE = 'image';
     const ATTACHMENT_AUDIO = 'audio';
     const ATTACHMENT_VIDEO = 'video';
+    const ATTACHMENT_FILE = 'file';
     const ATTACHMENT_LOCATION = 'location';
 
     /** @var OutgoingMessage[] */
@@ -234,7 +236,7 @@ protected function addAttachments($incomingMessage)
             $incomingMessage->setText(Image::PATTERN);
             $incomingMessage->setImages($images);
         } elseif ($attachment === self::ATTACHMENT_AUDIO) {
-            $images = $this->files->map(function ($file) {
+            $audio = $this->files->map(function ($file) {
                 if ($file instanceof UploadedFile) {
                     $path = $file->getRealPath();
                 } else {
@@ -244,9 +246,9 @@ protected function addAttachments($incomingMessage)
                 return new Audio($this->getDataURI($path));
             })->values()->toArray();
             $incomingMessage->setText(Audio::PATTERN);
-            $incomingMessage->setAudio($images);
+            $incomingMessage->setAudio($audio);
         } elseif ($attachment === self::ATTACHMENT_VIDEO) {
-            $images = $this->files->map(function ($file) {
+            $videos = $this->files->map(function ($file) {
                 if ($file instanceof UploadedFile) {
                     $path = $file->getRealPath();
                 } else {
@@ -256,7 +258,19 @@ protected function addAttachments($incomingMessage)
                 return new Video($this->getDataURI($path));
             })->values()->toArray();
             $incomingMessage->setText(Video::PATTERN);
-            $incomingMessage->setVideos($images);
+            $incomingMessage->setVideos($videos);
+        } elseif ($attachment === self::ATTACHMENT_FILE) {
+            $files = $this->files->map(function ($file) {
+                if ($file instanceof UploadedFile) {
+                    $path = $file->getRealPath();
+                } else {
+                    $path = $file['tmp_name'];
+                }
+
+                return new File($this->getDataURI($path));
+            })->values()->toArray();
+            $incomingMessage->setText(File::PATTERN);
+            $incomingMessage->setFiles($files);
         }
 
         return $incomingMessage;

tests/WebDriverTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use BotMan\BotMan\Messages\Attachments\File;
 use Mockery as m;
 use BotMan\BotMan\Http\Curl;
 use PHPUnit_Framework_TestCase;
@@ -182,6 +183,29 @@ public function it_returns_audio()
         $this->assertSame(Audio::PATTERN, $message->getText());
     }
 
+    /** @test */
+    public function it_returns_files()
+    {
+        $driver = $this->getDriverWithFiles([
+            'driver' => 'web',
+            'userId' => '12345',
+            'attachment' => WebDriver::ATTACHMENT_FILE,
+        ], [
+            'file1' => [
+                'name' => 'MyFile.png',
+                'type' => 'image/png',
+                'tmp_name' => __DIR__.'/fixtures/example.md',
+                'size' => 1234,
+            ],
+        ]);
+        /** @var IncomingMessage $message */
+        $message = $driver->getMessages()[0];
+        $files = $message->getFiles();
+        $this->assertCount(1, $files);
+        $this->assertInstanceOf(File::class, $files[0]);
+        $this->assertSame(File::PATTERN, $message->getText());
+    }
+
     /** @test */
     public function it_returns_the_message_object_by_reference()
     {