actionverb_s3_direct_upload 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDkwMzEwYjRhYjY4ZjQ3MmY1YWEzNmY2MmU2ODk3ODUzZWM3NjUxMw==
-  data.tar.gz: !binary |-
-    NzJlMDhjMWU4YTljNzhkOTU5ZTBkZDM5ZjZlMDUxNzEzMzRiZmVjNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OGZmNzljOWI4ODFjZjBkNDM4ZDBjNzlkNmEwMTRkMTFlMmI1YzUxMGJhM2U3
-    ODViOTNhYjNiZjY5YWFiNmExY2NmNjQ3NWEzMzY3MmVlYjZjNDI0NWI3YjEz
-    MWYzYjBjNTJiNDA3YzU1NTAyNTY3NWNkOGQxZjEwNDk5ZTljYzA=
-  data.tar.gz: !binary |-
-    ZDg5Y2ViMWVhNGZkNmM1NGYyMjkwYWRmZmUwNGVmOTZjNWNhNjA0MDIxYzc5
-    ODNkNDFmZjYwMzU2MWVhMTQwOWRmNjliNWU4ZTdkMjMxODRjMjdiMzdlOGQz
-    MWY0M2EyYTJlMWY3NTZmNjdkNzI1ZDhkMmYwNGNhNTgxZmM3NmE=
+SHA1:
+  metadata.gz: f90bbc7145b4048c5c0bf8989a9d309d9cf455fb
+  data.tar.gz: 7aaf4fedd67424def3acb816a0f98f82e7fef748
+SHA512:
+  metadata.gz: 561e3bd62e7c28a0e0d558b96bf76ed89e2f721578b36ab0963e1a069b383233918e946eebbd9be56ae8368f5d97838f99b11898296e081471f6ba617d9170ff
+  data.tar.gz: ad6833bf17aa8c103fa89f92acb03acf8b45494066102409a011734ae8c5c736415558342d9dd49ba28996bb15a98ca1f7c238b042069cfb86f24bc04fd69ba3

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

@@ -16,7 +16,6 @@ $.fn.S3Uploader = (options) ->
 
   settings =
     path: ''
-    add: null
     additional_data: null
     remove_completed_progress_bar: true
     progress_container: $uploadForm
@@ -34,33 +33,22 @@ $.fn.S3Uploader = (options) ->
 
       add: (e, data) ->
         current_files.push data
-        file = data.files[0]
-        settings.add(data)
+        if current_files.length == data.originalFiles.length
+          $uploadForm.trigger("s3_uploads_queued", [current_files])
 
       progress: (e, data) ->
         progress = parseInt(data.loaded / data.total * 100, 10)
         data.context.find('.bar').css('width', progress + '%')
 
       done: (e, data) ->
-        completed_upload = (data, content) => 
-          data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
-          $uploadForm.trigger("s3_upload_complete", [content])
+        data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
+        $uploadForm.trigger("s3_upload_complete", [data])
 
-          current_files.splice($.inArray(data, current_files), 1) # remove that element from the array
-          if current_files.length == 0
-            $(document).trigger("s3_uploads_complete")
+        current_files.splice($.inArray(data, current_files), 1) # remove that element from the array
+        if current_files.length == 0
+          $(document).trigger("s3_uploads_complete")
 
-        content = build_content_object $uploadForm, data.files[0]
 
-        #once an upload completes, post to the server designated in the "data-post" attribute of the s3_upload_form
-        to = $uploadForm.data('post')
-        content[$uploadForm.data('as')] = content.url
-        $.post(to, content, completed_upload(data, content)).error(=> fail(data))
-
-      fail: (e, data) ->
-        content = build_content_object $uploadForm, data.files[0]
-        content.error_thrown = data.errorThrown
-        $uploadForm.trigger("s3_upload_failed", [content])
 
       formData: (form) ->
         data = form.serializeArray()
@@ -75,22 +63,6 @@ $.fn.S3Uploader = (options) ->
 
         data
 
-  build_content_object = ($uploadForm, file) ->
-    domain = $uploadForm.attr('action')
-
-    if !file.upload_path
-      file.upload_path = $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
-
-    path = settings.path + file.upload_path
-    content          = {}
-    content.url      = domain + path + '/' + file.name
-    content.filename = file.name
-    content.filepath = path
-    content.filesize = file.size if 'size' of file
-    content.filetype = file.type if 'type' of file
-    content.filerelativepath = file.relativePath if 'relativePath' of file
-    content = $.extend content, settings.additional_data if settings.additional_data
-    content
 
   #public methods
   @initialize = ->

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

