condo 1.0.0 → 1.0.1

data/README.textile

@@ -32,8 +32,8 @@ This has numerous advantages over traditional Form Data style post uploads too.
 * Resumability when uploading large files
 
 
-Support for all major browsers and IE10.
-* Tested in Firefox 4, Safari 6 and Chromes latest stable
+Support for all major browsers
+* Tested in Firefox 4, Safari 6, Chromes latest stable and IE10 (IE10 on Win7)
 
 
 h2. Usage
@@ -73,7 +73,8 @@ See the "example application":https://github.com/cotag/condo_example which imple
 If you are using "Condo Interface":https://github.com/cotag/condo_interface then you may want to do the following:
 # Create an index for your controller @def index; end@
 # Create an index.html.erb in your view with:
-#* @<div class="uploads-container" data-ng-app="CondoUploader"><%= render "condo_interface/upload" %></div>@
+# Make sure your AngularJS app includes: @angular.module('YourApp', ['CondoUploader', 'CondoInterface']);@
+#* @<div data-ng-app="YourApp"><%= render "condo_interface/upload" %></div>@
 
 Alternative you could load an AngularJS template linking to <%= asset_path('templates/_upload.html') %>
 

data/app/assets/javascripts/condo.js

@@ -1,7 +1,5 @@
-//= require condo/spark-md5
+//= require condo/abstract-md5
 //= require condo/base64
+//= require condo/broadcaster
 //= require condo/uploader
-//= require condo/amazon
-//= require condo/rackspace
-//= require condo/google
 //= require condo/controller

data/app/assets/javascripts/condo/abstract-md5.js.erb

@@ -0,0 +1,87 @@
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define('condo-abstract-md5', ['jquery', 'condo-broadcaster'], factory);
+	} else {
+		// Browser global
+		factory(jQuery);
+	}
+}(function ($, uploads, undefined) {
+	'use strict';
+	
+	angular.module('CondoAbstractMd5', ['CondoBroadcaster'])
+		.factory('Condo.Md5', ['$rootScope', '$q', 'Condo.Broadcast', function($rootScope, $q, broadcaster) {
+		
+		var hasher,
+			queue = [],
+			ready = false,
+			processing = undefined,
+			
+			//
+			// Resolves the hashing promise
+			//
+			recievedMessage = function(e) {
+				if(e.data.success) {
+					processing.result.resolve(e.data.result);
+				} else {
+					processing.result.reject(e.data.result);
+				}
+				
+				processing = undefined;
+				processNext();
+				
+				if(!$rootScope.$$phase) {
+					$rootScope.$apply();					// This triggers the promise response
+				}
+			},
+			
+			//
+			// starts processing the next item if the queue is not empty
+			//
+			processNext = function() {
+				if(ready && processing === undefined && queue.length > 0) {
+					processing = queue.pop();
+					hasher.postMessage(processing.blob);
+				}
+			};
+		
+		
+		if(!!window.Worker) {
+			hasher = new Worker('<%= asset_path("condo/md5/hash.worker.js") %>');
+			hasher.onmessage = recievedMessage;
+			hasher.onerror = function(e) {
+				ready = false;
+				broadcaster.broadcast('coComponentLoadFailed', ['MD5', 'file fingerprinting']);		// Critical error
+			};
+			ready = true;
+		} else {
+			$.getScript('<%= asset_path("condo/md5/hash.worker.emulator.js") %>', function() {
+				hasher = new CondoHashWorkerEmulator(recievedMessage);
+				ready = true;
+				processNext();	// It is possible
+			}).fail(function(jqxhr, settings, exception) {
+				broadcaster.broadcast('coComponentLoadFailed', ['MD5', 'file fingerprinting']);
+			});
+		}
+		
+		
+		
+		return {
+			//
+			// Will queue a start message and return the hash result
+			//
+			hash: function(blob) {
+				var result = $q.defer();
+					
+				queue.push({
+					blob: blob,
+					result: result
+				});
+				processNext();
+				
+				return result.promise;
+			}
+		};
+	}]);
+}));
+

data/app/assets/javascripts/condo/amazon.js

@@ -18,20 +18,15 @@
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// AMD
-		define(['jquery', 'spark-md5', 'base64', 'condo_uploader'], factory);
+		define(['jquery', 'base64', 'condo-uploader'], factory);
 	} else {
 		// Browser globals
-		factory(jQuery, window.SparkMD5, window.base64, window.CondoUploader);
+		factory(jQuery, window.base64);
 	}
