actionverb_s3_direct_upload 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc2NzllMDczMWFlYmYyYmIyNTM4Nzg3YmUyNGU2ZTA0MTFmN2UyMQ==
+    MjhhMjNhMTU4ODk2Y2FiNTE4YWE0OTMwNzA4MTc5ZWYzYWZmZTEwZA==
   data.tar.gz: !binary |-
-    YTYzYzQ4OWNkOGVhM2YzZGI0MWMyYmY4MjFhYWUzYzhlNGZhZjA4Zg==
+    NjIwZWRiYWY3MzNjMTFiOGJjNWE4NmFiMzA4MGJkODBmZjY0ZjRiMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGRmNDVjNmFjMzA0YjVmMmViMzU0YjIxMGM5MmVmNzc2ZTQ1NzI5YmQ1MmQ2
-    NjQyNzJjOWU2MTJlYmE1Njg4Yjk0YzgxYjQwMTA3ZWY2Y2U0NjBkM2YxODdk
-    NDcyNTMyYmIyOTZlMGM2YWQ0OGU1MzExNmFiODA2NDczMWVlYTA=
+    ZTEzZjJmNDQ4ZGI2ZDIzOTA3NTc0ODIwMjkxMGVlOWYyNWM4Njg1MTk3MDI5
+    ZjQ0ODIzOGI1NTUxYjQyMTczM2RkOGM2ZTY3MWRkNGE2YmI1YWNhYmRkOTYz
+    NWUyNzZhOTVmYmFhZGJlMmQ2MTVhMWExZDVhZDFjMzllNDk1Zjc=
   data.tar.gz: !binary |-
-    MGVlYzg3MzZiZjhhMDNjNTc5ODYxYmJiMzAyMjM0MGI2ZWM0Mzk0NGEwZDAz
-    NmI4Y2I1ZmFjZDY5MGVkYjNhZjMzNjU1NmUzY2U3NmQ3MTk5ODQ2MzhmZGI2
-    MDQyNThiMGJkMjlkNmQzNDFkYWRkN2JkNzFhYWEyYTFlODc1Yjc=
+    N2ZjMjc0NDI4MWFjMzZiNGZlYTM3Y2RiYmNiZjgyZTA2ZTNiODI5YWNiNDIw
+    NWQ1YTZmN2ZiNzUzNWZiYzhiNDQzMjExZTUyYWQ5ZDVjZTI3ZTA2Nzk4ZjFm
+    NzM3Nzk2NmQyYzI4YzY4MDM4MGNlMTRiYmEzN2FlMDI1OWUwYjE=

data/lib/s3_direct_upload/form_helper.rb

@@ -11,16 +11,20 @@ module S3DirectUpload
 
     class S3Uploader
       def initialize(options)
+        @additional_headers = options[:additional_headers] || []
         @options = options.reverse_merge(
           aws_access_key_id: S3DirectUpload.config.access_key_id,
           aws_secret_access_key: S3DirectUpload.config.secret_access_key,
           bucket: S3DirectUpload.config.bucket,
           acl: "public-read",
           expiration: 10.hours.from_now.utc.iso8601,
-          max_file_size: 500.megabytes,
+          max_file_size: 64.gigabytes,
           as: "file",
           key: key
         )
+        @additional_headers.each do |header|
+          @options[header[0]]=@options[header[1]]
+        end
       end
 
       def form_options
@@ -71,7 +75,7 @@ module S3DirectUpload
             {bucket: @options[:bucket]},
             {acl: @options[:acl]},
             {success_action_status: "201"}
-          ]
+          ].concat(@additional_headers)
         }
       end
 

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionverb_s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Wayne Hoover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,14 +74,13 @@ 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.coffee
 - LICENSE
 - README.md
 homepage: ''

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

@@ -1,121 +0,0 @@
-// 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 ('relativePath' in file) {
-      content.filerelativepath = file.relativePath;
-    }
-    if (settings.additional_data) {
-      content = $.extend(content, settings.additional_data);
-    }
-    console.log(content);
-    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();
-};