@@ -1,10 +1,10 @@
-// Generated by CoffeeScript 1.3.3
+// Generated by CoffeeScript 1.6.3
 var $;
 
 $ = jQuery;
 
 $.fn.S3Uploader = function(options) {
-  var $uploadForm, build_content_object, current_files, setUploadForm, settings;
+  var $uploadForm, current_files, setUploadForm, settings;
   if (this.length > 1) {
     this.each(function() {
       return $(this).S3Uploader(options);
@@ -14,7 +14,6 @@ $.fn.S3Uploader = function(options) {
   $uploadForm = this;
   settings = {
     path: '',
-    add: null,
     additional_data: null,
     remove_completed_progress_bar: true,
     progress_container: $uploadForm
@@ -27,10 +26,10 @@ $.fn.S3Uploader = function(options) {
         return $uploadForm.trigger("s3_uploads_start", [e]);
       },
       add: function(e, data) {
-        var file;
         current_files.push(data);
-        file = data.files[0];
-        return settings.add(data);
+        if (current_files.length === data.originalFiles.length) {
+          return $uploadForm.trigger("s3_uploads_queued", [current_files]);
+        }
       },
       progress: function(e, data) {
         var progress;
@@ -38,30 +37,14 @@ $.fn.S3Uploader = function(options) {
         return data.context.find('.bar').css('width', progress + '%');
       },
       done: function(e, data) {
-        var completed_upload, content, to,
-          _this = this;
-        completed_upload = function(data, content) {
-          if (data.context && settings.remove_completed_progress_bar) {
-            data.context.remove();
-          }
-          $uploadForm.trigger("s3_upload_complete", [content]);
-          current_files.splice($.inArray(data, current_files), 1);
-          if (current_files.length === 0) {
-            return $(document).trigger("s3_uploads_complete");
-          }
-        };
-        content = build_content_object($uploadForm, data.files[0]);
-        to = $uploadForm.data('post');
-        content[$uploadForm.data('as')] = content.url;
-        return $.post(to, content, completed_upload(data, content)).error(function() {
-          return fail(data);
-        });
-      },
-      fail: function(e, data) {
-        var content;
-        content = build_content_object($uploadForm, data.files[0]);
-        content.error_thrown = data.errorThrown;
-        return $uploadForm.trigger("s3_upload_failed", [content]);
+        if (data.context && settings.remove_completed_progress_bar) {
+          data.context.remove();
+        }
+        $uploadForm.trigger("s3_upload_complete", [data]);
+        current_files.splice($.inArray(data, current_files), 1);
+        if (current_files.length === 0) {
+          return $(document).trigger("s3_uploads_complete");
+        }
       },
       formData: function(form) {
         var data, fileType;
@@ -79,31 +62,6 @@ $.fn.S3Uploader = function(options) {
       }
     });
   };
-  build_content_object = function($uploadForm, file) {
-    var content, domain, path;
-    domain = $uploadForm.attr('action');
-    if (!file.upload_path) {
-      file.upload_path = $uploadForm.find('input[name=key]').val().replace('/${filename}', '');
-    }
-    path = settings.path + file.upload_path;
-    content = {};
-    content.url = domain + path + '/' + file.name;
-    content.filename = file.name;
-    content.filepath = path;
-    if ('size' in file) {
-      content.filesize = file.size;
-    }
-    if ('type' in file) {
-      content.filetype = file.type;
-    }
-    if ('relativePath' in file) {
-      content.filerelativepath = file.relativePath;
-    }
-    if (settings.additional_data) {
-      content = $.extend(content, settings.additional_data);
-    }
-    return content;
-  };
   this.initialize = function() {
     setUploadForm();
     return this;

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionverb_s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Wayne Hoover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,14 +74,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/actionverb_s3_direct_upload.rb
-- lib/s3_direct_upload/config_aws.rb
-- lib/s3_direct_upload/engine.rb
+- lib/s3_direct_upload.rb
 - lib/s3_direct_upload/form_helper.rb
+- lib/s3_direct_upload/engine.rb
 - lib/s3_direct_upload/version.rb
-- lib/s3_direct_upload.rb
-- app/assets/javascripts/s3_direct_upload.js.coffee
-- app/assets/javascripts/s3_direct_upload.js.js
+- lib/s3_direct_upload/config_aws.rb
 - app/assets/stylesheets/s3_direct_upload_progress_bars.css.scss
+- app/assets/javascripts/s3_direct_upload.js.js
+- app/assets/javascripts/s3_direct_upload.js.coffee
 - LICENSE
 - README.md
 homepage: ''
@@ -93,20 +93,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Gives a form helper for Rails which allows direct uploads to s3. Based on
   RailsCast#383
 test_files: []
-has_rdoc: