Merge pull request #3 from parse-server-modules/1.0.1

1.0.1

Author: flovilmart

.travis.yml

@@ -1,12 +1,18 @@
-branches:
-  only:
-  - master
 language: node_js
 node_js:
 - '4.3'
-after_success: ./node_modules/.bin/codecov
+after_success: "./node_modules/.bin/codecov"
 env:
   global:
   - secure: ZX5mghIvXfscTk20MYNzMZ9s2KgOxQR0rHZgzZuTC9R0lz+YkgBM2xfhclvCEeMiG/XMPKMFxMJ0YU+f9LmFGCciZD/DyJ1PH/vuspXen2JvGtQkUO8tdMQKy9ht/u0/Yo0huRef6eqth0tHhd2zZtwuOuep5XZ0RMw4OY4J0tyySfjqMM9+H/jFGNE/Gt069UFdmaGC6xiHt/zum/gGzEdQBoW/s7vJN3+k4yMsXwiS0fwaqL+XtmkL6ykZJFidnLWt85tgTvqogPvx1D7TawTurZIGjJtbfJGYmQEGbxy/PQB9732soip30u3aRqjBTTUf6b1ow3blcsXiOj+p5Yya8unH1DRVIYpNlzgs9qqOlPVTYNqu+m/n/3uASd0CdEchmfR+GNd6id8Zxu7EzlP/SCW7nr0tSxod2cA526+EuYEF3aG3j93mHtF0gXdGDXeKf7OMLWOFEwuyrzbnKNLcMK9vtzSGYnmNKcQWDtPUPfSmlIL/Pacd210bHctc4HHoYSQYYDYaZsVS8JmtsLYkU/9LgqFJO+lAHP1p1rTpTIoaG0FTLh9TyFT11pKZ5kfZLj/n2q6Vsowq2VVZGMjm3EOg6HUvqFFfv4bd658TvbtgwXNqieiHjv0d66XGnkzPgpxxS9oORmlssppevJ99QYnNPbCVXcN4cjDsi9k=
   - secure: ROBoDdSfzlNGSAHxdVLirh0yIQnf0DH37ZxmIWnKQDAHAp0qb6UVDLjY/GAoGq5MYFEguXzz7QLFEm3N/mCFUoMSvQV3zSIdANNU6GdVFtOawSYdXxdIGSIwIH7VgyHtY7n0Qbz3zNsgzpHnGyMQ4+9l7gELm3FTKUKclUkaPX4T8bHfavbNPIDPcc8ttnZanRCD0dZ5hFt+SbHDUYbisBxq/v6aDxPwbzc6y3bw7q+CQNj08nzvwIgy/v9cNjAnt1jeKRiGsSywCV1iPXOlH/LMTVZpg/zNwUAwKp0WCtDgKzEJRQKDyrf2jcezZJAX6knbggY2BG8fWM1+alBZJGo6OjCh+qkoHLC2L6+aMUC4MpZtEtinUPWW1DTPaMpZhp+fIr//7lU1MRIvYUvWr+fLSWAt6qnouTA+CH18+A7vo/ardO2+0Hg0X3bdKkqX5u6wkDJg72znJbLhEyspBdGg82GUJ8vpfw2b8/I7+6a+/hSOvpnluWFmxwKBURNhLnvUTGqWwoqlC06UerjBI6OUqcQtEO9mVCzxcp8rDkAE1dDRjoJ5wEtBOsF9jZyzsRCIw0Qb7DWxGpcVinlCiEC8jJ4AKN5jLU7wm1P1wW63JCH6Mf8GRl0knVrVqSLXHFP+NlX0ura95ZNESFRD8HbU9LQ9hAkvL4xvcUPEUGo=
   - secure: LBnRZKXVmww5+Xex8vmKMpuU2d3Ow1GL5hnxhFRINULJJ3tHDBOWhkNa7mP+XO9diKfHdrs7LlZVcr/6zwX8D6o+DjZM5iAB7cmpE8ZpdG/qlMK72VENvR3IdNS61QIK4FkZKkpMgan/6ml0rxqELpoaqPcXaJLvTEXGNZKRcxcmf5GUYYh7jzwya7BaEOzxP27460XBIY7BtMpOJ9cxPU54JU2W3g2gtnOIj4gsiBxL+ZHwSqFej0rY+BCmtINzhY2OMRmpnQhJIoGEXTENxXXrux/vMAkte/fc7a40mQO6eLASrWtiGf+D46WEarWtNWwISavYwJpHTRnaW5lS/1eq9miJm5iN8+zwvqrYp+7iCMliMfI51Xq2Bf1vZi9TMnA6EyOY7U3lgkf5RDZdLiwt+L3PZPV6oEssgJJ1sgaDc3PawE/hcj+KAo8c+JsbUtFGV2d4HSNdovsVr5mry5dwigCFRR/zETHE8zWSSdeijgoBNaLIjYkZYjJgq4/YGMz10sHI0anq0YcLAZtBe5hHbtAEj0yN/O0mx1jlQsnRsH4S4B+espXBVllam0c6Rpqwh17R2xl9mHeiSaKdjROesPpZGl/cTqU0kFpureFAqvW/wCJeOGgIjiratWf2J1rf0oHq6yQYpGU40VKFr+ghFDgp4blTmS8o60qZybk=
+deploy:
+  provider: npm
+  email:
+    secure: qBSowokQKKmR6DiF2+aLDopRQcnwC13fmme65vcYVeZzzyJ+Y+JHz0V0VGx94OJqlPLQgZWCAqxBHs8WtOW/fiu6tZfjBrsDV/xrQ/7PIM57yHsClRrUHSoyE3UOz96ju4pkaat1kCB9CGnzpTmJwLaZsqQBK9L7ywBVvoIQvn2ul/gnYbIG1S5jcumxbjDQJ6enoU5ltQug3zF/lScRbQlXOpSGoXtuFlUr3wJDodo1fjIIvHlpSc2vdL/c+jffa4RWC/JQ171cJBimWkiyj4h6quR5u/btTltHTmFf3AC6NgGt9cGubP1GLDqz6W5JGDZNsbXXZeoao55PRhwIt2iGJy0RIBLi6fjVKQsYIOa5VKzRqFeniWa48Y8U2G3sB3rh5NzeNqEPohUGAIjHhLOK9awJPEOHVqu4YqEmQ1tJ+r8LSj5KFO6cP9Df9mx/E/b11qJ3Q9j+caiH2L2t4Nowe5PehediqmOFrhlt/f2vAR8Met1ETiAM3hrUA3fYX4z6MtRpHI6H2SNqE6aEIg3cozvlZpqGbYyTFbL3fy7ztEJRmdxWx+Py+BWng5L8kMQvFNk9Xy45DeBB8qirHm0OV8rMQzJzjcFAAJK22Ozy6ETuL10oExbknpCNKSryc4+p1+rRfcDAUfYSRO/Qy1Ya2642njPf4v1iXBmHJUU=
+  api_key:
+    secure: RVJMEkNvhmJmjEeVtR0UuV+VxyCJd/AF4kFphsqKHYzda9TdlhjF26LOaBvvzy0aYaj9gPQwAZE1odJOzBhz274SZggE5VOllkDkWDagtFOY4PhT1Qwb9myeKDxBKCGMvgmRaz5n2fskFqx9xVJXWOtH91uxhwznrTlqeTVQo1LmT8UTJBg7Zx+yodEzAiJqYglh/rGBu1wpJ5aTunuk0KjaP6HIJvz4RawTK+ytL1+Agw9zIUawjN2RmPh4m+i4M/3HtLTiXADfn7HLHKXvM5WLscpIYcoDQIO6zSQkgahhs4H4rObxZcuBQFoqdBXFZWNHOxZEBcDIUq++hh8rFaF5PA+KYnqqmmK6I4DxUBi5/cnnB7AaoRYyXcABpoMmhW6zbqIa/iNgTL/rDjHNr4hp523Qj7CDLoxusoZ9Q5Tqu86hHtSgnXilpYpHLw7P/wkv0A+Exeb6rwFLI9q7IC8JmYt02sEoRNSdn6Yvs8cTTqfY3fA9eGsoQNJxy8r5Er0tFFT16b8SMKRY6j+4/LwriU7BNzIXGPj5G2LkUhWcmvj9o9q2vJGQyJjEfuB3tFPZB7NNQL5OrnohKZkOz0wpaVwqAIVAbhWLnlZtz4nQyzVBy3vBob8x1viBip2+jtaPigyod4yloVICOwW6JlrVTpI6mIrKu8FPqnGr8xQ=
+  on:
+    tags: true
+    repo: parse-server-modules/parse-server-s3-adapter

README.md

@@ -24,7 +24,7 @@ parse-server adapter for AWS S3
       "secretKey": "secretKey",
       "bucket": "my_bucket",
       // optional:
-      "region": 'US_EAST_2', // default value
+      "region": 'us-east-1', // default value
       "bucketPrefix": '', // default value
       "directAccess": false // default value
     } 
@@ -62,7 +62,7 @@ var S3Adapter = require('parse-server-s3-adapter');
 var s3Adapter = new S3Adapter('accessKey', 
 								'secretKey', 
 								'bucket' , {
-								    region: 'US_EAST_2'
+								    region: 'us-east-1'
 									bucketPrefix: '',
 									directAccess: false
 								});

index.js

@@ -38,7 +38,7 @@ function optionsFromArguments(args) {
   options = requiredOrFromEnvironment(options, 'secretKey', 'S3_SECRET_KEY');
   options = requiredOrFromEnvironment(options, 'bucket', 'S3_BUCKET');
   options = fromEnvironmentOrDefault(options, 'bucketPrefix', 'S3_BUCKET_PREFIX', '');
-  options = fromEnvironmentOrDefault(options, 'region', 'S3_REGION', false);
+  options = fromEnvironmentOrDefault(options, 'region', 'S3_REGION', DEFAULT_S3_REGION);
   options = fromEnvironmentOrDefault(options, 'directAccess', 'S3_DIRECT_ACCESS', false);
   return options;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server-s3-adapter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "AWS S3 adapter for parse-server",
   "main": "index.js",
   "scripts": {

spec/test.spec.js

@@ -34,6 +34,16 @@ describe('S3Adapter tests', () => {
     expect(() => {
       var s3 = new S3Adapter({ accessKey: 'accessKey' , secretKey: 'secretKey', bucket: 'bucket'});
     }).not.toThrow()
+
+    var s3 = new S3Adapter('accessKey', 'secretKey', 'myBucket', {directAccess: true});
+    expect(s3._directAccess).toBe(true);
+    expect(s3._region).toBe('us-east-1');
+    expect(s3.getFileLocation({}, 'file.txt')).toEqual('https://myBucket.s3.amazonaws.com/file.txt')
+
+    s3 = new S3Adapter({'accessKey':'accessKey', 'secretKey': 'secretKey', 'bucket': 'myBucket', directAccess: false, 'region': 'us-east-2'});
+    expect(s3._directAccess).toBe(false);
+    expect(s3._region).toBe('us-east-2');
+    expect(s3.getFileLocation({mount: 'http://my.server.com/parse', applicationId: 'xxxx'}, 'file.txt')).toEqual('http://my.server.com/parse/files/xxxx/file.txt')
   })
 
   if (process.env.TEST_S3_ACCESS_KEY && process.env.TEST_S3_SECRET_KEY && process.env.TEST_S3_BUCKET) {