s3_direct_upload 0.0.7 → 0.0.8

data/README.md

@@ -1,7 +1,7 @@
 # S3DirectUpload
 
 Easily generate a form that allows you to upload directly to Amazon S3.
-Multi file uploading supported by jquery-fileupload. 
+Multi file uploading supported by jquery-fileupload.
 
 Code extracted from Ryan Bates' [gallery-jquery-fileupload](https://github.com/railscasts/383-uploading-to-amazon-s3/tree/master/gallery-jquery-fileupload).
 
@@ -18,6 +18,7 @@ S3DirectUpload.config do |c|
   c.access_key_id = ""       # your access key id
   c.secret_access_key = ""   # your secret access key
   c.bucket = ""              # your bucket name
+  c.region = ""              # region prefix of your bucket url (optional), eg. "s3-eu-west-1"
 end
 ```
 
@@ -114,11 +115,12 @@ Use the javascript in `s3_direct_upload` as a guide.
 
 ## Options for S3Upload jQuery Plugin
 
-* `path:` manual path for the files on your s3 bucket. Example: `path/to/my/files/on/s3`  
+* `path:` manual path for the files on your s3 bucket. Example: `path/to/my/files/on/s3`
   Note: the file path in your s3 bucket will effectively be `path + key`.
-* `additional_data:` You can send additional data to your rails app in the persistence POST request. This would be accessable in your params hash as  `params[:key][:value]`  
-  Example: `{key: value}` 
+* `additional_data:` You can send additional data to your rails app in the persistence POST request. This would be accessable in your params hash as  `params[:key][:value]`
+  Example: `{key: value}`
 * `remove_completed_progress_bar:` By default, the progress bar will be removed once the file has been successfully uploaded. You can set this to `false` if you want to keep the progress bar.
+* `remove_failed_progress_bar:` By default, the progress bar will not be removed when uploads fail. You can set this to `true` if you want to remove the progress bar.
 * `before_add:` Callback function that executes before a file is added to the queue. It is passed file object and expects `true` or `false` to be returned. This could be useful if you would like to validate the filenames of files to be uploaded for example. If true is returned file will be uploaded as normal, false will cancel the upload.
 
 ### Example with all options.
@@ -138,7 +140,7 @@ You can change the settings on your form later on by accessing the jQuery instan
 jQuery ->
   v = $("#myS3Uploader").S3Uploader()
   ...
-  v.path("new/path/") 
+  v.path("new/path/")
   v.additional_data("newdata")
 ```
 
@@ -180,6 +182,15 @@ $(document).bind 's3_uploads_complete', ->
     alert("All Uploads completed")
 ```
 
+#### Rails AJAX Callbacks
+
+In addition, the regular rails ajax callbacks will trigger on the form with regards to the POST to the server.
+
+```coffeescript
+$('#myS3Uploader').bind "ajax:success", (e, data) ->
+  alert("server was notified of new file on S3; responded with '#{data}")
+```
+
 ## Cleaning old uploads on S3
 You may be processing the files upon upload and reuploading them to another
 bucket or directory. If so you can remove the originali files by running a
@@ -208,10 +219,10 @@ end
 ```
 
 ## Contributing / TODO
-This is just a simple gem that only really provides some javascript and a form helper. 
-This gem could go all sorts of ways based on what people want and how people contribute. 
+This is just a simple gem that only really provides some javascript and a form helper.
+This gem could go all sorts of ways based on what people want and how people contribute.
 Ideas:
-* More specs! 
+* More specs!
 * More options to control file types, ability to batch upload.
 * More convention over configuration on rails side
 * Create generators.
@@ -220,7 +231,7 @@ Ideas:
 
 
 ## Credit
-This gem is basically a small wrapper around code that [Ryan Bates](http://github.com/rbates) wrote for [Railscast#383](http://railscasts.com/episodes/383-uploading-to-amazon-s3). Most of the code in this gem was extracted from [gallery-jquery-fileupload](https://github.com/railscasts/383-uploading-to-amazon-s3/tree/master/gallery-jquery-fileupload). 
+This gem is basically a small wrapper around code that [Ryan Bates](http://github.com/rbates) wrote for [Railscast#383](http://railscasts.com/episodes/383-uploading-to-amazon-s3). Most of the code in this gem was extracted from [gallery-jquery-fileupload](https://github.com/railscasts/383-uploading-to-amazon-s3/tree/master/gallery-jquery-fileupload).
 
 Thank you Ryan Bates!
 

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

@@ -19,6 +19,7 @@ $.fn.S3Uploader = (options) ->
     additional_data: null
     before_add: null
     remove_completed_progress_bar: true
+    remove_failed_progress_bar: false
 
   $.extend settings, options
 
@@ -49,7 +50,17 @@ $.fn.S3Uploader = (options) ->
         to = $uploadForm.data('post')
         if to
           content[$uploadForm.data('as')] = content.url
-          $.post(to, content)
+
+          $.ajax
+            type: 'POST'
+            url: to
+            data: content
+            beforeSend: ( xhr, settings )       -> $uploadForm.trigger( 'ajax:beforeSend', [xhr, settings] )
+            complete:   ( xhr, status )         -> $uploadForm.trigger( 'ajax:complete', [xhr, status] )
+            success:    ( data, status, xhr )   -> $uploadForm.trigger( 'ajax:success', [data, status, xhr] )
+            error:      ( xhr, status, error )  -> $uploadForm.trigger( 'ajax:error', [xhr, status, error] )
+
+          # $.post(to, content)
 
         data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
         $uploadForm.trigger("s3_upload_complete", [content])
@@ -60,6 +71,8 @@ $.fn.S3Uploader = (options) ->
       fail: (e, data) ->
         content = build_content_object $uploadForm, data.files[0], data.result
         content.error_thrown = data.errorThrown
+
+        data.context.remove() if data.context && settings.remove_failed_progress_bar # remove progress bar
         $uploadForm.trigger("s3_upload_failed", [content])
 
       formData: (form) ->

data/lib/s3_direct_upload/config_aws.rb

@@ -4,7 +4,7 @@ module S3DirectUpload
   class Config
     include Singleton
 
-    ATTRIBUTES = [:access_key_id, :secret_access_key, :bucket, :prefix_to_clean]
+    ATTRIBUTES = [:access_key_id, :secret_access_key, :bucket, :prefix_to_clean, :region]
 
     attr_accessor *ATTRIBUTES
   end

data/lib/s3_direct_upload/form_helper.rb

@@ -15,6 +15,7 @@ module S3DirectUpload
           aws_access_key_id: S3DirectUpload.config.access_key_id,
           aws_secret_access_key: S3DirectUpload.config.secret_access_key,
           bucket: S3DirectUpload.config.bucket,
+          region: S3DirectUpload.config.region || "s3",
           acl: "public-read",
           expiration: 10.hours.from_now.utc.iso8601,
           max_file_size: 500.megabytes,
@@ -54,7 +55,7 @@ module S3DirectUpload
       end
 
       def url
-        "https://s3.amazonaws.com/#{@options[:bucket]}/"
+        "https://#{@options[:region]}.amazonaws.com/#{@options[:bucket]}/"
       end
 
       def policy

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,18 +105,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4000764443118203735
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4000764443118203735
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23