-}(function ($, MD5, base64, uploads, undefined) {
+}(function ($, base64) {
 	'use strict';
 	
-	//
-	// TODO:: Create an Amazon, google factory etc
-	//	We should split all these into different files too (controller and factories separate from directives and views)
-	//	So we can have different views for the same controller
-	//
-	uploads.factory('Condo.AmazonS3', ['$rootScope', '$q', function($rootScope, $q) {
+	angular.module('CondoAmazonProvider', ['CondoUploader', 'CondoAbstractMd5']).run(['$q', 'Condo.Registrar', 'Condo.Md5', function($q, registrar, md5) {
 		var PENDING = 0,
 			STARTED = 1,
 			PAUSED = 2,
@@ -82,16 +77,9 @@
 			//
 			// We need to sign our uploads so amazon can confirm they are valid for us
 			//	Part numbers can be any number from 1 to 10,000 - inclusive
-			//	TODO:: use http://updates.html5rocks.com/2011/12/Transferable-Objects-Lightning-Fast
-			//		where available :)
 			//
 			build_request = function(part_number) {
-				var result = $q.defer(),
-					reader = new FileReader(),
-					fail = function(){
-						result.reject('file read failed');
-					},
-					current_part;
+				var current_part;
 				
 				if (file.size > part_size) {		// If file bigger then 5mb we expect a chunked upload
 					var endbyte = part_number * part_size;
@@ -102,23 +90,15 @@
 					current_part = file;
 				}
 				
-				reader.onload = function(e) {
-					result.resolve({
+				return md5.hash(current_part).then(function(val) {
+					return {
 						data: current_part,
-						data_id: MD5.hashBinary(e.target.result),
+						data_id: val,
 						part_number: part_number
-					});
-					
-					
-					if(!$rootScope.$$phase) {
-						$rootScope.$apply();					// This triggers the promise response if required
 					}
-				};
-				reader.onerror = fail;
-				reader.onabort = fail;
-				reader.readAsBinaryString(current_part);
-				
-				return result.promise;
+				}, function(reason){
+					return $q.reject(reason);
+				});
 			},
 
 			//
@@ -412,12 +392,15 @@
 		}; // END AMAZON
 		
 		
-		return {
+		//
+		// Register the residence with the API
+		//	Dependency injection succeeded
+		//
+		registrar.register('AmazonS3', {
 			new_upload: function(api, file) {
 				return new Amazon(api, file);
 			}
-		};
-		
+		});
 	}]);
 	
 }));

data/app/assets/javascripts/condo/broadcaster.js

@@ -0,0 +1,54 @@
+/**
+*	CoTag Condo Amazon S3 Strategy
+*	Direct to cloud resumable uploads for Google Cloud Storage
+*	
+*   Copyright (c) 2012 CoTag Media.
+*	
+*	@author 	Stephen von Takach <steve@cotag.me>
+* 	@copyright  2012 cotag.me
+* 
+* 	
+* 	References:
+* 		* https://github.com/umdjs/umd
+* 		* https://github.com/addyosmani/jquery-plugin-patterns
+*		* 
+*
+**/
+
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define('condo-broadcaster', factory);
+	} else {
+		// Browser globals
+		factory();
+	}
+}(function (undefined) {
+	'use strict';
+	
+	angular.module('CondoBroadcaster', []).factory('Condo.Broadcast', ['$rootScope', function($rootScope) {
+		// eventBroadcaster is the object created by the factory method.
+		var eventBroadcaster = {};
+		
+		// The message is a string or object to carry data with the event.
+		eventBroadcaster.message = '';
+		
+		// The event name is a string used to define event types.
+		eventBroadcaster.eventName = '';
+		
+		// This method is called from within a controller to define an event and attach data to the eventBroadcaster object.
+		eventBroadcaster.broadcast = function(evName, msg) {
+			this.message = msg;
+			this.eventName = evName;
+			this.broadcastItem();
+		};
+		
+		// This method broadcasts an event with the specified name.
+		eventBroadcaster.broadcastItem = function() {
+			$rootScope.$broadcast(this.eventName);
+		};
+
+		return eventBroadcaster;
+	}]);
+	
+}));

data/app/assets/javascripts/condo/controller.js

