s3_multipart 0.0.8 → 0.0.9

data/README.md

@@ -109,6 +109,9 @@ class VideoUploader < ApplicationController
   # Only accept certain file types. Expects an array of valid extensions.
   accept %w(wmv avi mp4 mkv mov mpeg)
 
+  # Define the minimum and maximum allowed file sizes (in bytes)
+  limit min: 5*1000*1000, max: 2*1000*1000*1000
+
   # 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. 
@@ -141,7 +144,7 @@ To add the multipart uploader to a view, insert the following:
 
 ```ruby
 <%= multipart_uploader_form(input_name: 'uploader',
-                            uploader: 'VideoUploader'
+                            uploader: 'VideoUploader',
                             button_class: 'submit-button', 
                             button_text: 'Upload selected videos',
                             html: %Q{<button class="upload-button">Select videos</button>}) %>
@@ -210,12 +213,16 @@ S3_Multipart is very much a work in progress. If you squash a bug, make enhancem
 
 The library is working on the latest version of IE, Firefox, Safari, and Chrome. Tests for over 100 browsers are currently being conducted.
 
+## What's New
+
+**0.0.9** - File type and size validations are now specified in the upload controller. Untested support for browsers that lack the FileBlob API
+
 ## To Do
 
 * ~~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
 * ~~File type validations~~ (DONE)
-* File size validations
+* ~~File size validations~~ (DONE)
 * More and better tests
 * More browser testing 
 * Roll file signing and initiation into one request

data/app/controllers/s3_multipart/uploads_controller.rb

@@ -6,7 +6,9 @@ module S3Multipart
         upload = Upload.create(params)
         upload.execute_callback(:begin, session)
         response = upload.to_json
-      rescue
+      rescue FileTypeError, FileSizeError => e
+        response = {error: e.message}
+      rescue 
         response = {error: 'There was an error initiating the upload'}
       ensure
         render :json => response

data/app/models/s3_multipart/upload.rb

@@ -2,12 +2,12 @@ module S3Multipart
   class Upload < ::ActiveRecord::Base
     extend S3Multipart::TransferHelpers
 
-    attr_accessible :key, :upload_id, :name, :location, :uploader
-#before_create :validate_mime_types
+    attr_accessible :key, :upload_id, :name, :location, :uploader, :size
+    before_create :validate_file_type, :validate_file_size
 
     def self.create(params)
       response = initiate(params)
-      super(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"])
+      super(key: response["key"], upload_id: response["upload_id"], name: response["name"], uploader: params["uploader"], size: params["content_size"])
     end
 
     def execute_callback(stage, session)
@@ -23,12 +23,19 @@ module S3Multipart
 
     private
 
-      def validate_mime_types(upload)
-        ext = upload.name.match(/\.([a-zA-Z0-9]+)$/)[1]
-        controller = deserialize(upload.uploader)
+      def validate_file_size
+        size = self.size
+        limits = deserialize(self.uploader).size_limits
+        raise FileSizeError, "File size is too small" if limits[:min] > size
+        raise FileSizeError, "File size is too large" if limits[:max] < size 
+      end
+
+      def validate_file_type
+        ext = self.name.match(/\.([a-zA-Z0-9]+)$/)[1]
+        controller = deserialize(self.uploader)
 
         if !controller.file_types.include?(ext)
-          return false
+          raise FileTypeError, "File type not supported"
         end
       end
 

data/javascripts/s3mp.js

@@ -160,6 +160,7 @@ S3MP.prototype.initiateMultipart = function(upload, cb) {
   url = '/s3_multipart/uploads';
   body = JSON.stringify({ object_name  : upload.name,
                           content_type : upload.type,
+                          content_size : upload.size,
                           uploader     : $(this.fileInputElement).data("uploader")
                         });
 

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

@@ -8,6 +8,9 @@ class <%= model_constant %>Uploader < ApplicationController
   # Only accept certain file types. Expects an array of valid extensions.
   accept %w(wmv avi mp4 mkv mov mpeg)
 
+  # Define the minimum and maximum allowed file sizes (in bytes)
+  limit min: 5*1000*1000, max: 2*1000*1000*1000
+
   # 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 hashwhen the callback is made. 

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

@@ -7,8 +7,9 @@ class CreateS3MultipartUploads < ActiveRecord::Migration
       t.string :key
       t.string :name
       t.string :uploader
+      t.integer :size
 
       t.timestamps
     end
   end
-end
+end

data/lib/s3_multipart/railtie.rb

@@ -15,7 +15,7 @@ if defined?(Rails)
       # Load all of the upload controllers in app/uploaders/multipart
       initializer "s3_multipart.load_upload_controllers" do
         begin
-          uploaders = Dir.entries(Rails.root.join('app', 'uploaders', 'multipart').to_s).keep_if {|n| n =~ /[uploader]/}
+          uploaders = Dir.entries(Rails.root.join('app', 'uploaders', 'multipart').to_s).keep_if {|n| n =~ /uploader\.rb$/}
           uploaders.each do |uploader|
             require "#{Rails.root.join('app', 'uploaders', 'multipart')}/#{uploader}"
           end

data/lib/s3_multipart/uploader/validations.rb

@@ -2,12 +2,16 @@ module S3Multipart
   module Uploader
     module Validations
 
-      attr_accessor :file_types
+      attr_accessor :file_types, :size_limits
 
       def accept(types)
         self.file_types = types         
       end
 
+      def limit(sizes)
+        self.size_limits = sizes
+      end
+
     end
   end 
 end

data/lib/s3_multipart/uploader.rb

@@ -16,7 +16,6 @@ module S3Multipart
       controllers[controller.to_s.to_sym]
     end
 
-    # What is wrong with this method?
     def self.deserialize(digest)
       controllers.key(digest).to_s.constantize
     end

data/lib/s3_multipart/version.rb

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

data/lib/s3_multipart.rb

@@ -18,6 +18,9 @@ module S3Multipart
 
   end
 
+  class FileTypeError < StandardError; end
+  class FileSizeError < StandardError; end
+
 end
 
 require 's3_multipart/config'
@@ -25,4 +28,4 @@ require 's3_multipart/railtie'
 require 's3_multipart/engine'
 require 's3_multipart/http/net_http'
 require 's3_multipart/uploader'
-require 's3_multipart/transfer_helpers'
+require 's3_multipart/transfer_helpers'

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

@@ -8,6 +8,9 @@ class VideoUploader < ApplicationController
   # Only accept certain file types. Expects an array of valid extensions.
   accept %w(wmv avi mp4 mkv mov mpeg)
 
+  # Define the minimum and maximum allowed file sizes (in bytes)
+  limit min: 5*1000*1000, max: 2*1000*1000*1000
+
   # 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. 

data/spec/internal/db/schema.rb

@@ -5,6 +5,7 @@ ActiveRecord::Schema.define do
     t.string   "key"
     t.string   "name"
     t.string   "uploader"
+    t.integer  "size"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

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

@@ -174,6 +174,7 @@ S3MP.prototype.initiateMultipart = function(upload, cb) {
   url = '/s3_multipart/uploads';
   body = JSON.stringify({ object_name  : upload.name,
                           content_type : upload.type,
+                          content_size : upload.size,
                           uploader     : $(this.fileInputElement).data("uploader")
                         });
 

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):(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);
+(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,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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_multipart
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-03-06 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.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Upload directly to S3 using multipart uploading