fileapi 0.1.0 → 0.1.2

data/app/assets/javascripts/fileapi/FileAPI.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.9 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.11 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of  javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -105,6 +105,7 @@
 		document = window.document,
 		doctype = document.doctype || {},
 		userAgent = window.navigator.userAgent,
+		safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
 
 		// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
 		apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),
@@ -119,12 +120,14 @@
 		jQuery = window.jQuery,
 
 		html5 =    !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
-				&& !(/safari\//i.test(userAgent) && !/chrome\//i.test(userAgent) && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
+				&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
 
 		cors = html5 && ('withCredentials' in (new XMLHttpRequest)),
 
 		chunked = html5 && !!Blob && !!(Blob.prototype.webkitSlice || Blob.prototype.mozSlice || Blob.prototype.slice),
 
+		normalize = ('' + ''.normalize).indexOf('[native code]') > 0,
+
 		// https://github.com/blueimp/JavaScript-Canvas-to-Blob
 		dataURLtoBlob = window.dataURLtoBlob,
 
@@ -280,7 +283,7 @@
 		 * FileAPI (core object)
 		 */
 		api = {
-			version: '2.0.9',
+			version: '2.0.11',
 
 			cors: false,
 			html5: true,
@@ -795,28 +798,84 @@
 			getDropFiles: function (evt, callback){
 				var
 					  files = []
+					, all = []
+					, items
 					, dataTransfer = _getDataTransfer(evt)
-					, entrySupport = _isArray(dataTransfer.items) && dataTransfer.items[0] && _getAsEntry(dataTransfer.items[0])
-					, queue = api.queue(function (){ callback(files); })
+					, transFiles = dataTransfer.files
+					, transItems = dataTransfer.items
+					, entrySupport = _isArray(transItems) && transItems[0] && _getAsEntry(transItems[0])
+					, queue = api.queue(function (){ callback(files, all); })
 				;
 
-				_each((entrySupport ? dataTransfer.items : dataTransfer.files) || [], function (item){
+				if( entrySupport ){
+					if( normalize && transFiles ){
+						var
+							i = transFiles.length
+							, file
+							, entry
+						;
+
+						items = new Array(i);
+						while( i-- ){
+							file = transFiles[i];
+
+							try {
+								entry = _getAsEntry(transItems[i]);
+							}
+							catch( err ){
+								api.log('[err] getDropFiles: ', err);
+								entry = null;
+							}
+
+							if( _isEntry(entry) ){
+								// OSX filesystems use Unicode Normalization Form D (NFD),
+								// and entry.file(…) can't read the files with the same names
+								if( entry.isDirectory || (entry.isFile && file.name == file.name.normalize('NFC')) ){
+									items[i] = entry;
+								}
+								else {
+									items[i] = file;
+								}
+							}
+							else {
+								items[i] = file;
+							}
+						}
+					}
+					else {
+						items = transItems;
+					}
+				}
+				else {
+					items = transFiles;
+				}
+
+				_each(items || [], function (item){
 					queue.inc();
 
 					try {
-						if( entrySupport ){
-							_readEntryAsFiles(item, function (err, entryFiles){
+						if( entrySupport && _isEntry(item) ){
+							_readEntryAsFiles(item, function (err, entryFiles, allEntries){
 								if( err ){
 									api.log('[err] getDropFiles:', err);
 								} else {
 									files.push.apply(files, entryFiles);
 								}
+								all.push.apply(all, allEntries);
+
 								queue.next();
 							});
 						}
 						else {
-							_isRegularFile(item, function (yes){
-								yes && files.push(item);
+							_isRegularFile(item, function (yes, err){
+								if( yes ){
+									files.push(item);
+								}
+								else {
+									item.error = err;
+								}
+								all.push(item);
+
 								queue.next();
 							});
 						}
@@ -1491,13 +1550,13 @@
 	}
 
 
-	function _hasSupportReadAs(as){
-		return	FileReader && !!FileReader.prototype['readAs'+as];
+	function _hasSupportReadAs(method){
+		return	FileReader && !!FileReader.prototype['readAs' + method];
 	}
 
 
-	function _readAs(file, fn, as, encoding){
-		if( api.isBlob(file) && _hasSupportReadAs(as) ){
+	function _readAs(file, fn, method, encoding){
+		if( api.isBlob(file) && _hasSupportReadAs(method) ){
 			var Reader = new FileReader;
 
 			// Add event listener
@@ -1519,10 +1578,10 @@
 			try {
 				// ReadAs ...
 				if( encoding ){
-					Reader['readAs'+as](file, encoding);
+					Reader['readAs' + method](file, encoding);
 				}
 				else {
-					Reader['readAs'+as](file);
+					Reader['readAs' + method](file);
 				}
 			}
 			catch (err){
@@ -1530,33 +1589,36 @@
 			}
 		}
 		else {
-			_emit(file, fn, 'error', undef, { error: 'filreader_not_support_'+as });
+			_emit(file, fn, 'error', undef, { error: 'filreader_not_support_' + method });
 		}
 	}
 
 
 	function _isRegularFile(file, callback){
 		// http://stackoverflow.com/questions/8856628/detecting-folders-directories-in-javascript-filelist-objects
-		if( !file.type && (file.size % 4096) === 0 && (file.size <= 102400) ){
+		if( !file.type && (safari || ((file.size % 4096) === 0 && (file.size <= 102400))) ){
 			if( FileReader ){
 				try {
-					var Reader = new FileReader();
+					var reader = new FileReader();
 
-					_one(Reader, _readerEvents, function (evt){
+					_one(reader, _readerEvents, function (evt){
 						var isFile = evt.type != 'error';
-						callback(isFile);
 						if( isFile ){
-							Reader.abort();
+							reader.abort();
+							callback(isFile);
+						}
+						else {
+							callback(false, reader.error);
 						}
 					});
 
-					Reader.readAsDataURL(file);
+					reader.readAsDataURL(file);
 				} catch( err ){
-					callback(false);
+					callback(false, err);
 				}
 			}
 			else {
-				callback(null);
+				callback(null, new Error('FileReader is not supported'));
 			}
 		}
 		else {
@@ -1565,6 +1627,11 @@
 	}
 
 
+	function _isEntry(item){
+		return item && (item.isFile || item.isDirectory);
+	}
+
+
 	function _getAsEntry(item){
 		var entry;
 		if( item.getAsEntry ){ entry = item.getAsEntry(); }
@@ -1576,45 +1643,68 @@
 	function _readEntryAsFiles(entry, callback){
 		if( !entry ){
 			// error
-			callback('invalid entry');
+			var err = new Error('invalid entry');
+			entry = new Object(entry);
+			entry.error = err;
+			callback(err.message, [], [entry]);
 		}
 		else if( entry.isFile ){
 			// Read as file
-			entry.file(function(file){
+			entry.file(function (file){
 				// success
 				file.fullPath = entry.fullPath;
-				callback(false, [file]);
+				callback(false, [file], [file]);
 			}, function (err){
 				// error
-				callback('FileError.code: '+err.code);
+				entry.error = err;
+				callback('FileError.code: ' + err.code, [], [entry]);
 			});
 		}
 		else if( entry.isDirectory ){
-			var reader = entry.createReader(), result = [];
+			var
+				reader = entry.createReader()
+				, firstAttempt = true
+				, files = []
+				, all = [entry]
+			;
+
+			var onerror = function (err){
+				// error
+				entry.error = err;
+				callback('DirectoryError.code: ' + err.code, files, all);
+			};
+			var ondone = function ondone(entries){
+				if( firstAttempt ){
+					firstAttempt = false;
+					if( !entries.length ){
+						entry.error = new Error('directory is empty');
+					}
+				}
 
-			reader.readEntries(function(entries){
 				// success
-				api.afor(entries, function (next, entry){
-					_readEntryAsFiles(entry, function (err, files){
-						if( err ){
-							api.log(err);
-						}
-						else {
-							result = result.concat(files);
-						}
+				if( entries.length ){
+					api.afor(entries, function (next, entry){
+						_readEntryAsFiles(entry, function (err, entryFiles, allEntries){
+							if( !err ){
+								files = files.concat(entryFiles);
+							}
+							all = all.concat(allEntries);
 
-						if( next ){
-							next();
-						}
-						else {
-							callback(false, result);
-						}
+							if( next ){
+								next();
+							}
+							else {
+								reader.readEntries(ondone, onerror);
+							}
+						});
 					});
-				});
-			}, function (err){
-				// error
-				callback('directory_reader: ' + err);
-			});
+				}
+				else {
+					callback(false, files, all);
+				}
+			};
+
+			reader.readEntries(ondone, onerror);
 		}
 		else {
 			_readEntryAsFiles(_getAsEntry(entry), callback);
@@ -1735,8 +1825,8 @@
 				_type = 0;
 				onHover.call(evt[currentTarget], false, evt);
 
-				api.getDropFiles(evt, function (files){
-					onDrop.call(evt[currentTarget], files, evt);
+				api.getDropFiles(evt, function (files, all){
+					onDrop.call(evt[currentTarget], files, all, evt);
 				});
 			});
 		}
@@ -2528,7 +2618,13 @@
 			});
 
 			this.each(function (file){
-				next(file, data, queue, arg);
+				try{
+					next(file, data, queue, arg);
+				}
+				catch( err ){
+					api.log('FileAPI.Form._to: ' + err.message);
+					complete(err);
+				}
 			});
 
 			queue.check();
@@ -2756,14 +2852,19 @@
 			var _this = this, options = this.options;
 
 			FormData.toData(function (data){
-				// Start uploading
-				options.upload(options, _this);
-				_this._send.call(_this, options, data);
+				if( data instanceof Error ){
+					_this.end(0, data.message);
+				}
+				else{
+					// Start uploading
+					options.upload(options, _this);
+					_this._send.call(_this, options, data);
+				}
 			}, options);
 		},
 
 		_send: function (options, data){
-			var _this = this, xhr, uid = _this.uid, onloadFuncName = _this.uid + "Load", url = options.url;
+			var _this = this, xhr, uid = _this.uid, onLoadFnName = _this.uid + "Load", url = options.url;
 
 			api.log('XHR._send:', data);
 
@@ -2802,7 +2903,7 @@
 						_this.end(status, statusText);
 
 						api.event.off(window, 'message', onPostMessage);
-						window[uid] = xhr = transport = window[onloadFuncName] = null;
+						window[uid] = xhr = transport = window[onLoadFnName] = null;
 					}
 				;
 
@@ -2818,7 +2919,7 @@
 
 				api.event.on(window, 'message', onPostMessage);
 
-				window[onloadFuncName] = function (){
+				window[onLoadFnName] = function (){
 					try {
 						var
 							  win = transport.contentWindow
@@ -2833,7 +2934,7 @@
 
 				xhr = document.createElement('div');
 				xhr.innerHTML = '<form target="'+ uid +'" action="'+ url +'" method="POST" enctype="multipart/form-data" style="position: absolute; top: -1000px; overflow: hidden; width: 1px; height: 1px;">'
-							+ '<iframe name="'+ uid +'" src="javascript:false;" onload="' + onloadFuncName + '()"></iframe>'
+							+ '<iframe name="'+ uid +'" src="javascript:false;" onload="window.' + onLoadFnName + ' && ' + onLoadFnName + '();"></iframe>'
 							+ (jsonp && (options.url.indexOf('=?') < 0) ? '<input value="'+ uid +'" name="'+jsonp+'" type="hidden"/>' : '')
 							+ '</form>'
 				;
@@ -2856,7 +2957,11 @@
 
 				// send
 				_this.readyState = 2; // loaded
-				form.submit();
+				try {
+					form.submit();
+				} catch (err) {
+					api.log('iframe.error: ' + err);
+				}
 				form = null;
 			}
 			else {
@@ -3487,7 +3592,7 @@
 
 						if( api.multiFlash ){
 							// check state:
-							//   i — published
+							//   p — published
 							//   i — initialization
 							//   r — ready
 							if( state == 'i' || state == 'r' ){
@@ -3649,8 +3754,8 @@
 					try {
 						api.log('(js -> flash).'+name+':', data);
 						return flash.get(id.flashId || id).cmd(name, data);
-					} catch (e){
-						api.log('(js -> flash).onError:', e);
+					} catch (err){
+						api.log('(js -> flash).onError:', err.toString());
 						if( !last ){
 							// try again
 							setTimeout(function (){ flash.cmd(id, name, data, true); }, 50);
@@ -4125,10 +4230,8 @@
     var _each = api.each,
         _cameraQueue = [];
 
-
-    if (api.support.flash && (api.media && !api.support.media)) {
+    if (api.support.flash && (api.media && (!api.support.media || !api.html5))) {
         (function () {
-
             function _wrap(fn) {
                 var id = fn.wid = api.uid();
                 api.Flash._fn[id] = fn;

data/app/assets/javascripts/fileapi/config.coffee

@@ -1,3 +1,3 @@
 window.FileAPI =
-  debug: true
-  staticPath: '/js/jquery.fileapi/FileAPI/'
+  debug: false
+  staticPath: '/js/jquery.fileapi/FileAPI/'

data/lib/fileapi/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Fileapi
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fileapi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -95,18 +95,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -202280194601742829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -202280194601742829
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24