@@ -19,7 +19,7 @@
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// AMD
-		define('condo_controller', ['jquery', 'condo_uploader'], factory);
+		define('condo-controller', ['jquery', 'condo-uploader'], factory);
 	} else {
 		// Browser globals
 		window.CondoController = factory(jQuery, window.CondoUploader);
@@ -32,33 +32,7 @@
 	//
 	// Create a controller for managing the upload states
 	//
-	uploads.factory('Condo.Broadcast', ['$rootScope', function($rootScope) {
-		// eventBroadcaster is the object created by the factory method.
-		var eventBroadcaster = {};
-		
-		// The message is a string or object to carry data with the event.
-		eventBroadcaster.message = '';
-		
-		// The event name is a string used to define event types.
-		eventBroadcaster.eventName = '';
-		
-		// This method is called from within a controller to define an event and attach data to the eventBroadcaster object.
-		eventBroadcaster.broadcast = function(evName, msg) {
-			this.message = msg;
-			this.eventName = evName;
-			this.broadcastItem();
-		};
-		
-		// This method broadcasts an event with the specified name.
-		eventBroadcaster.broadcastItem = function() {
-			$rootScope.$broadcast(this.eventName);
-		};
-
-		return eventBroadcaster;
-		
-		
-		
-	}]).controller('Condo.Controller', ['$scope', 'Condo.Api', 'Condo.Broadcast', function($scope, api, broadcaster) {
+	uploads.controller('Condo.Controller', ['$scope', 'Condo.Api', 'Condo.Broadcast', function($scope, api, broadcaster) {
 		
 		$scope.uploads = [];
 		$scope.upload_count = 0;

data/app/assets/javascripts/condo/google.js

@@ -18,20 +18,15 @@
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// AMD
-		define(['jquery', 'spark-md5', 'base64', 'condo_uploader'], factory);
+		define(['jquery', 'base64', 'condo-uploader'], factory);
 	} else {
 		// Browser globals
-		factory(jQuery, window.SparkMD5, window.base64, window.CondoUploader);
+		factory(jQuery, window.base64);
 	}
-}(function ($, MD5, base64, uploads, undefined) {
+}(function ($, base64) {
 	'use strict';
 	
-	//
-	// TODO:: Create an Amazon, google factory etc
-	//	We should split all these into different files too (controller and factories separate from directives and views)
-	//	So we can have different views for the same controller
-	//
-	uploads.factory('Condo.GoogleCloudStorage', ['$rootScope', '$q', function($rootScope, $q) {
+	angular.module('CondoGoogleProvider', ['CondoUploader', 'CondoAbstractMd5']).run(['$q', 'Condo.Registrar', 'Condo.Md5', function($q, registrar, md5) {
 		var PENDING = 0,
 			STARTED = 1,
 			PAUSED = 2,
@@ -81,57 +76,15 @@
 			
 			//
 			// We need to sign our uploads so Google can confirm they are valid for us
-			//	TODO:: use http://updates.html5rocks.com/2011/12/Transferable-Objects-Lightning-Fast
-			//		where available :) - especially important since we have to hash the entire file
 			//
-			build_request = function(part_number, hash) {
-				var result = $q.defer(),
-					reader = new FileReader(),
-					fail = function(){
-						result.reject('file read failed');
-					},
-					current_part;
-					
-				if (part_number == 1) {
-					hash = new MD5();
-				}
-				
-				if (file.size > part_size) {		// If file bigger then 5mb we expect a chunked upload
-					var endbyte = part_number * part_size;
-					if (endbyte > file.size)
-						endbyte = file.size;
-					current_part = file.slice((part_number - 1) * part_size, endbyte);
-				} else {
-					current_part = file;
-				}
-				
-				reader.onload = function(e) {
-					hash.appendBinary(e.target.result);
-					result.resolve(hash);
-					
-					
-					if(!$rootScope.$$phase) {
-						$rootScope.$apply();					// This triggers the promise response if required
-					}
-				};
-				reader.onerror = fail;
-				reader.onabort = fail;
-				reader.readAsBinaryString(current_part);
-				
-				//
-				// Chaining promises means the UI will have a chance to update
-				//
-				return result.promise.then(function(val){
-					if ((part_number * part_size) < file.size) {
-						return build_request(part_number + 1, val);
-					} else {
-						return {
-							data: file,
-							data_id: base64.encode(hexToBin(val.end()))
-						}
+			build_request = function() {
+				return md5.hash(file).then(function(val) {
+					return {
+						data: file,
+						data_id: base64.encode(hexToBin(val))
 					}
 				}, function(reason){
-					$q.reject(reason);
+					return $q.reject(reason);
 				});
 			},
 
@@ -222,7 +175,7 @@
 					this.state = STARTED;
 					strategy = {};			// This function shouldn't be called twice so we need a state
 					
-					build_request(1).then(function(result) {
+					build_request().then(function(result) {
 						if (self.state != STARTED)
 							return;						// upload was paused or aborted as we were reading the file
 						
@@ -288,12 +241,15 @@
 		}; // END GOOGLE
 		
 		
-		return {
+		//
+		// Register the residence with the API
+		//	Dependency injection succeeded
+		//
+		registrar.register('GoogleCloudStorage', {
 			new_upload: function(api, file) {
 				return new GoogleCloudStorage(api, file);
 			}
-		};
-		
+		});
 	}]);
 	
 }));

data/app/assets/javascripts/condo/md5/hash.worker.emulator.js

@@ -0,0 +1,23 @@
+//= require condo/md5/spark-md5
+//= require condo/md5/hasher
+
+
+function CondoHashWorkerEmulator(callback) {
+	
+	// Create an API that looks like postMessage
+	this.postMessage = function (data, portArray) {
+		hasher.hash(data);	// Clone the data if required JSON.parse(JSON.stringify(message)); // - Don't think it is required
+	}
+	
+	
+	this.terminate = function () {
+		// No special clean-up needed.
+	}
+	
+	function messageEvtEmulator(rawMessage) {
+		callback({ data: rawMessage });
+	}
+	
+	// Create an instance of downloader.
+	var hasher = new CondoMD5Hasher(messageEvtEmulator);
+}

data/app/assets/javascripts/condo/md5/hash.worker.js

@@ -0,0 +1,11 @@
+//= require condo/md5/spark-md5
+//= require condo/md5/hasher
+
+
+var hasher = new CondoMD5Hasher(postMessage);	// Accepts the callback as the parameter
+
+
+// Hook-up worker input
+onmessage = function (e) {
+	hasher.hash(e.data);
+}

data/app/assets/javascripts/condo/md5/hasher.js

@@ -0,0 +1,66 @@
+
+
+var CondoMD5Hasher = (function(global) {
+	
+	var part_size = 1048576;	// This is the amount of the file we read into memory as we are building the hash (1mb)
+
+	return function(callback) {
+		
+		
+		//
+		// responds with: {success: true|false, result: <Object>}
+		//
+		this.hash = function(blob) {
+			
+			var current_part,
+				md5 = new global.SparkMD5(),
+				reader = new FileReader(),
+				part_number = 0,
+				length = Math.ceil(blob.size / part_size),
+				fail = function() {
+					callback({
+						success: false,
+						result: 'file read failed'
+					});
+				},
+				hashData = function(e) {
+					md5.appendBinary(e.target.result);
+					if(part_number * part_size >= blob.size) {
+						callback({
+							success: true,
+							result: md5.end()
+						});
+					} else {
+						processPart();
+					}
+				},
+				processPart = function() {
+					var endbyte = 0;
+					
+					part_number += 1;
+					
+					if (blob.size > part_size) {		// If blob bigger then part_size we will slice it up
+						endbyte = part_number * part_size;
+						if (endbyte > blob.size)
+							endbyte = blob.size;
+							
+						current_part = blob.slice((part_number - 1) * part_size, endbyte);
+					} else {
+						current_part = blob;
+					}
+					
+					reader.readAsArrayBuffer(current_part);
+				};
+			
+		
+			reader.onload = hashData;
+			reader.onerror = fail;
+			reader.onabort = fail;
+			
+			
+			processPart();
+		};
+	};
+	
+})(this);
+

data/app/assets/javascripts/condo/{spark-md5.js → md5/spark-md5.js}

@@ -1,4 +1,4 @@
-/*jslint bitwise: true, nomen: true */
+/*jshint bitwise:false*/
 /*global unescape*/
 
 /**
@@ -45,7 +45,7 @@
  *   document.getElementById("file").addEventListener("change", function() {
  *
  *       var fileReader = new FileReader(),
- *           blobSlice = File.prototype.mozSlice || File.prototype.webkitSlice || File.prototype.slice,
+ *           blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice,
  *           file = document.getElementById("file").files[0],
  *           chunkSize = 2097152,                           // read in chunks of 2MB
  *           chunks = Math.ceil(file.size / chunkSize),
@@ -76,24 +76,55 @@
  *       loadNext();
  *   });
  *
- * @TODO: Add support for byteArrays.
- * @TODO: Add support for HMAC.
  * @TODO: Add native support for reading files? Maybe add it as an extension?
  */
 (function (factory) {
-	if (typeof exports === 'object') {
-		// Node/CommonJS
-		exports.SparkMD5 = factory();
-	} else if (typeof define === 'function' && define.amd) {
+    if (typeof exports === 'object') {
+        // Node/CommonJS
+        module.exports = factory();
+    } else if (typeof define === 'function' && define.amd) {
         // AMD
         define('spark-md5', factory);
     } else {
-        // Browser globals
-        window.SparkMD5 = factory();
+        // Browser globals (with support for web workers)
+        var glob;
+        try {
+            glob = window;
+        } catch (e) {
+            glob = self;
+        }
+
+        glob.SparkMD5 = factory();
     }
 }(function (undefined) {
 
-    "use strict";
+    'use strict';
+    
+    
+    /* converts strings to array buffers
+     * From: http://updates.html5rocks.com/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
+     */
+    var str2ab = function (str) {
+        var buf = new ArrayBuffer(str.length * 2), // 2 bytes for each char
+            bufView = new Uint16Array(buf);
+        for (var i = 0, strLen = str.length; i < strLen; i++) {
+            bufView[i] = str.charCodeAt(i);
+        }
+        return buf;
+    },
+    
+    
+    abConcat = function(first, second)
+    {
+        var firstLength = first.length,
+            result = new Uint8Array(firstLength + second.byteLength);
+
+        result.set(first);
+        result.set(new Uint8Array(second), firstLength);
+
+        return result;
+    },
+    
 
     ////////////////////////////////////////////////////////////////////////////
 
@@ -104,38 +135,33 @@
      * @see http://www.myersdaily.org/joseph/javascript/md5-text.html
      * @see http://jsperf.com/md5-shootout/7
      */
-
-    /* this function is much faster,
-      so if possible we use it. Some IEs
-      are the only ones I know of that
-      need the idiotic second function,
-      generated by an if clause.  */
-    var add32 = function (a, b) {
+    
+    add32 = function (a, b) {
         return (a + b) & 0xFFFFFFFF;
-    };
+    },
 
-    function cmn(q, a, b, x, s, t) {
+    cmn = function (q, a, b, x, s, t) {
         a = add32(add32(a, q), add32(x, t));
         return add32((a << s) | (a >>> (32 - s)), b);
-    }
+    },
 
-    function ff(a, b, c, d, x, s, t) {
+    ff = function(a, b, c, d, x, s, t) {
         return cmn((b & c) | ((~b) & d), a, b, x, s, t);
-    }
+    },
 
-    function gg(a, b, c, d, x, s, t) {
+    gg = function(a, b, c, d, x, s, t) {
         return cmn((b & d) | (c & (~d)), a, b, x, s, t);
-    }
+    },
 
-    function hh(a, b, c, d, x, s, t) {
+    hh = function(a, b, c, d, x, s, t) {
         return cmn(b ^ c ^ d, a, b, x, s, t);
-    }
+    },
 
-    function ii(a, b, c, d, x, s, t) {
+    ii = function(a, b, c, d, x, s, t) {
         return cmn(c ^ (b | (~d)), a, b, x, s, t);
-    }
+    },
 
-    function md5cycle(x, k) {
+    md5cycle = function(x, k) {
         var a = x[0],
             b = x[1],
             c = x[2],
@@ -213,47 +239,46 @@
         x[1] = add32(b, x[1]);
         x[2] = add32(c, x[2]);
         x[3] = add32(d, x[3]);
+    },
 
-    }
-
-    /* there needs to be support for Unicode here,
-       * unless we pretend that we can redefine the MD-5
-       * algorithm for multi-byte characters (perhaps
-       * by adding every four 16-bit characters and
-       * shortening the sum to 32 bits). Otherwise
-       * I suggest performing MD-5 as if every character
-       * was two bytes--e.g., 0040 0025 = @%--but then
-       * how will an ordinary MD-5 sum be matched?
-       * There is no way to standardize text to something
-       * like UTF-8 before transformation; speed cost is
-       * utterly prohibitive. The JavaScript standard
-       * itself needs to look at this: it should start
-       * providing access to strings as preformed UTF-8
-       * 8-bit unsigned value arrays.
-       */
-    function md5blk(s) { /* I figured global was faster.   */
+    md5blk = function(s) { /* I figured global was faster.   */
         var md5blks = [],
             i; /* Andy King said do it this way. */
         for (i = 0; i < 64; i += 4) {
-            md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
+            md5blks[i >> 2] = s[i] + (s[i + 1] << 8) + (s[i + 2] << 16) + (s[i + 3] << 24);
         }
         return md5blks;
-    }
+    },
 
-    function md51(s) {
+    md51 = function(s) {
         var n = s.length,
             state = [1732584193, -271733879, -1732584194, 271733878],
             i,
             length,
-            tail;
+            tail,
+            tmp,
+            lo,
+            hi;
+
         for (i = 64; i <= n; i += 64) {
-            md5cycle(state, md5blk(s.substring(i - 64, i)));
+            md5cycle(state, md5blk(s.subarray(i - 64, i)));
         }
-        s = s.substring(i - 64);
+        
+        //
+        // Not sure if it is a bug, however IE10 will always produce a sub array of length 1
+        // containing the last element of the parent array if the sub array specified starts
+        // beyond the length of the parent array - weird.
+        // https://connect.microsoft.com/IE/feedback/details/771452/typed-array-subarray-issue
+        //
+        if((i - 64) < n)
+            s = s.subarray(i - 64);
+        else
+            s = new Uint8Array(0);
+        
         length = s.length;
         tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
         for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
+            tail[i >> 2] |= s[i] << ((i % 4) << 3);
         }
         tail[i >> 2] |= 0x80 << ((i % 4) << 3);
         if (i > 55) {
@@ -262,43 +287,42 @@
                 tail[i] = 0;
             }
         }
-        tail[14] = n * 8;
+
+        // Beware that the final length might not fit in 32 bits so we take care of that
+        tmp = n * 8;
+        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
+        lo = parseInt(tmp[2], 16);
+        hi = parseInt(tmp[1], 16) || 0;
+
+        tail[14] = lo;
+        tail[15] = hi;
+
         md5cycle(state, tail);
         return state;
-    }
+    },
 
-    /*jslint vars: true*/
-    var hex_chr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-    /*jslint vars: false*/
+    hex_chr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'],
 
-    function rhex(n) {
+    rhex = function(n) {
         var s = '',
             j;
         for (j = 0; j < 4; j += 1) {
             s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] + hex_chr[(n >> (j * 8)) & 0x0F];
         }
         return s;
-    }
+    },
 
-    function hex(x) {
+    hex = function(x) {
         var i;
         for (i = 0; i < x.length; i += 1) {
             x[i] = rhex(x[i]);
         }
         return x.join('');
-    }
+    },
 
-    function md5(s) {
+    md5 = function(s) {
         return hex(md51(s));
-    }
-
-    if (md5('hello') !== '5d41402abc4b2a76b9719d911017c592') {
-        add32 = function (x, y) {
-            var lsw = (x & 0xFFFF) + (y & 0xFFFF),
-                msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-            return (msw << 16) | (lsw & 0xFFFF);
-        };
-    }
+    },
 
     ////////////////////////////////////////////////////////////////////////////
 
@@ -308,29 +332,24 @@
      * Use this class to perform an incremental md5, otherwise use the
      * static methods instead.
      */
-    /*jslint vars: true*/
-    var SparkMD5 = function () {
-        /*jslint vars: false*/
+    SparkMD5 = function () {
         // call reset to init the instance
         this.reset();
-    };
+    };    
+    
 
     /**
      * Appends a string.
-     * A conversion will be applied if an utf8 string is detected.
+     * Converts to a byte array.
      *
      * @param {String} str The string to be appended
      *
      * @return {SparkMD5} The instance itself
      */
     SparkMD5.prototype.append = function (str) {
-        // converts the string to utf8 bytes if necessary
-        if (/[\u0080-\uFFFF]/.test(str)) {
-            str = unescape(encodeURIComponent(str));
-        }
 
-        // then append as binary
-        this.appendBinary(str);
+        // convert to array then append as binary
+        this.appendBinary(str2ab(str));
 
         return this;
     };
@@ -338,38 +357,27 @@
     /**
      * Appends a binary string.
      *
-     * @param {String} contents The binary string to be appended
+     * @param {ArrayBuffer} contents The binary string to be appended
      *
      * @return {SparkMD5} The instance itself
      */
     SparkMD5.prototype.appendBinary = function (contents) {
-        // add to the buffer and increment string total length
-        var offset = 64 - this._buff.length,
-            sub = this._buff + contents.substr(0, offset),
-            length = contents.length,
-            total;
-
-        this._length += length;
-
-        if (sub.length >= 64) { // if there is 64 bytes accumulated
-
-            md5cycle(this._state, md5blk(sub));
-
-            total = contents.length - 64;
-
-            // while we got bytes to process
-            while (offset <= total) {
-                sub = contents.substr(offset, 64);
-                md5cycle(this._state, md5blk(sub));
-                offset += 64;
-            }
-
-            this._buff = contents.substr(offset, 64);
-
-        } else {
-            this._buff = sub;
+        var buff = abConcat(this._buff, contents),
+            length = buff.length,
+            i;
+            
+        this._length += contents.byteLength;
+		
+        for (i = 64; i <= length; i += 64) {
+            md5cycle(this._state, md5blk(buff.subarray(i - 64, i)));
         }
 
+		// Avoids IE10 weirdness
+		if((i - 64) < length)
+            this._buff = buff.subarray(i - 64);
+        else
+            this._buff = new Uint8Array(0);
+
         return this;
     };
 
@@ -387,10 +395,13 @@
             length = buff.length,
             tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             i,
-            ret;
+            ret,
+            tmp,
+            lo,
+            hi;
 
         for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= buff.charCodeAt(i) << ((i % 4) << 3);
+            tail[i >> 2] |= buff[i] << ((i % 4) << 3);
         }
         tail[i >> 2] |= 0x80 << ((i % 4) << 3);
         if (i > 55) {
@@ -399,7 +410,16 @@
                 tail[i] = 0;
             }
         }
-        tail[14] = this._length * 8;
+
+        // Do the final computation based on the tail and length
+        // Beware that the final length may not fit in 32 bits so we take care of that
+        tmp = this._length * 8;
+        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
+        lo = parseInt(tmp[2], 16);
+        hi = parseInt(tmp[1], 16) || 0;
+
+        tail[14] = lo;
+        tail[15] = hi;
         md5cycle(this._state, tail);
 
         ret = !!raw ? this._state : hex(this._state);
@@ -415,7 +435,7 @@
      * @return {SparkMD5} The instance itself
      */
     SparkMD5.prototype.reset = function () {
-        this._buff = "";
+        this._buff = new Uint8Array(0);
         this._length = 0;
         this._state = [1732584193, -271733879, -1732584194, 271733878];
 
@@ -433,8 +453,7 @@
     };
 
     /**
-     * Performs the md5 hash on a string.
-     * A conversion will be applied if utf8 string is detected.
+     * Performs the md5 hash on a string as utf16
      *
      * @param {String}  str The string
      * @param {Boolean} raw True to get the raw result, false to get the hex result
@@ -442,26 +461,21 @@
      * @return {String|Array} The result
      */
     SparkMD5.hash = function (str, raw) {
-        // converts the string to utf8 bytes if necessary
-        if (/[\u0080-\uFFFF]/.test(str)) {
-            str = unescape(encodeURIComponent(str));
-        }
-
-        var hash = md51(str);
+        var hash = md51(new Uint8Array(str2ab(str)));
 
         return !!raw ? hash : hex(hash);
     };
 
     /**
-     * Performs the md5 hash on a binary string.
+     * Performs the md5 hash on a typed array.
      *
-     * @param {String}  content The binary string
+     * @param {ArrayBuffer}  content The binary array
      * @param {Boolean} raw     True to get the raw result, false to get the hex result
      *
      * @return {String|Array} The result
      */
     SparkMD5.hashBinary = function (content, raw) {
-        var hash = md51(content);
+        var hash = md51(new Uint8Array(content));
 
         return !!raw ? hash : hex(hash);
     };

data/app/assets/javascripts/condo/rackspace.js

@@ -1,6 +1,6 @@
 /**
 *	CoTag Condo Rackspace Cloud Files Strategy
-*	Direct to cloud resumable uploads for Amazon S3
+*	Direct to cloud resumable uploads for Rackspace Cloud Files
 *	
 *   Copyright (c) 2012 CoTag Media.
 *	
@@ -18,20 +18,15 @@
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// AMD
-		define(['jquery', 'spark-md5', 'condo_uploader'], factory);
+		define(['jquery', 'condo-uploader'], factory);
 	} else {
 		// Browser globals
-		factory(jQuery, window.SparkMD5, window.CondoUploader);
+		factory(jQuery);
 	}
-}(function ($, MD5, uploads, undefined) {
+}(function ($) {
 	'use strict';
 	
-	//
-	// TODO:: Create an Amazon, google factory etc
-	//	We should split all these into different files too (controller and factories separate from directives and views)
-	//	So we can have different views for the same controller
-	//
-	uploads.factory('Condo.RackspaceCloudFiles', ['$rootScope', '$q', function($rootScope, $q) {
+	angular.module('CondoRackspaceProvider', ['CondoUploader', 'CondoAbstractMd5']).run(['$q', 'Condo.Registrar', 'Condo.Md5', function($q, registrar, md5) {
 		var PENDING = 0,
 			STARTED = 1,
 			PAUSED = 2,
@@ -65,16 +60,9 @@
 			
 			//
 			// We need to sign our uploads so rackspace can confirm they are valid for us
-			//	TODO:: use http://updates.html5rocks.com/2011/12/Transferable-Objects-Lightning-Fast
-			//		where available :)
 			//
 			build_request = function(part_number) {
-				var result = $q.defer(),
-					reader = new FileReader(),
-					fail = function(){
-						result.reject('file read failed');
-					},
-					current_part;
+				var current_part;
 				
 				if (file.size > part_size) {		// If file bigger then 5mb we expect a chunked upload
 					var endbyte = part_number * part_size;
@@ -85,23 +73,15 @@
 					current_part = file;
 				}
 				
-				reader.onload = function(e) {
-					result.resolve({
+				return md5.hash(current_part).then(function(val) {
+					return {
 						data: current_part,
-						data_id: MD5.hashBinary(e.target.result),
+						data_id: val,
 						part_number: part_number
-					});
-					
-					
-					if(!$rootScope.$$phase) {
-						$rootScope.$apply();					// This triggers the promise response if required
 					}
-				};
-				reader.onerror = fail;
-				reader.onabort = fail;
-				reader.readAsBinaryString(current_part);
-				
-				return result.promise;
+				}, function(reason){
+					return $q.reject(reason);
+				});
 			},
 
 			//
@@ -332,15 +312,18 @@
 					this.message = reason;
 				}
 			};
-		}; // END AMAZON
+		}; // END RACKSPACE
 		
 		
-		return {
+		//
+		// Register the residence with the API
+		//	Dependency injection succeeded
+		//
+		registrar.register('RackspaceCloudFiles', {
 			new_upload: function(api, file) {
 				return new Rackspace(api, file);
 			}
-		};
-		
+		});
 	}]);
 	
 }));

data/app/assets/javascripts/condo/uploader.js

@@ -19,29 +19,25 @@
 (function (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// AMD
-		define('condo_uploader', ['jquery'], factory);
+		define('condo-uploader', ['jquery', 'condo-broadcaster'], factory);
 	} else {
 		// Browser globals
 		window.CondoUploader = factory(jQuery);
 	}
-}(function ($, undefined) {
+}(function ($) {
 	'use strict';
 	
-	var uploads = angular.module('CondoUploader', []);
+	var uploads = angular.module('CondoUploader', ['CondoBroadcaster']),
+		residencies = {};
 	
 	
 	//
 	// Implements the Condo API
 	//
-	uploads.factory('Condo.Api', ['$http', '$rootScope', '$q', 'Condo.AmazonS3', 'Condo.RackspaceCloudFiles', 'Condo.GoogleCloudStorage', function($http, $rootScope, $q, AmazonS3Condo, RackspaceFilesCondo, GoogleStorageCondo) {
+	uploads.factory('Condo.Api', ['$http', '$rootScope', '$q', function($http, $rootScope, $q) {
 		
 		
 		var token = $('meta[name="csrf-token"]').attr('content'),
-			residencies = {
-				AmazonS3: AmazonS3Condo,
-				RackspaceCloudFiles: RackspaceFilesCondo,
-				GoogleCloudStorage: GoogleStorageCondo
-			},
 
 		
 		condoConnection = function(api_endpoint, params) {
@@ -289,7 +285,16 @@
 				});
 			}
 		};
-	}]);
+	}]).factory('Condo.Registrar', function(){
+		return {
+			//
+			// Simple dependency injection allows us to load only the providers we need
+			//
+			register: function(provider_name, iface) {
+				residencies[provider_name] = iface;
+			}
+		};
+	});
 	
 	
 	

data/lib/condo/version.rb

@@ -1,3 +1,3 @@
 module Condo
-	VERSION = "1.0.0"
+	VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,12 +67,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/condo/abstract-md5.js.erb
 - app/assets/javascripts/condo/amazon.js
 - app/assets/javascripts/condo/base64.js
+- app/assets/javascripts/condo/broadcaster.js
 - app/assets/javascripts/condo/controller.js
 - app/assets/javascripts/condo/google.js
+- app/assets/javascripts/condo/md5/hash.worker.emulator.js
+- app/assets/javascripts/condo/md5/hash.worker.js
+- app/assets/javascripts/condo/md5/hasher.js
+- app/assets/javascripts/condo/md5/spark-md5.js
 - app/assets/javascripts/condo/rackspace.js
-- app/assets/javascripts/condo/spark-md5.js
 - app/assets/javascripts/condo/uploader.js
 - app/assets/javascripts/condo.js
 - lib/condo/configuration.rb