actionverb_s3_direct_upload 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI4NjA5NDYwNWIwZmZiN2FmMDk4ODBlNmU3OTM0MDc1ZjlmZTgzYQ==
+    MDkwMzEwYjRhYjY4ZjQ3MmY1YWEzNmY2MmU2ODk3ODUzZWM3NjUxMw==
   data.tar.gz: !binary |-
-    NTZlOTIzNGJiNDdkYzUzMzFjODY2ZWZlNjEzODhkMmY4MTE0NTYyMg==
+    NzJlMDhjMWU4YTljNzhkOTU5ZTBkZDM5ZjZlMDUxNzEzMzRiZmVjNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODNhYTZhNmM0MmQ5NmQ1Mjg0YjkwOWI3ZjZlMjRmNjZmMDJjOTdlZjAxMGMw
-    ZjFkODFlNTA1MmJmMTZjZjc5YjZmN2JhOWE2NTlkOTk1ZTNlODc4MzdjZGM1
-    OGY0OGM3MjNmZWY0YjNmYmJiZmUxNjlhNTdhYWZmNWE0ZGY2ZDE=
+    OGZmNzljOWI4ODFjZjBkNDM4ZDBjNzlkNmEwMTRkMTFlMmI1YzUxMGJhM2U3
+    ODViOTNhYjNiZjY5YWFiNmExY2NmNjQ3NWEzMzY3MmVlYjZjNDI0NWI3YjEz
+    MWYzYjBjNTJiNDA3YzU1NTAyNTY3NWNkOGQxZjEwNDk5ZTljYzA=
   data.tar.gz: !binary |-
-    NDU5ZTkwOWQ2NzM2NmY4MTMyNDMzM2ZkMTA5ODNiZWNjNmI4ZmY0OWU1MmQ1
-    NjA1ODY0MjY4NDUxMDU3ODI5OWVmMzNhMzNhZDIyYmI4YWFhZTlmZGM3YmMz
-    YTNjNjc3YThmNTRkZTcxNWU1YWMzYWQwZmFiNjNjNTVjMGRkN2Q=
+    ZDg5Y2ViMWVhNGZkNmM1NGYyMjkwYWRmZmUwNGVmOTZjNWNhNjA0MDIxYzc5
+    ODNkNDFmZjYwMzU2MWVhMTQwOWRmNjliNWU4ZTdkMjMxODRjMjdiMzdlOGQz
+    MWY0M2EyYTJlMWY3NTZmNjdkNzI1ZDhkMmYwNGNhNTgxZmM3NmE=

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

@@ -16,8 +16,8 @@ $.fn.S3Uploader = (options) ->
 
   settings =
     path: ''
+    add: null
     additional_data: null
-    before_add: null
     remove_completed_progress_bar: true
     progress_container: $uploadForm
 
@@ -35,30 +35,27 @@ $.fn.S3Uploader = (options) ->
       add: (e, data) ->
         current_files.push data
         file = data.files[0]
-        unless settings.before_add and not settings.before_add(data)
-          data.context = $(tmpl("template-upload", file)) if $('#template-upload').length > 0
-          settings['progress_container'].append(data.context)
-          data.submit()
+        settings.add(data)
 
       progress: (e, data) ->
-        if data.context
-          progress = parseInt(data.loaded / data.total * 100, 10)
-          data.context.find('.bar').css('width', progress + '%')
+        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])
+
+          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]
-        
-        to = $uploadForm.data('post')
-        if to
-          content[$uploadForm.data('as')] = content.url
-          $.post(to, content)
-        
-        data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
-        $uploadForm.trigger("s3_upload_complete", [content])
 
-        current_files.splice($.inArray(data, current_files), 1) # remove that element from the array
-        if current_files.length == 0
-          $(document).trigger("s3_uploads_complete")
+        #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]
@@ -80,7 +77,11 @@ $.fn.S3Uploader = (options) ->
 
   build_content_object = ($uploadForm, file) ->
     domain = $uploadForm.attr('action')
-    path = settings.path + $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
+
+    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

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

@@ -0,0 +1,118 @@
+// Generated by CoffeeScript 1.3.3
+var $;
+
+$ = jQuery;
+
+$.fn.S3Uploader = function(options) {
+  var $uploadForm, build_content_object, current_files, setUploadForm, settings;
+  if (this.length > 1) {
+    this.each(function() {
+      return $(this).S3Uploader(options);
+    });
+    return this;
+  }
+  $uploadForm = this;
+  settings = {
+    path: '',
+    add: null,
+    additional_data: null,
+    remove_completed_progress_bar: true,
+    progress_container: $uploadForm
+  };
+  $.extend(settings, options);
+  current_files = [];
+  setUploadForm = function() {
+    return $uploadForm.fileupload({
+      start: function(e) {
+        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);
+      },
+      progress: function(e, data) {
+        var progress;
+        progress = parseInt(data.loaded / data.total * 100, 10);
+        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]);
+      },
+      formData: function(form) {
+        var data, fileType;
+        data = form.serializeArray();
+        fileType = "";
+        if ("type" in this.files[0]) {
+          fileType = this.files[0].type;
+        }
+        data.push({
+          name: "Content-Type",
+          value: fileType
+        });
+        data[1].value = settings.path + data[1].value;
+        return data;
+      }
+    });
+  };
+  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;
+  };
+  this.path = function(new_path) {
+    return settings.path = new_path;
+  };
+  this.additional_data = function(new_data) {
+    return settings.additional_data = new_data;
+  };
+  return this.initialize();
+};

data/lib/s3_direct_upload/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionverb_s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Wayne Hoover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,13 +74,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/actionverb_s3_direct_upload.rb
-- lib/s3_direct_upload.rb
-- lib/s3_direct_upload/form_helper.rb
+- lib/s3_direct_upload/config_aws.rb
 - lib/s3_direct_upload/engine.rb
+- lib/s3_direct_upload/form_helper.rb
 - lib/s3_direct_upload/version.rb
-- lib/s3_direct_upload/config_aws.rb
-- app/assets/stylesheets/s3_direct_upload_progress_bars.css.scss
+- lib/s3_direct_upload.rb
 - app/assets/javascripts/s3_direct_upload.js.coffee
+- app/assets/javascripts/s3_direct_upload.js.js
+- app/assets/stylesheets/s3_direct_upload_progress_bars.css.scss
 - LICENSE
 - README.md
 homepage: ''
@@ -108,3 +109,4 @@ specification_version: 4
 summary: Gives a form helper for Rails which allows direct uploads to s3. Based on
   RailsCast#383
 test_files: []
+has_rdoc: