From 12e2b89867a04d8965b4a68ddc9938ff56a2dedc Mon Sep 17 00:00:00 2001
From: Hans Kristian Flaatten <hans.kristian.flaatten@turistforeningen.no>
Date: Wed, 14 Oct 2015 19:59:56 +0200
Subject: [PATCH] feat(path): set absolute path for uploaded image

Set absolute path for uploaded image. This disables the random path.
The final path to a version image follows the following rule:

  prefix + path + suffix + ext

PR-URL: #47

Close: #36 #38

Related: #46

Signed-off-by: Hans Kristian Flaatten <hans.kristian.flaatten@turistforeningen.no>
---
 README.md         |  1 +
 src/index.coffee  |  5 +++++
 test/suite.coffee | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/README.md b/README.md
index 932becd..5b49dea 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,7 @@ var client = new Upload('my_s3_bucket', {
 
 * **object** `opts`
   * **string** `awsPath` - override the path on AWS set through `opts.aws.path`
+  * **string** `path` - set absolute path for uploaded image (disables random path)
 
 * **function** `cb` - callback function (**Error** `err`, **object[]** `versions`, **object** `meta`)
   * **Error** `err` - `null` if everything went fine
diff --git a/src/index.coffee b/src/index.coffee
index c220496..073e103 100644
--- a/src/index.coffee
+++ b/src/index.coffee
@@ -93,6 +93,11 @@ Image.prototype.getMetadata = (src, cb) ->
 ##
 Image.prototype.getDest = (cb) ->
   prefix = @opts?.awsPath or @upload.opts.aws.path
+
+  if @opts.path
+    return process.nextTick =>
+      cb null, prefix + @opts.path
+
   @upload._getDestPath prefix, cb
 
 ##
diff --git a/test/suite.coffee b/test/suite.coffee
index 6844cd5..20f2eff 100644
--- a/test/suite.coffee
+++ b/test/suite.coffee
@@ -324,6 +324,21 @@ describe 'Image', ->
         assert.equal path, 'custom/path/aa/bb/cc'
         done()
 
+    it 'returns fixed upload path', (done) ->
+      image.opts.path = 'my/image'
+      image.getDest (err, path) ->
+        assert.ifError err
+        assert.equal path, 'images_test/my/image'
+        done()
+
+    it 'returns fixed upload path with custom prefix', (done) ->
+      image.opts.awsPath = 'custom/path/'
+      image.opts.path = 'my/image'
+      image.getDest (err, path) ->
+        assert.ifError err
+        assert.equal path, 'custom/path/my/image'
+        done()
+
   describe '#resizeVersions()', ->
     it 'resizes image versions', (done) ->
       image.getMetadata image.src, (err, metadata) ->
@@ -459,6 +474,34 @@ describe 'Integration Tests', ->
         assert.equal typeof image.etag, 'string'
         assert.equal typeof image.path, 'string'
         assert.equal typeof image.key, 'string'
+        /^images_test(\/[\w]{2}){3}/.test image.key
+        assert.equal typeof image.url, 'string'
+
+        if image.original
+          assert.equal image.original, true
+        else
+          assert.equal typeof image.suffix, 'string'
+          assert.equal typeof image.height, 'number'
+          assert.equal typeof image.width, 'number'
+
+      done()
+
+  it 'uploads image to fixed path', (done) ->
+    @timeout 10000
+
+    file = __dirname + '/assets/portrait.jpg'
+    opts = path: 'path/to/image'
+
+    upload.upload file, opts, (err, images, meta) ->
+      assert.ifError err
+
+      for image in images
+        cleanup.push Key: image.key if image.key # clean up in AWS
+
+        assert.equal typeof image.etag, 'string'
+        assert.equal typeof image.path, 'string'
+        assert.equal typeof image.key, 'string'
+        /^images_test\/path\/to\/image/.test image.key
         assert.equal typeof image.url, 'string'
 
         if image.original