set files content type

ncri · ncri · commit 779752334698 · 2012-10-06T14:10:37.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ spec/gallery-jquery-fileupload
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc
diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee
@@ -27,4 +27,16 @@ jQuery ->
     fail: (e, data) ->
       alert("#{data.files[0].name} failed to upload.")
       console.log("Upload failed:")
-      console.log(data)
+      console.log(data)
+
+    formData: (form) ->
+      data = form.serializeArray()
+      fileType = ""
+      if "type" of @files[0]
+        fileType = @files[0].type
+      data.push
+        name: "Content-Type"
+        value: fileType
+
+      data
+
diff --git a/lib/s3_direct_upload/form_helper.rb b/lib/s3_direct_upload/form_helper.rb
@@ -65,6 +65,7 @@ def policy_data
             ["starts-with", "$utf8", ""],
             ["starts-with", "$key", ""],
             ["content-length-range", 0, @options[:max_file_size]],
+            ["starts-with","$Content-Type",""],
             {bucket: @options[:bucket]},
             {acl: @options[:acl]}
           ]

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ def policy_data`
`65`	`65`	`["starts-with", "$utf8", ""],`
`66`	`66`	`["starts-with", "$key", ""],`
`67`	`67`	`["content-length-range", 0, @options[:max_file_size]],`
	`68`	`+ ["starts-with","$Content-Type",""],`
`68`	`69`	`{bucket: @options[:bucket]},`
`69`	`70`	`{acl: @options[:acl]}`
`70`	`71`	`]`