s3_multipart 0.0.7 → 0.0.8

data/.gitignore

@@ -14,4 +14,7 @@ _SpecRunner.html
 
 /node_modules
 
-/spec/internal/db/combustion_test.sqlite3
+/spec/internal/db/combustion_test.sqlite3
+
+*.swp
+*.swo

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3_multipart (0.0.6)
+    s3_multipart (0.0.8)
       uuid (>= 2.3.6)
       xml-simple (>= 1.1.2)
 

data/README.md

@@ -2,7 +2,7 @@
 
 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.
 
-Multipart uploading allows files to be split into many chunks and uploaded in parallel or succession (or both). This can result in dramatically increased upload speeds for the client and allows for the pausing and resuming of uploads. For a more complete overview of multipart uploading as it applies to S3, see the documentation [here](http://docs.amazonwebservices.com/AmazonS3/latest/dev/mpuoverview.html). 
+Multipart uploading allows files to be split into many chunks and uploaded in parallel or succession (or both). This can result in dramatically increased upload speeds for the client and allows for the pausing and resuming of uploads. For a more complete overview of multipart uploading as it applies to S3, see the documentation [here](http://docs.amazonwebservices.com/AmazonS3/latest/dev/mpuoverview.html). Read more about the philosophy behind the gem on the Bitcast [blog](http://blog.bitcast.io/post/43001057745/direct-multipart-uploads-to-s3-in-rails).
 
 ## Setup
 
@@ -106,6 +106,9 @@ class VideoUploader < ApplicationController
   # relationship between the internal upload model and the given model.
   attach :video
 
+  # Only accept certain file types. Expects an array of valid extensions.
+  accept %w(wmv avi mp4 mkv mov mpeg)
+
   # Takes in a block that will be evaluated when the upload has been 
   # successfully initiated. The block will be passed an instance of 
   # the upload object as well as the session hash when the callback is made. 
@@ -137,15 +140,14 @@ The generator also creates the migration to add this functionality, so make sure
 To add the multipart uploader to a view, insert the following:
 
 ```ruby
-<%= multipart_uploader_form(types: ['video/mpeg'],
-                            input_name: 'uploader',
+<%= multipart_uploader_form(input_name: 'uploader',
                             uploader: 'VideoUploader'
                             button_class: 'submit-button', 
                             button_text: 'Upload selected videos',
                             html: %Q{<button class="upload-button">Select videos</button>}) %>
 ```
 
-The `multipart_uploader_form` function is a view helper, and generates the necessary input elements. It takes in a array of allowed MIME types and a string of html to be interpolated between the generated file input element and submit button. It also expects an upload controller (as a string or constant) to be passed in with the 'uploader' option. This links the upload form with the callbacks specified in the given controller.
+The `multipart_uploader_form` function is a view helper, and generates the necessary input elements. It takes in a string of html to be interpolated between the generated file input element and submit button. It also expects an upload controller (as a string or constant) to be passed in with the 'uploader' option. This links the upload form with the callbacks specified in the given controller.
 
 The code above outputs this:
 
@@ -204,11 +206,16 @@ To re-build the javascript library, run `grunt concat` and to minify, `grunt min
 
 S3_Multipart is very much a work in progress. If you squash a bug, make enhancements, or write more tests, please submit a pull request. 
 
+## Browser Compatibility
+
+The library is working on the latest version of IE, Firefox, Safari, and Chrome. Tests for over 100 browsers are currently being conducted.
+
 ## To Do
 
-* If the FileBlob API is not supported on page load, the uploader should just send one giant chunk
+* ~~If the FileBlob API is not supported on page load, the uploader should just send one giant chunk~~ (DONE)
 * Handle network errors in the javascript client library
-* Modular validations (checking file size and type)
+* ~~File type validations~~ (DONE)
+* File size validations
 * More and better tests
 * More browser testing 
-* Roll file signing and initiation into one request
+* Roll file signing and initiation into one request

data/app/controllers/s3_multipart/uploads_controller.rb

@@ -1,11 +1,11 @@
 module S3Multipart
   class UploadsController < ApplicationController
+  
     def create
       begin
-        response = Upload.initiate(params)
-        upload = Upload.create(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"])
-        response["id"] = upload["id"]
+        upload = Upload.create(params)
         upload.execute_callback(:begin, session)
+        response = upload.to_json
       rescue
         response = {error: 'There was an error initiating the upload'}
       ensure
@@ -55,4 +55,4 @@ module S3Multipart
       end
 
   end
-end
+end

data/app/models/s3_multipart/upload.rb

@@ -3,9 +3,15 @@ module S3Multipart
     extend S3Multipart::TransferHelpers
 
     attr_accessible :key, :upload_id, :name, :location, :uploader
+#before_create :validate_mime_types
+
+    def self.create(params)
+      response = initiate(params)
+      super(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"])
+    end
 
     def execute_callback(stage, session)
-      controller = S3Multipart::Uploader.deserialize(uploader)
+      controller = deserialize(uploader)
       
       case stage
       when :begin
@@ -15,5 +21,20 @@ module S3Multipart
       end
     end
 
+    private
+
+      def validate_mime_types(upload)
+        ext = upload.name.match(/\.([a-zA-Z0-9]+)$/)[1]
+        controller = deserialize(upload.uploader)
+
+        if !controller.file_types.include?(ext)
+          return false
+        end
+      end
+
+      def deserialize(uploader)
+        S3Multipart::Uploader.deserialize(uploader)
+      end
+
   end
-end
+end

data/javascripts/s3mp.js

@@ -141,12 +141,10 @@ function S3MP(options) {
   }
 
   _.each(files, function(file, key) {
-    //Do validation for each file before creating a new upload object
-    // if (!file.type.match(/video/)) {
-    //   return false;
-    // }
     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);
@@ -326,4 +324,4 @@ S3MP.prototype.resume = function(key) {
   });
 
   this.onResume();          
-};
+};

data/javascripts/upload.js

@@ -26,25 +26,25 @@ function Upload(file, o, key) {
     } else if (this.size > 100000000) { // greater than 100 mb
       num_segs = 20;
       pipes = 5;
-    } else if (this.size > 5000000) { // greater than 5 mb (S3 does not allow multipart uploads < 5 mb)
+    } else { // greater than 5 mb (S3 does not allow multipart uploads < 5 mb)
       num_segs = 2;
       pipes = 2;
-    } else { 
-      num_segs = 10;
-      pipes = 3;
-    }         
+    }  
 
     chunk_segs = _.range(num_segs + 1);
     chunk_lens = _.map(chunk_segs, function(seg) {
       return Math.round(seg * (file.size/num_segs));
     });
 
-    this.parts = _.map(chunk_lens, function(len, i) {
-      blob = upload.sliceBlob(file, len, chunk_lens[i+1]);
-      return new UploadPart(blob, i+1, upload);
-    });
-
-    this.parts.pop(); // Remove the empty blob at the end of the array
+    if (upload.sliceBlob == "Unsupported") {
+      this.parts = [new UploadPart(file, 0, upload)];
+    } else {
+      this.parts = _.map(chunk_lens, function(len, i) {
+        blob = upload.sliceBlob(file, len, chunk_lens[i+1]);
+        return new UploadPart(blob, i+1, upload);
+      });
+      this.parts.pop(); // Remove the empty blob at the end of the array
+    }
 
     // init function will initiate the multipart upload, sign all the parts, and 
     // start uploading some parts in parallel
@@ -73,4 +73,4 @@ function Upload(file, o, key) {
   // Inherit the properties and prototype methods of the passed in S3MP instance object
   Upload.prototype = o;
   return new Upload(); 
-}
+}

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

@@ -5,9 +5,12 @@ class <%= model_constant %>Uploader < ApplicationController
   # relationship between the internal upload model and the given model.
   attach :<%= model %>
 
+  # Only accept certain file types. Expects an array of valid extensions.
+  accept %w(wmv avi mp4 mkv mov mpeg)
+
   # Takes in a block that will be evaluated when the upload has been 
   # successfully initiated. The block will be passed an instance of 
-  # the upload object when the callback is made. 
+  # the upload object as well as the session hashwhen the callback is made. 
   # 
   # The following attributes are available on the upload object:
   # - key:       A randomly generated unique key to replace the file
@@ -17,13 +20,13 @@ class <%= model_constant %>Uploader < ApplicationController
   # - location:  The location of the file on S3. Available only to the
   #              upload object passed into the on_complete callback
   #
-  on_begin do |upload|
+  on_begin do |upload, session|
     # Code to be evaluated when upload begins.
   end
 
   # See above comment. Called when the upload has successfully completed
-  on_complete do |upload|
+  on_complete do |upload, session|
     # Code to be evaluated when upload completes                                                 
   end
 
-end
+end

data/lib/s3_multipart/engine.rb

@@ -2,4 +2,4 @@ module S3Multipart
   class Engine < Rails::Engine
     isolate_namespace S3Multipart
   end
-end
+end

data/lib/s3_multipart/railtie.rb

@@ -8,6 +8,10 @@ if defined?(Rails)
         end
       end
 
+      initializer "s3_multipart.active_record" do
+        ActiveRecord::Base.include_root_in_json = false
+      end
+
       # Load all of the upload controllers in app/uploaders/multipart
       initializer "s3_multipart.load_upload_controllers" do
         begin
@@ -22,4 +26,4 @@ if defined?(Rails)
 
     end
   end
-end
+end

data/lib/s3_multipart/uploader/validations.rb

@@ -2,8 +2,12 @@ module S3Multipart
   module Uploader
     module Validations
 
-      # To do
+      attr_accessor :file_types
+
+      def accept(types)
+        self.file_types = types         
+      end
 
     end
   end 
-end
+end

data/lib/s3_multipart/version.rb

@@ -1,3 +1,3 @@
 module S3Multipart
-  VERSION = "0.0.7"
-end
+  VERSION = "0.0.8"
+end

data/package.json

@@ -1,9 +1,9 @@
 {
   "name": "s3_multipart",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "devDependencies": {
     "grunt": "latest",
     "grunt-contrib-uglify": "latest",
     "grunt-jasmine-runner": "latest"
   }
-}
+}

data/spec/integration/uploads_controller_spec.rb

@@ -3,8 +3,8 @@ require "digest/sha1"
 
 describe "Uploads controller" do
   it "should create an upload" do
-    post '/s3_multipart/uploads', {object_name: "example_object", content_type: "video/x-ms-wmv", uploader: Digest::SHA1.hexdigest("VideoUploader")}
+    post '/s3_multipart/uploads', {object_name: "example_object.wmv", content_type: "video/x-ms-wmv", uploader: Digest::SHA1.hexdigest("VideoUploader")}
     parsed_body = JSON.parse(response.body)
     parsed_body.should_not eq({"error"=>"There was an error initiating the upload"})
   end
-end
+end

data/spec/internal/app/uploaders/multipart/video_uploader.rb

@@ -5,6 +5,9 @@ class VideoUploader < ApplicationController
   # relationship between the internal upload model and the given model.
   attach :video
 
+  # Only accept certain file types. Expects an array of valid extensions.
+  accept %w(wmv avi mp4 mkv mov mpeg)
+
   # Takes in a block that will be evaluated when the upload has been 
   # successfully initiated. The block will be passed an instance of 
   # the upload object when the callback is made. 
@@ -29,4 +32,4 @@ class VideoUploader < ApplicationController
     # Code to be evaluated when upload completes                                                 
   end
 
-end
+end

data/spec/unit/upload_controller_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper.rb'
 describe "An upload controller" do
 
   before(:all) do
-    class Uploader
+    class GenericUploader
       extend S3Multipart::Uploader::Core
     end
   end
 
   it "should set up callbacks" do
-    Uploader.class_eval do
+    GenericUploader.class_eval do
       on_begin do |upload|
         "Upload has begun"
       end
@@ -19,13 +19,19 @@ describe "An upload controller" do
       end
     end
 
-    Uploader.on_begin_callback.call.should eql("Upload has begun")
-    Uploader.on_complete_callback.call.should eql("Upload has completed")
+    GenericUploader.on_begin_callback.call.should eql("Upload has begun")
+    GenericUploader.on_complete_callback.call.should eql("Upload has completed")
   end
 
   it "should attach a model to the uploader" do
-    Uploader.attach :video
+    GenericUploader.attach :video
     S3Multipart::Upload.new.respond_to?(:video).should be_true
   end
 
-end
+  it "should store the allowed file types" do
+    exts = %w(wmv avi mp4 mkv mov mpeg) 
+    GenericUploader.accept(exts)
+    GenericUploader.file_types.should eql(exts)
+  end
+
+end

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

@@ -155,12 +155,10 @@ function S3MP(options) {
   }
 
   _.each(files, function(file, key) {
-    //Do validation for each file before creating a new upload object
-    // if (!file.type.match(/video/)) {
-    //   return false;
-    // }
     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);
@@ -341,6 +339,7 @@ S3MP.prototype.resume = function(key) {
 
   this.onResume();          
 };
+
 // Upload constructor
 function Upload(file, o, key) {
   function Upload() {
@@ -369,25 +368,25 @@ function Upload(file, o, key) {
     } else if (this.size > 100000000) { // greater than 100 mb
       num_segs = 20;
       pipes = 5;
-    } else if (this.size > 5000000) { // greater than 5 mb (S3 does not allow multipart uploads < 5 mb)
+    } else { // greater than 5 mb (S3 does not allow multipart uploads < 5 mb)
       num_segs = 2;
       pipes = 2;
-    } else { 
-      num_segs = 10;
-      pipes = 3;
-    }         
+    }  
 
     chunk_segs = _.range(num_segs + 1);
     chunk_lens = _.map(chunk_segs, function(seg) {
       return Math.round(seg * (file.size/num_segs));
     });
 
-    this.parts = _.map(chunk_lens, function(len, i) {
-      blob = upload.sliceBlob(file, len, chunk_lens[i+1]);
-      return new UploadPart(blob, i+1, upload);
-    });
-
-    this.parts.pop(); // Remove the empty blob at the end of the array
+    if (upload.sliceBlob == "Unsupported") {
+      this.parts = [new UploadPart(file, 0, upload)];
+    } else {
+      this.parts = _.map(chunk_lens, function(len, i) {
+        blob = upload.sliceBlob(file, len, chunk_lens[i+1]);
+        return new UploadPart(blob, i+1, upload);
+      });
+      this.parts.pop(); // Remove the empty blob at the end of the array
+    }
 
     // init function will initiate the multipart upload, sign all the parts, and 
     // start uploading some parts in parallel
@@ -417,6 +416,7 @@ function Upload(file, o, key) {
   Upload.prototype = o;
   return new Upload(); 
 }
+
 // Upload part constructor 
 function UploadPart(blob, key, upload) {
   var part, xhr;

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>5e6?(num_segs=2,l=2):(num_segs=10,l=3),a=_.range(num_segs+1),f=_.map(a,function(t){return Math.round(t*(e.size/num_segs))}),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]=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,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.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):(num_segs=2,l=2),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]=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,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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_multipart
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Upload directly to S3 using multipart uploading