s3_multipart 0.0.10.5 → 0.0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d98ae2406219c5a736d33bf323dfb675f2649e18
-  data.tar.gz: 790a0d7b0d2d42765c05474851eaffd773845a10
+  metadata.gz: e74a7aee76d8f60af7b749993e1257c1392f3324
+  data.tar.gz: b89221f39db1562e39906af3ede3c3b589789489
 SHA512:
-  metadata.gz: c5aec821b693decc4f4d86a4ef4a7fa000dfe3e3a051dc7567c42de585da0a97d466d7193b9b68cfec34e88f40ef62149959f9cacd7ea3b594bf39ad9b093c13
-  data.tar.gz: 3885d74fa41187e425cd4273d73bad593221937368efa238592efa5a31c24b2f781e479db623af403f4c97c940fed06335a2060151bf3a0e72f09a987bfcacfc
+  metadata.gz: ccd1414d670078a844ee5a3aa18499c318fec1a54e6e5b834d0b2dd7e55ac966ac7df4a5108e6dc879e937755d55642ca939c76e6fd7608919eadd6150939228
+  data.tar.gz: 86f8560e32863f0534adf0fd5681321ba48885affe480f98fa031491d272770591d3c83694a29abc7ab0c2e98adf750837e430777d331a2413398d3cb97d0de9

data/.gitignore

@@ -18,3 +18,7 @@ _SpecRunner.html
 
 *.swp
 *.swo
+
+.ruby-version
+.rbenv-gemset
+.rbenv-gemsets

data/Gemfile

@@ -2,18 +2,8 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'activerecord'
-  gem 'sqlite3'
   gem 'actionpack' # action_controller, action_view
   gem 'sprockets'
-  gem "rails"
-  gem "sqlite3"
-  
-  # tests
-  gem 'combustion', '~> 0.3.3'
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'capybara'
-  # gem 'jasmine'
 
   # assets
   gem 'sass-rails',   '~> 3.2.3'
@@ -23,4 +13,4 @@ group :development do
 
   gemspec
 
-end
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3_multipart (0.0.10.4)
+    s3_multipart (0.0.10.5)
       uuid (>= 2.3.6)
       xml-simple (>= 1.1.2)
 
@@ -64,7 +64,7 @@ GEM
       sass (~> 3.1)
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -83,8 +83,8 @@ GEM
     libwebsocket (0.1.7.1)
       addressable
       websocket
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
+    macaddr (1.7.1)
+      systemu (~> 2.6.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -118,21 +118,18 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     rubyzip (0.9.9)
     sass (3.2.3)
     sass-rails (3.2.5)
@@ -150,17 +147,17 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    systemu (2.5.2)
+    systemu (2.6.4)
     thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
-    uuid (2.3.6)
+    uuid (2.3.7)
       macaddr (~> 1.0)
     websocket (1.0.6)
-    xml-simple (1.1.2)
+    xml-simple (1.1.3)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
@@ -176,8 +173,7 @@ DEPENDENCIES
   compass-rails
   jquery-ui-rails
   rails
-  rspec
-  rspec-rails
+  rspec-rails (~> 2.14, >= 2.14.2)
   s3_multipart!
   sass-rails (~> 3.2.3)
   sprockets

data/README.md

@@ -1,4 +1,5 @@
 # S3 Multipart
+[![Gem Version](https://badge.fury.io/rb/s3_multipart.svg)](http://badge.fury.io/rb/s3_multipart)
 
 The S3 Multipart gem brings direct multipart uploading to S3 to Rails. Data is piped from the client straight to Amazon S3 and a server-side callback is run when the upload is complete.
 
@@ -6,6 +7,8 @@ Multipart uploading allows files to be split into many chunks and uploaded in pa
 
 ## What's New
 
+**0.0.10.6** - See pull request [23](https://github.com/maxgillett/s3_multipart/pull/23) for detailed changes. Changes will be documented in README soon.
+
 **0.0.10.5** - See pull request [16](https://github.com/maxgillett/s3_multipart/pull/16) and [18](https://github.com/maxgillett/s3_multipart/pull/18) for detailed changes. 
 
 **0.0.10.4** - Fixed a race condition that led to incorrect upload progress feedback.

data/app/controllers/s3_multipart/uploads_controller.rb

@@ -1,6 +1,6 @@
 module S3Multipart
   class UploadsController < ApplicationController
-  
+
     def create
       begin
         upload = Upload.create(params)
@@ -20,9 +20,9 @@ module S3Multipart
       return complete_upload if params[:parts]
       return sign_batch if params[:content_lengths]
       return sign_part if params[:content_length]
-    end 
+    end
 
-    private 
+    private
 
       def sign_batch
         begin

data/app/models/s3_multipart/upload.rb

@@ -7,12 +7,12 @@ module S3Multipart
 
     def self.create(params)
       response = initiate(params)
-      super(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"], size: params["content_size"])
+      super(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"], size: params["content_size"], context: params["context"].to_s)
     end
 
     def execute_callback(stage, session)
       controller = deserialize(uploader)
-      
+
       case stage
       when :begin
         controller.on_begin_callback.call(self, session) if controller.on_begin_callback
@@ -43,7 +43,7 @@ module S3Multipart
         types = deserialize(self.uploader).file_types
 
         unless types.blank? || types.include?(ext)
-          raise FileTypeError, I18n.t("s3_multipart.errors.types", types: upload.deserialize(upload.uploader).file_types.join(", "))
+          raise FileTypeError, I18n.t("s3_multipart.errors.types", types: types.join(", "))
         end
       end
 

data/javascripts/s3mp.js

@@ -5,6 +5,7 @@ function S3MP(options) {
     , S3MP = this;
 
   _.extend(this, options);
+  this.headers = _.object(_.map(options.headers, function(v,k) { return ["x-amz-" + k.toLowerCase(), v] }));
 
   this.uploadList = [];
 
@@ -18,7 +19,7 @@ function S3MP(options) {
       var i = [];
       function beginUpload(pipes, uploadObj) {
         var key = uploadObj.key
-          , num_parts = uploadObj.parts.length
+          , num_parts = uploadObj.parts.length;
 
         if (typeof i[key] === "undefined") {
           i[key] = 0;
@@ -47,6 +48,7 @@ function S3MP(options) {
       var parts, i, ETag;
 
       parts = uploadObj.parts;
+      finished_part.status = "complete";
 
       // Append the ETag (in the response header) to the ETags array
       ETag = finished_part.xhr.getResponseHeader("ETag");
@@ -141,12 +143,6 @@ function S3MP(options) {
   }
 
   _.each(files, function(file, key) {
-    if (file.size < 5000000) {
-      return S3MP.onError({name: "FileSizeError", message: "File size is too small"})
-      // This should still work. The multipart API just can't be used b/c Amazon doesn't allow 
-      // multipart file uploads that are less than 5 mb in size.
-    }
-
     var upload = new Upload(file, S3MP, key);
     S3MP.uploadList.push(upload);
     upload.init();
@@ -161,6 +157,8 @@ S3MP.prototype.initiateMultipart = function(upload, cb) {
   body = JSON.stringify({ object_name  : upload.name,
                           content_type : upload.type,
                           content_size : upload.size,
+                          headers      : this.headers,
+                          context      : $(this.fileInputElement).data("context"),
                           uploader     : $(this.fileInputElement).data("uploader")
                         });
 
@@ -176,7 +174,7 @@ S3MP.prototype.signPartRequests = function(id, object_name, upload_id, parts, cb
     return memo + "-" + part.size;
   }, parts[0].size);
 
-  url = "s3_multipart/uploads/"+id;
+  url = "/s3_multipart/uploads/"+id;
   body = JSON.stringify({ object_name     : object_name,
                           upload_id       : upload_id,
                           content_lengths : content_lengths
@@ -189,7 +187,7 @@ S3MP.prototype.signPartRequests = function(id, object_name, upload_id, parts, cb
 S3MP.prototype.completeMultipart = function(uploadObj, cb) {
   var url, body, xhr;
 
-  url = 's3_multipart/uploads/'+uploadObj.id;
+  url = '/s3_multipart/uploads/'+uploadObj.id;
   body = JSON.stringify({ object_name    : uploadObj.object_name,
                           upload_id      : uploadObj.upload_id,
                           content_length : uploadObj.size,
@@ -210,7 +208,7 @@ S3MP.prototype.deliverRequest = function(xhr, body, cb) {
     if (response.error) { 
       return self.onError({
         name: "ServerResponse",
-        message: "The server responded with an error"
+        message: response.error
       });  
     }
     cb(response);

data/javascripts/upload.js

@@ -63,11 +63,8 @@ function Upload(file, o, key) {
 
         upload.signPartRequests(id, object_name, upload_id, parts, function(response) {
           _.each(parts, function(part, key) {
-            var xhr = part.xhr;
-
-            xhr.open('PUT', 'http://'+upload.bucket+'.s3.amazonaws.com/'+object_name+'?partNumber='+part.num+'&uploadId='+upload_id, true);
-            xhr.setRequestHeader('x-amz-date', response[key].date);
-            xhr.setRequestHeader('Authorization', response[key].authorization);
+            part.date = response[key].date;
+            part.auth = response[key].authorization;
 
             // Notify handler that an xhr request has been opened
             upload.handler.beginUpload(pipes, upload);

data/javascripts/uploadpart.js

@@ -7,6 +7,7 @@ function UploadPart(blob, key, upload) {
   this.size = blob.size;
   this.blob = blob;
   this.num = key;
+  this.upload = upload;
 
   this.xhr = xhr = upload.createXhrRequest();
   xhr.onload = function() {
@@ -16,7 +17,7 @@ function UploadPart(blob, key, upload) {
     upload.handler.onError(upload, part);
   };
   xhr.upload.onprogress = _.throttle(function(e) {
-    if (upload.inprogress[key] != 0) {
+    if (e.lengthComputable) {
       upload.inprogress[key] = e.loaded;
     }
   }, 1000);
@@ -24,6 +25,10 @@ function UploadPart(blob, key, upload) {
 };
 
 UploadPart.prototype.activate = function() { 
+  this.xhr.open('PUT', 'http://'+this.upload.bucket+'.s3.amazonaws.com/'+this.upload.object_name+'?partNumber='+this.num+'&uploadId='+this.upload.upload_id, true);
+  this.xhr.setRequestHeader('x-amz-date', this.date);
+  this.xhr.setRequestHeader('Authorization', this.auth);
+
   this.xhr.send(this.blob);
   this.status = "active";
 };

data/lib/generators/s3_multipart/install_new_migrations_generator.rb

@@ -8,6 +8,7 @@ module S3Multipart
 
     def create_latest_migrations
       copy_file "add_size_column_to_s3_multipart_uploads.rb", "db/migrate/#{migration_time}_add_size_to_s3_multipart_uploads.rb"
+      copy_file "add_context_column_to_s3_multipart_uploads.rb", "db/migrate/#{migration_time}_add_context_to_s3_multipart_uploads.rb"
     end
 
     private

data/lib/generators/s3_multipart/templates/add_context_to_s3_multipart_uploads.rb

@@ -0,0 +1,6 @@
+class AddContextToS3MultipartUploads < ActiveRecord::Migration
+  def change
+    add_column :s3_multipart_uploads, :context, :text
+  end
+end
+

data/lib/generators/s3_multipart/templates/aws.yml

@@ -2,4 +2,4 @@ development:
   access_key_id: ""
   secret_access_key: ""
   bucket: ""
-  revision: "#.#.#"
+  revision: "#.#.#.#"

data/lib/generators/s3_multipart/templates/uploads_table_migration.rb

@@ -8,6 +8,8 @@ class CreateS3MultipartUploads < ActiveRecord::Migration
       t.string :name
       t.string :uploader
       t.integer :size
+      # additional options useful for constructing associations for the uploaded model
+      t.text :context
 
       t.timestamps
     end

data/lib/s3_multipart/http/net_http.rb

@@ -31,7 +31,7 @@ module S3Multipart
         request[key.to_s.split("_").map(&:capitalize).join("-")] = val
       end
       request.body = body if body
-      
+
       @response = http.request(request)
     end
 

data/lib/s3_multipart/transfer_helpers.rb

@@ -31,7 +31,7 @@ module S3Multipart
     def sign_part(options)
       url = "/#{options[:object_name]}?partNumber=#{options[:part_number]}&uploadId=#{options[:upload_id]}"
       authorization, date = sign_request verb: 'PUT', url: URI.escape(url), content_length: options[:content_length]
-      
+
       { authorization: authorization, date: date }
     end
 
@@ -39,7 +39,7 @@ module S3Multipart
       options[:content_type] = "application/xml"
 
       url = URI.escape("/#{options[:object_name]}?uploadId=#{options[:upload_id]}")
-      
+
       body = format_part_list_in_xml(options)
       headers = { content_type: options[:content_type],
                   content_length: options[:content_length] }
@@ -101,7 +101,7 @@ module S3Multipart
         request_parts << "/#{Config.instance.bucket_name}#{options[:url]}"
         unsigned_request = request_parts.join("\n")
         signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', Config.instance.s3_secret_key, unsigned_request))
-        
+
         authorization = "AWS" + " " + Config.instance.s3_access_key + ":" + signature
       end
 

data/lib/s3_multipart/uploader/validations.rb

@@ -5,7 +5,7 @@ module S3Multipart
       attr_accessor :file_types, :size_limits
 
       def accept(types)
-        self.file_types = types         
+        self.file_types = types
       end
 
       def limit(sizes)

data/lib/s3_multipart/version.rb

@@ -1,5 +1,5 @@
 module S3Multipart
-  VERSION = "0.0.10.5"
+  VERSION = "0.0.10.6"
   BREAKING_CHANGES = {
     :"0.0.10.2" => 'Modifications made to the database table used by the gem are now handled by migrations. If you are upgrading versions, run `rails g s3_multipart:install_new_migrations` followed by `rake db:migrate`. Fresh installs do not require subsequent migrations. The current version must now also be passed in to the gem\'s configuration function to alert you of breaking changes. This is done by setting a revision yml variable. See the section regarding the aws.yml file in the readme section below (just before "Getting Started").'
   }

data/package.json

@@ -1,9 +1,8 @@
 {
   "name": "s3_multipart",
-  "version": "0.0.10.3",
+  "version": "0.0.10.5",
   "devDependencies": {
-    "grunt": "latest",
-    "grunt-contrib-uglify": "latest",
+    "grunt": "0.3.17",
     "grunt-jasmine-runner": "latest"
   }
 }

data/s3_multipart.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'combustion', '~> 0.3.3'
   s.add_development_dependency "rails"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '~> 2.14', '>= 2.14.2'
   s.add_development_dependency 'capybara'
-end
+end

data/spec/unit/upload_spec.rb

@@ -9,6 +9,7 @@ describe "An upload object" do
   end
 
   it "should initiate an upload" do
+    @upload.stub(:unique_name) {'name'}
     response = @upload.initiate( object_name: "example_object.wmv",
                                   content_type: "video/x-ms-wmv" )
 
@@ -44,4 +45,4 @@ describe "An upload object" do
 
     response[:error].should eql("Upload does not exist")
   end
-end
+end

data/vendor/assets/javascripts/s3_multipart/lib.js

@@ -172,6 +172,7 @@ S3MP.prototype.initiateMultipart = function(upload, cb) {
                           content_type : upload.type,
                           content_size : upload.size,
                           headers      : this.headers,
+                          context      : $(this.fileInputElement).data("context"),
                           uploader     : $(this.fileInputElement).data("uploader")
                         });
 
@@ -405,6 +406,7 @@ function Upload(file, o, key) {
           _.each(parts, function(part, key) {
             part.date = response[key].date;
             part.auth = response[key].authorization;
+
             // Notify handler that an xhr request has been opened
             upload.handler.beginUpload(pipes, upload);
           });
@@ -461,4 +463,4 @@ return S3MP;
 
   }());
 
-}(this));
+}(this));

data/vendor/assets/javascripts/s3_multipart/lib.min.js

@@ -1 +1 @@
-(function(e){e.S3MP=function(){function t(t){var r,i=[],s=this;_.extend(this,t),this.uploadList=[],this.handler={beginUpload:function(){function t(t,n){var r=n.key,i=n.parts.length;typeof e[r]=="undefined"&&(e[r]=0),e[r]++;if(e[r]===i){for(var o=0;o<t;o++)n.parts[o].activate();s.handler.startProgressTimer(r),s.onStart(n)}}var e=[];return t}(),onError:function(e,t){},onPartSuccess:function(e,t){var n,r,i;n=e.parts,i=t.xhr.getResponseHeader("ETag"),e.Etags.push({ETag:i.replace(/\"/g,""),partNum:t.num}),e.uploaded+=t.size,e.inprogress[t.num]=0,r=_.indexOf(n,t),n.splice(r,1),n.length&&(r=_.findIndex(n,function(e,t,n){if(e.status!=="active")return!0}),r!==-1&&n[r].activate()),n.length||this.onComplete(e)},onComplete:function(e){var t=_.indexOf(s.uploadList,e);this.clearProgressTimer(t),s.completeMultipart(e,function(t){t.location&&s.onComplete(e)})},onProgress:function(e,t,n,r,i){s.onProgress(e,t,n,r,i)},startProgressTimer:function(){var t=[],n=function(n){i[n]=e.setInterval(function(){var e,r,i,o,u;typeof t[n]=="undefined"&&(t[n]=0),e=s.uploadList[n],r=e.size,i=e.uploaded,_.each(e.inprogress,function(e){i+=e}),o=i/r*100,u=i-t[n],t[n]=i,e.handler.onProgress(n,r,i,o,u)},1e3)};return n}(),clearProgressTimer:function(t){e.clearInterval(i[t])}},this.fileSelector?r=$(this.fileSelector).get(0).files:r=this.fileList,_.each(r,function(e,t){if(e.size<5e6)return s.onError({name:"FileSizeError",message:"File size is too small"});var r=new n(e,s,t);s.uploadList.push(r),r.init()})}function n(e,t,n){function i(){var t,i,s,o,u,a,f,l,c;t=this,this.key=n,this.file=e,this.name=e.name,this.size=e.size,this.type=e.type,this.Etags=[],this.inprogress=[],this.uploaded=0,this.status="",this.size>1e9?(num_segs=100,l=10):this.size>5e8?(num_segs=50,l=5):this.size>1e8?(num_segs=20,l=5):this.size>5e7?(num_segs=5,l=2):this.size>1e7?(num_segs=2,l=2):(num_segs=1,l=1),a=_.range(num_segs+1),f=_.map(a,function(t){return Math.round(t*(e.size/num_segs))}),t.sliceBlob=="Unsupported"?this.parts=[new r(e,0,t)]:(this.parts=_.map(f,function(n,i){return c=t.sliceBlob(e,n,f[i+1]),new r(c,i+1,t)}),this.parts.pop()),this.init=function(){t.initiateMultipart(t,function(e){var n=t.id=e.id,r=t.upload_id=e.upload_id,i=t.object_name=e.key,s=t.parts;t.signPartRequests(n,i,r,s,function(e){_.each(s,function(n,s){var o=n.xhr;o.open("PUT","http://"+t.bucket+".s3.amazonaws.com/"+i+"?partNumber="+n.num+"&uploadId="+r,!0),o.setRequestHeader("x-amz-date",e[s].date),o.setRequestHeader("Authorization",e[s].authorization),t.handler.beginUpload(l,t)})})})}}return i.prototype=t,new i}function r(e,t,n){var r,i;r=this,this.size=e.size,this.blob=e,this.num=t,this.xhr=i=n.createXhrRequest(),i.onload=function(){n.handler.onPartSuccess(n,r)},i.onerror=function(){n.handler.onError(n,r)},i.upload.onprogress=_.throttle(function(e){n.inprogress[t]!=0&&(n.inprogress[t]=e.loaded)},1e3)}return _.mixin({findIndex:function(e,t){for(var n=0;n<e.length;n++)if(t(e[n],n,e))return n;return-1}}),t.prototype.initiateMultipart=function(e,t){var n,r,i;n="/s3_multipart/uploads",r=JSON.stringify({object_name:e.name,content_type:e.type,content_size:e.size,uploader:$(this.fileInputElement).data("uploader")}),i=this.createXhrRequest("POST",n),this.deliverRequest(i,r,t)},t.prototype.signPartRequests=function(e,t,n,r,i){var s,o,u,a;s=_.reduce(_.rest(r),function(e,t){return e+"-"+t.size},r[0].size),o="s3_multipart/uploads/"+e,u=JSON.stringify({object_name:t,upload_id:n,content_lengths:s}),a=this.createXhrRequest("PUT",o),this.deliverRequest(a,u,i)},t.prototype.completeMultipart=function(e,t){var n,r,i;n="s3_multipart/uploads/"+e.id,r=JSON.stringify({object_name:e.object_name,upload_id:e.upload_id,content_length:e.size,parts:e.Etags}),i=this.createXhrRequest("PUT",n),this.deliverRequest(i,r,t)},t.prototype.deliverRequest=function(e,t,n){var r=this;e.onload=function(){response=JSON.parse(this.responseText);if(response.error)return r.onError({name:"ServerResponse",message:"The server responded with an error"});n(response)},e.onerror=function(){},e.setRequestHeader("Content-Type","application/json"),e.setRequestHeader("X-CSRF-Token",$('meta[name="csrf-token"]').attr("content")),e.send(t)},t.prototype.createXhrRequest=function(){var e;return typeof XMLHttpRequest.constructor=="function"?e=XMLHttpRequest:typeof XDomainRequest!="undefined"?e=XDomainRequest:e=null,function(t,n,r,i){var s,o,i=!0;return s=Array.prototype.slice.call(arguments),typeof s[0]=="undefined"&&(r=null,i=!1),o=new e,i&&o.open(t,n,!0),o.onreadystatechange=r,o}}(),t.prototype.sliceBlob=function(){try{var e=new Blob}catch(t){return"Unsupported"}return e.slice?function(e,t,n){return e.slice(t,n)}:e.mozSlice?function(e,t,n){return e.mozSlice(t,n)}:e.webkitSlice?function(e,t,n){return e.webkitSlice(t,n)}:"Unsupported"}(),t.prototype._returnUploadObj=function(e){var t=_.find(this.uploadList,function(t){return t.key===e});return t},t.prototype.cancel=function(e){var t,n;t=this._returnUploadObj(e),n=_.indexOf(this.uploadList,t),this.uploadList.splice(n,n+1),this.onCancel()},t.prototype.pause=function(e){var t=this._returnUploadObj(e);_.each(t.parts,function(e,t,n){e.status=="active"&&e.pause()}),this.onPause()},t.prototype.resume=function(e){var t=this._returnUploadObj(e);_.each(t.parts,function(e,t,n){e.status=="paused"&&e.activate()}),this.onResume()},r.prototype.activate=function(){this.xhr.send(this.blob),this.status="active"},r.prototype.pause=function(){this.xhr.abort(),this.status="paused"},t}()})(this);
+(function(e){e.S3MP=function(){function t(t){var r,i=[],s=this;_.extend(this,t),this.headers=_.object(_.map(t.headers,function(e,t){return["x-amz-"+t.toLowerCase(),e]})),this.uploadList=[],this.handler={beginUpload:function(){function t(t,n){var r=n.key,i=n.parts.length;typeof e[r]=="undefined"&&(e[r]=0),e[r]++;if(e[r]===i){for(var o=0;o<t;o++)n.parts[o].activate();s.handler.startProgressTimer(r),s.onStart(n)}}var e=[];return t}(),onError:function(e,t){},onPartSuccess:function(e,t){var n,r,i;n=e.parts,t.status="complete",i=t.xhr.getResponseHeader("ETag"),e.Etags.push({ETag:i.replace(/\"/g,""),partNum:t.num}),e.uploaded+=t.size,e.inprogress[t.num]=0,r=_.indexOf(n,t),n.splice(r,1),n.length&&(r=_.findIndex(n,function(e,t,n){if(e.status!=="active")return!0}),r!==-1&&n[r].activate()),n.length||this.onComplete(e)},onComplete:function(e){var t=_.indexOf(s.uploadList,e);this.clearProgressTimer(t),s.completeMultipart(e,function(t){t.location&&s.onComplete(e)})},onProgress:function(e,t,n,r,i){s.onProgress(e,t,n,r,i)},startProgressTimer:function(){var t=[],n=function(n){i[n]=e.setInterval(function(){var e,r,i,o,u;typeof t[n]=="undefined"&&(t[n]=0),e=s.uploadList[n],r=e.size,i=e.uploaded,_.each(e.inprogress,function(e){i+=e}),o=i/r*100,u=i-t[n],t[n]=i,e.handler.onProgress(n,r,i,o,u)},1e3)};return n}(),clearProgressTimer:function(t){e.clearInterval(i[t])}},this.fileSelector?r=$(this.fileSelector).get(0).files:r=this.fileList,_.each(r,function(e,t){var r=new n(e,s,t);s.uploadList.push(r),r.init()})}function n(e,t,n){function i(){var t,i,s,o,u,a,f,l,c;t=this,this.key=n,this.file=e,this.name=e.name,this.size=e.size,this.type=e.type,this.Etags=[],this.inprogress=[],this.uploaded=0,this.status="",this.size>1e9?(num_segs=100,l=10):this.size>5e8?(num_segs=50,l=5):this.size>1e8?(num_segs=20,l=5):this.size>5e7?(num_segs=5,l=2):this.size>1e7?(num_segs=2,l=2):(num_segs=1,l=1),a=_.range(num_segs+1),f=_.map(a,function(t){return Math.round(t*(e.size/num_segs))}),t.sliceBlob=="Unsupported"?this.parts=[new r(e,0,t)]:(this.parts=_.map(f,function(n,i){return c=t.sliceBlob(e,n,f[i+1]),new r(c,i+1,t)}),this.parts.pop()),this.init=function(){t.initiateMultipart(t,function(e){var n=t.id=e.id,r=t.upload_id=e.upload_id,i=t.object_name=e.key,s=t.parts;t.signPartRequests(n,i,r,s,function(e){_.each(s,function(n,r){n.date=e[r].date,n.auth=e[r].authorization,t.handler.beginUpload(l,t)})})})}}return i.prototype=t,new i}function r(e,t,n){var r,i;r=this,this.size=e.size,this.blob=e,this.num=t,this.upload=n,this.xhr=i=n.createXhrRequest(),i.onload=function(){n.handler.onPartSuccess(n,r)},i.onerror=function(){n.handler.onError(n,r)},i.upload.onprogress=_.throttle(function(e){e.lengthComputable&&(n.inprogress[t]=e.loaded)},1e3)}return _.mixin({findIndex:function(e,t){for(var n=0;n<e.length;n++)if(t(e[n],n,e))return n;return-1}}),t.prototype.initiateMultipart=function(e,t){var n,r,i;n="/s3_multipart/uploads",r=JSON.stringify({object_name:e.name,content_type:e.type,content_size:e.size,headers:this.headers,context:$(this.fileInputElement).data("context"),uploader:$(this.fileInputElement).data("uploader")}),i=this.createXhrRequest("POST",n),this.deliverRequest(i,r,t)},t.prototype.signPartRequests=function(e,t,n,r,i){var s,o,u,a;s=_.reduce(_.rest(r),function(e,t){return e+"-"+t.size},r[0].size),o="/s3_multipart/uploads/"+e,u=JSON.stringify({object_name:t,upload_id:n,content_lengths:s}),a=this.createXhrRequest("PUT",o),this.deliverRequest(a,u,i)},t.prototype.completeMultipart=function(e,t){var n,r,i;n="/s3_multipart/uploads/"+e.id,r=JSON.stringify({object_name:e.object_name,upload_id:e.upload_id,content_length:e.size,parts:e.Etags}),i=this.createXhrRequest("PUT",n),this.deliverRequest(i,r,t)},t.prototype.deliverRequest=function(e,t,n){var r=this;e.onload=function(){response=JSON.parse(this.responseText);if(response.error)return r.onError({name:"ServerResponse",message:response.error});n(response)},e.onerror=function(){},e.setRequestHeader("Content-Type","application/json"),e.setRequestHeader("X-CSRF-Token",$('meta[name="csrf-token"]').attr("content")),e.send(t)},t.prototype.createXhrRequest=function(){var e;return typeof XMLHttpRequest.constructor=="function"?e=XMLHttpRequest:typeof XDomainRequest!="undefined"?e=XDomainRequest:e=null,function(t,n,r,i){var s,o,i=!0;return s=Array.prototype.slice.call(arguments),typeof s[0]=="undefined"&&(r=null,i=!1),o=new e,i&&o.open(t,n,!0),o.onreadystatechange=r,o}}(),t.prototype.sliceBlob=function(){try{var e=new Blob}catch(t){return"Unsupported"}return e.slice?function(e,t,n){return e.slice(t,n)}:e.mozSlice?function(e,t,n){return e.mozSlice(t,n)}:e.webkitSlice?function(e,t,n){return e.webkitSlice(t,n)}:"Unsupported"}(),t.prototype._returnUploadObj=function(e){var t=_.find(this.uploadList,function(t){return t.key===e});return t},t.prototype.cancel=function(e){var t,n;t=this._returnUploadObj(e),n=_.indexOf(this.uploadList,t),this.uploadList.splice(n,n+1),this.onCancel()},t.prototype.pause=function(e){var t=this._returnUploadObj(e);_.each(t.parts,function(e,t,n){e.status=="active"&&e.pause()}),this.onPause()},t.prototype.resume=function(e){var t=this._returnUploadObj(e);_.each(t.parts,function(e,t,n){e.status=="paused"&&e.activate()}),this.onResume()},r.prototype.activate=function(){this.xhr.open("PUT","http://"+this.upload.bucket+".s3.amazonaws.com/"+this.upload.object_name+"?partNumber="+this.num+"&uploadId="+this.upload.upload_id,!0),this.xhr.setRequestHeader("x-amz-date",this.date),this.xhr.setRequestHeader("Authorization",this.auth),this.xhr.send(this.blob),this.status="active"},r.prototype.pause=function(){this.xhr.abort(),this.status="paused"},t}()})(this);

metadata

@@ -1,125 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: s3_multipart
 version: !ruby/object:Gem::Version
-  version: 0.0.10.5
+  version: 0.0.10.6
 platform: ruby
 authors:
 - Max Gillett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'See github for installation and configuration '
@@ -130,7 +122,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -150,6 +142,7 @@ files:
 - javascripts/uploadpart.js
 - lib/generators/s3_multipart/install_generator.rb
 - lib/generators/s3_multipart/install_new_migrations_generator.rb
+- lib/generators/s3_multipart/templates/add_context_to_s3_multipart_uploads.rb
 - lib/generators/s3_multipart/templates/add_size_column_to_s3_multipart_uploads.rb
 - lib/generators/s3_multipart/templates/add_uploader_column_to_model.rb
 - lib/generators/s3_multipart/templates/aws.yml
@@ -272,17 +265,17 @@ 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.2.2
 signing_key: 
 specification_version: 4
 summary: Upload directly to S3 using multipart uploading