s3_direct_upload 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d19e2b36016e3829e3f284c860489d83aaacee7e
+  data.tar.gz: b30b925f450271bc8e6980df7c780056a26f40fc
+SHA512:
+  metadata.gz: ed39347ebba94448f41ca01a13fc92bcd4c2bfd4bc572b33ffd5e1838a83cda3bba8cc5a819f4727e298db9fcaa298404c80ca0f2e7492403519097b47e08ee0
+  data.tar.gz: c4c4a4c93ed56e2a97725c453f67c40465f3962dcf86b75f36d4c9990b5f4729a03ecdde0faa0c6fe311164dcf7ba3c40aaad111be338ae89314dda06fe2a34c

data/README.md

@@ -124,6 +124,7 @@ Use the javascript in `s3_direct_upload` as a guide.
 * `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.
 * `progress_bar_target:` The jQuery selector for the element where you want the progress bars to be appended to. Default is the form element.
+* `click_submit_target:` The jQuery selector for the element you wish to add a click handler to do the submitting instead of submiting on file open.
 
 ### Example with all options.
 ```coffeescript
@@ -134,6 +135,7 @@ jQuery ->
     remove_completed_progress_bar: false
     before_add: myCallBackFunction() # must return true or false if set
     progress_bar_target: $('.js-progress-bars')
+    click_submit_target: $('.submit-target')
 ```
 
 ### Public methods

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

@@ -21,10 +21,16 @@ $.fn.S3Uploader = (options) ->
     remove_completed_progress_bar: true
     remove_failed_progress_bar: false
     progress_bar_target: null
+    click_submit_target: null
 
   $.extend settings, options
 
   current_files = []
+  forms_for_submit = []
+  if settings.click_submit_target
+    settings.click_submit_target.click -> 
+      form.submit() for form in forms_for_submit
+      false 
 
   setUploadForm = ->
     $uploadForm.fileupload
@@ -35,9 +41,12 @@ $.fn.S3Uploader = (options) ->
         file.unique_id = Math.random().toString(36).substr(2,16)
 
         unless settings.before_add and not settings.before_add(file)
-          data.context = $(tmpl("template-upload", file)) if $('#template-upload').length > 0
+          data.context = $(tmpl("template-upload", file).trim()) if $('#template-upload').length > 0
           $(data.context).appendTo(settings.progress_bar_target || $uploadForm)
-          data.submit()
+          if settings.click_submit_target
+           forms_for_submit.push data
+          else
+            data.submit()            
 
       start: (e) ->
         $uploadForm.trigger("s3_uploads_start", [e])

data/lib/s3_direct_upload/form_helper.rb

@@ -16,6 +16,7 @@ module S3DirectUpload
           aws_secret_access_key: S3DirectUpload.config.secret_access_key,
           bucket: S3DirectUpload.config.bucket,
           region: S3DirectUpload.config.region || "s3",
+          ssl: true,
           acl: "public-read",
           expiration: 10.hours.from_now.utc.iso8601,
           max_file_size: 500.megabytes,
@@ -56,7 +57,7 @@ module S3DirectUpload
       end
 
       def url
-        "https://#{@options[:region]}.amazonaws.com/#{@options[:bucket]}/"
+        "http#{@options[:ssl] ? 's' : ''}://#{@options[:region]}.amazonaws.com/#{@options[:bucket]}/"
       end
 
       def policy
@@ -75,7 +76,7 @@ module S3DirectUpload
             {bucket: @options[:bucket]},
             {acl: @options[:acl]},
             {success_action_status: "201"}
-          ]
+          ] + (@options[:conditions] || [])
         }
       end
 

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Wayne Hoover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 description: Direct Upload to Amazon S3 With CORS and jquery-file-upload
 email:
 - w@waynehoover.com
@@ -95,27 +86,26 @@ files:
 - README.md
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gives a form helper for Rails which allows direct uploads to s3. Based on
   RailsCast#383
 test_files: []