added urlgenerator tests

phpunit.xml

@@ -13,7 +13,6 @@
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix=".php">./tests/integration/</directory>
-            <directory suffix=".php">./tests/unit/</directory>
         </testsuite>
     </testsuites>
     <filter>

src/Exceptions/MediaUrlException.php

@@ -23,9 +23,4 @@ public static function mediaNotPubliclyAccessible($path, $public_path)
     {
         return new static("Media file `{$path}` is not part of the public path `{$public_path}`");
     }
-
-    public static function cannotGetAbsolutePath($disk)
-    {
-        return new static("Cannot get absolute path. Disk `{$disk}` is not on the local filesystem");
-    }
 }

src/UrlGenerators/LocalUrlGenerator.php

@@ -56,6 +56,7 @@ public function getPublicPath()
 
     /**
      * {@inheritDoc}
+     * @throws MediaUrlException If media's disk is not publicly accessible
      */
     public function getUrl()
     {
@@ -67,7 +68,7 @@ public function getUrl()
      */
     public function getAbsolutePath()
     {
-        return $this->diskRoot() . DIRECTORY_SEPARATOR . $this->media->getDiskPath();
+        return $this->getDiskConfig('root') . DIRECTORY_SEPARATOR . $this->media->getDiskPath();
     }
 
 
@@ -83,13 +84,4 @@ protected function cleanDirectorySeparators($path)
         }
         return $path;
     }
-
-    /**
-     * Get the absolute path to the root of the storage disk
-     * @return string
-     */
-    private function diskRoot()
-    {
-        return $this->getDiskConfig('root');
-    }
 }

src/UrlGenerators/S3UrlGenerator.php

@@ -30,7 +30,7 @@ public function __construct(Config $config, FilesystemManager $filesystem)
      */
     public function getAbsolutePath()
     {
-        throw MediaUrlException::cannotGetAbsolutePath($this->media->disk);
+        return $this->getUrl();
     }
 
     /**

src/UrlGenerators/UrlGenerator.php

@@ -19,6 +19,9 @@ public function setMedia(Media $media);
 
     /**
      * Retrieve the absolute path to the file
+     *
+     * For local files this should return a path
+     * For remote files this should return a url
      * @return string
      */
     public function getAbsolutePath();

tests/integration/MediableTest.php

@@ -32,7 +32,6 @@ public function test_it_can_attach_and_retrieve_media_by_a_tag()
         $this->assertEquals([2], $result->pluck('id')->toArray());
     }
 
-
     public function test_it_can_attach_one_media_to_multiple_tags()
     {
         $mediable = factory(SampleMediable::class)->create();

tests/integration/UrlGenerators/LocalUrlGeneratorTest.php

@@ -0,0 +1,40 @@
+<?php
+
+use Frasmage\Mediable\Exceptions\MediaUrlException;
+use Frasmage\Mediable\UrlGenerators\LocalUrlGenerator;
+use Frasmage\Mediable\Media;
+use Illuminate\Contracts\Config\Repository as Config;
+use Illuminate\Routing\UrlGenerator as Url;
+
+class LocalUrlGeneratorTest extends TestCase
+{
+    public function test_it_generates_absolute_path(){
+        $generator = $this->setupGenerator();
+        $this->assertEquals(public_path('uploads/foo/bar.jpg'), $generator->getAbsolutePath());
+    }
+
+    public function test_it_generates_url(){
+        $generator = $this->setupGenerator();
+        $this->assertEquals('http://localhost/uploads/foo/bar.jpg', $generator->getUrl());
+    }
+
+    public function test_it_throws_exception_for_non_public_disk(){
+        $generator = $this->setupGenerator('tmp');
+        $this->expectException(MediaUrlException::class);
+        $generator->getPublicPath();
+    }
+
+    protected function setupGenerator($disk = 'uploads'){
+        $media = factory(Media::class)->make([
+            'disk' => $disk,
+            'directory' => 'foo',
+            'filename' => 'bar',
+            'extension' => 'jpg'
+        ]);
+        $this->seedFileForMedia($media);
+        $generator = new LocalUrlGenerator(config(), url());
+        $generator->setMedia($media);
+        return $generator;
+    }
+
+}

tests/integration/UrlGenerators/S3UrlGeneratorTest.php

@@ -0,0 +1,33 @@
+<?php
+
+use Frasmage\Mediable\Exceptions\MediaUrlException;
+use Frasmage\Mediable\UrlGenerators\S3UrlGenerator;
+use Frasmage\Mediable\Media;
+use Illuminate\Contracts\Config\Repository as Config;
+use Illuminate\Routing\UrlGenerator as Url;
+
+class S3UrlGeneratorTest extends TestCase
+{
+    public function test_it_generates_absolute_path(){
+        $generator = $this->setupGenerator();
+        $this->assertEquals('https://s3.amazonaws.com/' . env('S3_BUCKET') . '/foo/bar.jpg', $generator->getAbsolutePath());
+    }
+
+    public function test_it_generates_url(){
+        $generator = $this->setupGenerator();
+        $this->assertEquals('https://s3.amazonaws.com/' . env('S3_BUCKET') . '/foo/bar.jpg', $generator->getUrl());
+    }
+
+    protected function setupGenerator(){
+        $media = factory(Media::class)->make([
+            'disk' => 's3',
+            'directory' => 'foo',
+            'filename' => 'bar',
+            'extension' => 'jpg'
+        ]);
+        $generator = new S3UrlGenerator(config(), app(Illuminate\Filesystem\FilesystemManager::class));
+        $generator->setMedia($media);
+        return $generator;
+    }
+
+}

tests/integration/UrlGenerators/UrlGeneratorTest.php → tests/integration/UrlGenerators/UrlGeneratorFactoryTest.php

@@ -5,7 +5,7 @@
 use Frasmage\Mediable\UrlGenerators\UrlGenerator;
 use Frasmage\Mediable\Media;
 
-class UrlGeneratorTest extends TestCase
+class UrlGeneratorFactoryTest extends TestCase
 {
 
     public function test_it_sets_generator_for_driver()