actionverb_s3_direct_upload 0.0.7 → 0.0.9

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

@@ -35,7 +35,7 @@ $.fn.S3Uploader = (options) ->
       add: (e, data) ->
         current_files.push data
         file = data.files[0]
-        unless settings.before_add and not settings.before_add(file)
+        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()

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

@@ -0,0 +1,117 @@
+// 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: '',
+    additional_data: null,
+    before_add: 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];
+        if (!(settings.before_add && !settings.before_add(data))) {
+          if ($('#template-upload').length > 0) {
+            data.context = $(tmpl("template-upload", file));
+          }
+          settings['progress_container'].append(data.context);
+          return data.submit();
+        }
+      },
+      progress: function(e, data) {
+        var progress;
+        if (data.context) {
+          progress = parseInt(data.loaded / data.total * 100, 10);
+          return data.context.find('.bar').css('width', progress + '%');
+        }
+      },
+      done: function(e, data) {
+        var content, to;
+        content = build_content_object($uploadForm, data.files[0]);
+        to = $uploadForm.data('post');
+        if (to) {
+          content[$uploadForm.data('as')] = content.url;
+          $.post(to, 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");
+        }
+      },
+      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');
+    path = settings.path + $uploadForm.find('input[name=key]').val().replace('/${filename}', '');
+    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 (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/form_helper.rb

@@ -53,7 +53,7 @@ module S3DirectUpload
       end
 
       def url
-        "https://#{@options[:bucket]}.s3.amazonaws.com/"
+        "https://s3.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.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionverb_s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,6 +89,7 @@ files:
 - 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
 - app/assets/stylesheets/s3_direct_upload_progress_bars.css.scss
 - LICENSE
 - README.md
@@ -118,4 +119,3 @@ specification_version: 3
 summary: Gives a form helper for Rails which allows direct uploads to s3. Based on
   RailsCast#383
 test_files: []
-has_rdoc: