Merge pull request #103 from CulturalMe/devel

Version 0.7.1

Author: gsuess

.versions

@@ -0,0 +1,22 @@
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+edgee:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+local-test:edgee:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]

CHANGELOG.md

@@ -1,6 +1,12 @@
 Slingshot Changelog
 ===================
 
+## Version 0.7.1
+
+### Enhancements
+
+ * Added support for dynamic content-disposition for S3 and Google Cloud ([#64](https://github.com/CulturalMe/meteor-slingshot/issues/64))
+
 ## Version 0.7.0
 
 ### Enhancements

README.md

@@ -60,6 +60,9 @@ Slingshot.fileRestrictions("myFileUploads", {
   maxSize: 10 * 1024 * 1024 // 10 MB (use null for unlimited)
 });
 ```
+
+Important: The `fileRestrictions` must be declared before the the directive is instantiated.
+
 ### Server side
 
 On the server we declare a directive that controls upload access rules:
@@ -551,8 +554,10 @@ the second is the meta-information that can be passed by the client.
 
 `cacheControl` String (optional) - RFC 2616 Cache-Control directive
 
-`contentDisposition` String (optional) - RFC 2616 Content-Disposition directive.
-Default is the uploaded file's name (inline). Use null to disable.
+`contentDisposition` String or Function (optional) - RFC 2616
+Content-Disposition directive. Default is the uploaded file's name (inline). If
+it is a function then it takes the same context and arguments as the `key`
+function. Use null to disable.
 
 #### Rackspace Cloud (`Slingshot.RackspaceFiles`)
 

package.js

@@ -1,7 +1,7 @@
 Package.describe({
   name: "edgee:slingshot",
   summary: "Directly post files to cloud storage services, such as AWS-S3.",
-  version: "0.7.0",
+  version: "0.7.1",
   git: "https://github.com/CulturalMe/meteor-slingshot"
 });
 

services/aws-s3.js

@@ -39,7 +39,7 @@ Slingshot.S3Storage = {
     }),
 
     cacheControl: Match.Optional(String),
-    contentDisposition: Match.Optional(Match.OneOf(String, null))
+    contentDisposition: Match.Optional(Match.OneOf(String, Function, null))
   },
 
   directiveDefault: _.chain(Meteor.settings)
@@ -61,6 +61,22 @@ Slingshot.S3Storage = {
     })
     .value(),
 
+  getContentDisposition: function (method, directive, file, meta) {
+    var getContentDisposition = directive.contentDisposition;
+
+    if (!_.isFunction(getContentDisposition)) {
+      getContentDisposition = function () {
+        var filename = file.name && encodeURIComponent(file.name);
+
+        return directive.contentDisposition || filename &&
+          "inline; filename=\"" + filename + "\"; filename*=utf-8''" +
+          filename;
+      };
+    }
+
+    return getContentDisposition.call(method, file, meta);
+  },
+
   /**
    *
    * @param {{userId: String}} method
@@ -86,9 +102,8 @@ Slingshot.S3Storage = {
           "acl": directive.acl,
 
           "Cache-Control": directive.cacheControl,
-          "Content-Disposition": directive.contentDisposition || file.name &&
-            "inline; filename=" + quoteString(file.name, '"') +
-            "; filename*=utf-8''" + encodeURIComponent(file.name)
+          "Content-Disposition": this.getContentDisposition(method, directive,
+            file, meta)
         },
 
         bucketUrl = _.isFunction(directive.bucketUrl) ?
@@ -200,9 +215,6 @@ Slingshot.S3Storage.TempCredentials = _.defaults({
   }
 }, Slingshot.S3Storage);
 
-function quoteString(string, quotes) {
-  return quotes + string.replace(quotes, '\\' + quotes) + quotes;
-}
 
 function formatNumber(num, digits) {
   var string = String(num);