Fixing the S3 Path Builder.

There was a missing / after the bucket and the file name was missing as well.

src/Storage/PathBuilder/BasePathBuilder.php

@@ -351,7 +351,8 @@ protected function _randomPathSha1($string, $level) {
 	 */
 	public function ensureSlash($string, $position, $ds = null) {
 		if (!in_array($position, ['before', 'after', 'both'])) {
-			throw new \InvalidArgumentException(sprintf('Invalid position `%s`!', $position));
+			$method = get_class($this) . '::ensureSlash(): ';
+			throw new \InvalidArgumentException(sprintf($method . 'Invalid position `%s`!', $position));
 		}
 		if (is_null($ds)) {
 			$ds = DS;

src/Storage/PathBuilder/S3PathBuilder.php

@@ -9,20 +9,40 @@
 use Burzum\FileStorage\Storage\StorageManager;
 use Cake\Datasource\EntityInterface;
 
+/**
+ * The S3 Path Builder.
+ */
 class S3PathBuilder extends BasePathBuilder {
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function __construct(array $config = []) {
 		$this->_defaultConfig['https'] = false;
 		$this->_defaultConfig['modelFolder'] = true;
 		$this->_defaultConfig['s3Url'] = 's3.amazonaws.com';
 		parent::__construct($config);
 	}
 
+	/**
+	 * Gets the bucket from the adapter configuration.
+	 *
+	 * @param string Storage adapter config name.
+	 * @return string
+	 */
 	protected function _getBucket($adapter) {
 		$config = StorageManager::config($adapter);
 		return $config['adapterOptions'][1];
 	}
 
+	/**
+	 * Builds the cloud base URL for the given bucket and location.
+	 *
+	 * @param string $bucket
+	 * @param string $bucketPrefix
+	 * @param string $cfDist
+	 * @return string
+	 */
 	protected function _buildCloudUrl($bucket, $bucketPrefix = null, $cfDist = null) {
 		$path = $this->config('https') === true ? 'https://' : 'http://';
 		if ($cfDist) {
@@ -49,9 +69,9 @@ protected function _buildCloudUrl($bucket, $bucketPrefix = null, $cfDist = null)
 	 */
 	public function url(EntityInterface $entity, array $options = []) {
 		$bucket = $this->_getBucket($entity->adapter);
-		$pathPrefix = $this->_buildCloudUrl($bucket);
+		$pathPrefix = $this->ensureSlash($this->_buildCloudUrl($bucket), 'after');
 		$path = parent::path($entity);
 		$path = str_replace('\\', '/', $path);
-		return $pathPrefix . $path;
+		return $pathPrefix . $path . $this->filename($entity, $options);
 	}
 }