anaconda 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcafa5a609c883cdcf985429b9aab24b03cae591
-  data.tar.gz: cbd055fbc2b06b2f600124b9eb18a8e52c8ab959
+  metadata.gz: 0912b73bf2811535a108eb6315c0308ac787edd3
+  data.tar.gz: 784348799ded4aa0c2acfbadef522a07f0c162d5
 SHA512:
-  metadata.gz: 0a385e5a061bd3984b987889eee017280694cc3b53c038384d6ec65986cbaecd1c11970fbe7fd50d96866246b9a19ca624f9f57df3b900a9ef8376a176dc8ab9
-  data.tar.gz: a2dd2c03211f869cb9ce1827ef95bf4245223f90314b4b259838a77dbfa5dabaaf358fb4f1ef7a88899186d2b95a59e3888da0cd7c9488aa2838856718c62ca3
+  metadata.gz: c2cc3a99a5dfa431fec05e20c1750640df6643e86767545e8a4f9a6b38630b763d09726fdcc8c2b3b7c2c12375cc8a6495dd852406e8241ba493c5e621cefdf8
+  data.tar.gz: ade3196bcab7786bc36f104149c2aea8a65e8a707ae960e8f9c7a4b0083c4dbe37be023860d17c0e49ed716bf6082aebd15a5d88865761262c230e254b99b285

data/README.markdown

@@ -179,6 +179,9 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     `asset_download_url` will return a signed S3 URL with content-disposition set to attachment so the file will be downloaded instead of opened in the browser.
 
 ## Changelog
+* 0.13.0
+  * Set Content-Type for S3 file to match that of the uploaded source file.
+  
 * 0.12.2
   * Fix bug introduced in 0.12.1
   * Wrap hidden fields in the anaconda_dropzone div (to fix bug)

data/app/assets/javascripts/anaconda_uploader.js.coffee

@@ -152,7 +152,6 @@ class @AnacondaUploadField
     $( @element_id ).fileupload
       dropZone: $( @element_id ).parent(".anaconda_dropzone"),
       add: (e, data) ->
-        DLog data
         self.file_selected data
       progress: (e, data) ->
         DLog data
@@ -216,10 +215,13 @@ class @AnacondaUploadField
       false
 
   file_selected: (data) ->
+    DLog "file_selected"
     DLog data
     if @is_allowed_type(data.files[0])
       @file = data.files[0]
       @file_data = data
+      @set_content_type()
+      
       DLog @file
       @upload_details_container.html "<div id='upload_file_#{@get_id()}' class='upload-file #{@get_media_type(@file)}'><span class='file-name'>#{@file.name}</span><span class='size'>#{@readable_size()}</span><span class='progress-percent'></span><div class='progress'><span class='progress-bar'></span></div></div>"
 
@@ -230,6 +232,15 @@ class @AnacondaUploadField
         DLog "Not auto upload"
     else
       alert "#{data.files[0].name} is a #{@get_media_type(data.files[0])} file. Only #{@allowed_types.join(", ")} files are allowed."
+      
+  set_content_type: ->
+    form_data = $(@element_id).data('form-data')
+    form_data["Content-Type"] = @file.type
+    
+    $( @element_id ).fileupload(
+      formData: form_data
+    )
+    
   get_id: ->
     hex_md5( "#{@file.name} #{@file.size}" )
   

data/lib/anaconda/form_builder_helpers.rb

@@ -93,6 +93,7 @@ module Anaconda
         {
           :key => key,
           :acl => @options[:acl],
+          "Content-Type" => "application/octet-stream",
           :policy => policy,
           :signature => signature,
           "AWSAccessKeyId" => @options[:aws_access_key_id],
@@ -121,6 +122,7 @@ module Anaconda
           conditions: [
             #["starts-with", "$utf8", ""],
             ["starts-with", "$key", base_key],
+            ["starts-with", "$Content-Type", ""],
             ["content-length-range", 1, @options[:max_file_size]],
             {bucket: @options[:bucket]},
             {acl: @options[:acl]}

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.12.2"
+    VERSION = "0.13.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Ben McFadden