condo 1.0.4 → 1.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 335bdd9a275e2321248b001a74b6e123d50358ad
+  data.tar.gz: 2f13c901661a82d195d0bd090bb549d00c6de4e5
+SHA512:
+  metadata.gz: a842e8e7fd460e1345205e3e73d5e74efdd28b5962b6a990320b919c4f5b68b58300b5249a0df31a48354ac78b8eeb788c23f95d32353ea0409179e13b1542c7
+  data.tar.gz: 8e9e92aa03407f99aecfb0ac2cba68f5ba077d2d19834cc75668ad992d46b8c9436c2e40e26e434b5c146ff31dc943992f09d6319f7f6700f2193fab624af14d

data/README.textile

@@ -1,133 +1,133 @@
-h1. Condominios aka Condo
-
-A "Rails plugin":http://guides.rubyonrails.org/plugins.html and "AngularJS application":http://angularjs.org/ that makes direct uploads to multiple cloud storage providers easy.
-Only supports "XMLHttpRequest Level 2":http://en.wikipedia.org/wiki/XMLHttpRequest capable browsers and cloud providers that have a "RESTful API":http://en.wikipedia.org/wiki/Representational_state_transfer with "CORS":http://en.wikipedia.org/wiki/Cross-origin_resource_sharing support.
-
-Why compromise?
-
-Get started now: @gem install condo@ or checkout the "example application":https://github.com/cotag/condo_example
-Also see our "github pages site":http://cotag.github.com/Condominios/
-
-
-h2. License
-
-GNU Lesser General Public License v3 (LGPL version 3)
-
-
-h2. Concept
-
-Condominios was created to provide direct to cloud uploads using standards based browser technology. However it is not limited to that use case.
-The API is RESTful, providing an abstraction layer and signed URLs that can be utilised in native (mobile) applications.
-
-The main advantages are:
-* Off-loads processing to client machines
-* Better guarantees against upload corruption
-** file hashing on the client side instead of an intermediary where it probably won't be hashed either
-* Upload results are guaranteed if the cloud provider provides atomic operations
-** user is always aware of any failures in the process
-* Detailed progress and control over the upload
- 
-This has numerous advantages over traditional Form Data style post uploads too.
-* Progress bars
-* Resumability when uploading large files
-
-
-Support for all major browsers
-* Tested in Firefox 4, Safari 6, Chromes latest stable and IE10 (IE10 on Win7)
-
-
-h2. Usage
-
-h3. Terms
-
-* Residence == the current storage provider
-* Resident == the current user
-
-
-h3. Quick Start
-
-See the "example application":https://github.com/cotag/condo_example which implements the steps below on an otherwise blank rails app.
-
-# Add the following to your rails application gemfile:
-#* @gem 'condo'@
-#* Add a datastore
-#** @gem 'condo_active_record'@ (for traditional databases)
-#** "condo_mongoid":https://github.com/axomi/condo_mongoid by "axomi":https://github.com/axomi for "MongoDB":http://mongodb.org/
-#* @gem 'condo_interface'@ (optional - an example interface)
-# Run migrations if using active record
-#* @rake railties:install:migrations FROM=condo_active_record@
-#* @rake db:migrate@
-# Create an initialiser for any default residencies. (details further down)
-# Create controllers that will be used as Condo endpoints
-#* Typically @rails g controller Uploads@
-#* Add the resource to your routes
-# At the top of the new controller add the following line to the class: @include Condo@
-#* This creates the following public methods at run time: new, create, edit, update, destroy implementing the API
-#* The following protected methods are also generated: set_residence, current_residence, current_resident, current_upload
-# You are encouraged to use standard filters to authenticate users and set the residence (if this is dynamic) + implement index / show if desired
-# You must implement the following call-backs:
-#* resident_id - this should provide a unique identifier for the current user, used for authorisation
-#* upload_complete - provides the upload information for storage in the greater application logic. Return true if successful.
-#* destroy_upload - provides the upload information so that a scheduled task can be created to clean up the upload. Return true if successfully scheduled.
-#** This should be done in the background using something like "Fog":http://fog.io/ Can't trust the client
-
-
-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:
-# 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') %>
-
-
-h3. Defining Static Residencies
-
-If you are creating an application that only communicates with one or two storage providers or accounts then this is the simplest way to get started.
-In an initialiser (<-- I'm Australian) do the following:
-
-<pre><code class="ruby">
-Condo::Configuration.add_residence(:AmazonS3, {
-	:access_id => ENV['S3_KEY'],
-	:secret_key => ENV['S3_SECRET']
-	# :location => 'us-west-1'	# or 'ap-southeast-1' etc (see http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region)
-								# Defaults to 'us-east-1' or US Standard - not required for Google
-	# :namespace => :admin_resident	# Allows you to assign different defaults to different controllers
-									# Controller must have the following line 'set_namespace :admin_resident'
-})
-
-</code></pre>
-
-The first residence to be defined in a namespace will be the default. To change the residence for the current request use @set_residence(:name, :location)@ - location is optional
-Currently available residencies:
-* :AmazonS3
-* :GoogleCloudStorage
-* :RackspaceCloudFiles
-
-
-You can also define a dynamic residence each request (maybe clients provided you with access information for their storage provider)
-
-<pre><code class="ruby">
-set_residence(:AmazonS3, {
-	:access_id => user.s3_key,
-	:secret_key => user.s3_secret,
-	:dynamic => true	# Otherwise the same as add_residence
-});
-	
-
-</code></pre>
-
-
-h3. Callbacks
-
-These are pretty well defined "here":https://github.com/cotag/condo_example/blob/master/app/controllers/uploads_controller.rb
-
-
-h2. TODO::
-
-# Write tests... So many tests
-# Create a wiki describing things in more detail
-# Implement API for more residencies
-# Sign other useful requests (bucket listings with search etc)
-#* For Dropbox or Megaupload style applications
-
+h1. Condominios aka Condo
+
+A "Rails plugin":http://guides.rubyonrails.org/plugins.html and "AngularJS application":http://angularjs.org/ that makes direct uploads to multiple cloud storage providers easy.
+Only supports "XMLHttpRequest Level 2":http://en.wikipedia.org/wiki/XMLHttpRequest capable browsers and cloud providers that have a "RESTful API":http://en.wikipedia.org/wiki/Representational_state_transfer with "CORS":http://en.wikipedia.org/wiki/Cross-origin_resource_sharing support.
+
+Why compromise?
+
+Get started now: @gem install condo@ or checkout the "example application":https://github.com/cotag/condo_example
+Also see our "github pages site":http://cotag.github.com/Condominios/
+
+
+h2. License
+
+GNU Lesser General Public License v3 (LGPL version 3)
+
+
+h2. Concept
+
+Condominios was created to provide direct to cloud uploads using standards based browser technology. However it is not limited to that use case.
+The API is RESTful, providing an abstraction layer and signed URLs that can be utilised in native (mobile) applications.
+
+The main advantages are:
+* Off-loads processing to client machines
+* Better guarantees against upload corruption
+** file hashing on the client side instead of an intermediary where it probably won't be hashed either
+* Upload results are guaranteed if the cloud provider provides atomic operations
+** user is always aware of any failures in the process
+* Detailed progress and control over the upload
+ 
+This has numerous advantages over traditional Form Data style post uploads too.
+* Progress bars
+* Resumability when uploading large files
+
+
+Support for all major browsers
+* Tested in Firefox latest stable, Chromes latest stable, Safari 6, Opera 12 and IE10
+
+
+h2. Usage
+
+h3. Terms
+
+* Residence == the current storage provider
+* Resident == the current user
+
+
+h3. Quick Start
+
+See the "example application":https://github.com/cotag/condo_example which implements the steps below on an otherwise blank rails app.
+
+# Add the following to your rails application gemfile:
+#* @gem 'condo'@
+#* Add a datastore
+#** @gem 'condo_active_record'@ (for traditional databases)
+#** "condo_mongoid":https://github.com/axomi/condo_mongoid by "axomi":https://github.com/axomi for "MongoDB":http://mongodb.org/
+#* @gem 'condo_interface'@ (optional - an example interface)
+# Run migrations if using active record
+#* @rake railties:install:migrations FROM=condo_active_record@
+#* @rake db:migrate@
+# Create an initialiser for any default residencies. (details further down)
+# Create controllers that will be used as Condo endpoints
+#* Typically @rails g controller Uploads@
+#* Add the resource to your routes
+# At the top of the new controller add the following line to the class: @include Condo@
+#* This creates the following public methods at run time: new, create, edit, update, destroy implementing the API
+#* The following protected methods are also generated: set_residence, current_residence, current_resident, current_upload
+# You are encouraged to use standard filters to authenticate users and set the residence (if this is dynamic) + implement index / show if desired
+# You must implement the following call-backs:
+#* resident_id - this should provide a unique identifier for the current user, used for authorisation
+#* upload_complete - provides the upload information for storage in the greater application logic. Return true if successful.
+#* destroy_upload - provides the upload information so that a scheduled task can be created to clean up the upload. Return true if successfully scheduled.
+#** This should be done in the background using something like "Fog":http://fog.io/ Can't trust the client
+
+
+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:
+# Make sure your AngularJS app includes: @angular.module('YourApp', ['Condo', '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') %>
+
+
+h3. Defining Static Residencies
+
+If you are creating an application that only communicates with one or two storage providers or accounts then this is the simplest way to get started.
+In an initialiser do the following:
+
+<pre><code class="ruby">
+Condo::Configuration.add_residence(:AmazonS3, {
+	:access_id => ENV['S3_KEY'],
+	:secret_key => ENV['S3_SECRET']
+	# :location => 'us-west-1'	# or 'ap-southeast-1' etc (see http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region)
+								# Defaults to 'us-east-1' or US Standard - not required for Google
+	# :namespace => :admin_resident	# Allows you to assign different defaults to different controllers
+									# Controller must have the following line 'set_namespace :admin_resident'
+})
+
+</code></pre>
+
+The first residence to be defined in a namespace will be the default. To change the residence for the current request use @set_residence(:name, :location)@ - location is optional
+Currently available residencies:
+* :AmazonS3
+* :GoogleCloudStorage
+* :RackspaceCloudFiles
+
+
+You can also define a dynamic residence each request (maybe clients provided you with access information for their storage provider)
+
+<pre><code class="ruby">
+set_residence(:AmazonS3, {
+	:access_id => user.s3_key,
+	:secret_key => user.s3_secret,
+	:dynamic => true	# Otherwise the same as add_residence
+});
+	
+
+</code></pre>
+
+
+h3. Callbacks
+
+These are pretty well defined "here":https://github.com/cotag/condo_example/blob/master/app/controllers/uploads_controller.rb
+
+
+h2. TODO::
+
+# Write tests... So many tests
+# Create a wiki describing things in more detail
+# Implement API for more residencies
+# Sign other useful requests (bucket listings with search etc)
+#* For Dropbox or Megaupload style applications
+

data/app/assets/javascripts/condo.js

@@ -1,6 +1,9 @@
-//= require condo/abstract-md5
-//= require condo/base64
-//= require condo/broadcaster
-//= require condo/uploader
-//= require condo/config
-//= require condo/controller
+//= require core/core
+//= require core/services/1-safe-apply
+//= require core/services/2-messaging
+//= require condo/condo
+//= require condo/services/base64
+//= require condo/services/broadcaster
+//= require condo/services/abstract-md5
+//= require condo/services/uploader
+//= require condo/config

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

@@ -1,406 +1,403 @@
-/**
-*	CoTag Condo Amazon S3 Strategy
-*	Direct to cloud resumable uploads for Amazon S3
-*	
-*   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(['jquery', 'base64', 'condo-uploader'], factory);
-	} else {
-		// Browser globals
-		factory(jQuery, window.base64);
-	}
-}(function ($, base64) {
-	'use strict';
-	
-	angular.module('CondoAmazonProvider', ['CondoUploader', 'CondoAbstractMd5']).run(['$q', 'Condo.Registrar', 'Condo.Md5', function($q, registrar, md5) {
-		var PENDING = 0,
-			STARTED = 1,
-			PAUSED = 2,
-			UPLOADING = 3,
-			COMPLETED = 4,
-			ABORTED = 5,
-		
-		
-		
-		hexToBin = function(input) {
-			var result = "";
-			
-			if ((input.length % 2) > 0) {
-				input = '0' + input;
-			}
-			
-			for (var i = 0, length = input.length; i < length; i += 2) {
-				result += String.fromCharCode(parseInt(input.slice(i, i + 2), 16));
-			}
-			
-			return result;
-		},
-		
-		
-		Amazon = function (api, file) {
-			var self = this,
-				strategy = null,
-				part_size = 5242880,			// Multi-part uploads should be bigger then this
-				pausing = false,
-				defaultError = function(reason) {
-					self.error = !pausing;
-					pausing = false;
-					self.pause(reason);
-				},
-
-			restart = function() {
-				strategy = null;
-			},
-
-
-			completeUpload = function() {
-				api.update().then(function(data) {
-						self.state = COMPLETED;
-				}, defaultError);
-			},
-			
-			
-			//
-			// 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
-			//
-			build_request = function(part_number) {
-				var current_part;
-				
-				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;
-				}
-				
-				return md5.hash(current_part).then(function(val) {
-					return {
-						data: current_part,
-						data_id: val,
-						part_number: part_number
-					}
-				}, function(reason){
-					return $q.reject(reason);
-				});
-			},
-
-			//
-			// Direct file upload strategy
-			//
-			AmazonDirect = function(data) {
-				//
-				// resume
-				// abort
-				// pause
-				//
-				var $this = this,
-					finalising = false;
-					
-				//
-				// Update the parent
-				//
-				self.state = UPLOADING;
-	
-				
-				//
-				// This will only be called when the upload has finished and we need to inform the application
-				//
-				this.resume = function() {
-					self.state = UPLOADING;
-					completeUpload();
-				}
-				
-				this.pause = function() {
-					api.abort();
-						
-					if(!finalising) {
-						restart();		// Should occur before events triggered
-						self.progress = 0;
-					}
-				};
-				
-				
-				//
-				// AJAX for upload goes here
-				//
-				data['data'] = file;
-				api.process_request(data, function(progress) {
-					self.progress = progress;
-				}).then(function(result) {
-					finalising = true;
-		        	$this.resume();				// Resume informs the application that the upload is complete
-				}, function(reason) {
-					self.progress = 0;
-					defaultError(reason);
-				});
-			}, // END DIRECT
-
-
-			//
-			// Chunked upload strategy--------------------------------------------------
-			//
-			AmazonChunked = function (data, first_chunk) {
-				//
-				// resume
-				// abort
-				// pause
-				//
-				var part_ids = [],
-					last_part = 0,
-				
-				
-				generatePartManifest = function() {
-					var list = '<CompleteMultipartUpload>';
-					
-					for (var i = 0, length = part_ids.length; i < length; i += 1) {
-						list += '<Part><PartNumber>' + (i + 1) + '</PartNumber><ETag>"' + part_ids[i] + '"</ETag></Part>';
-					}
-					list += '</CompleteMultipartUpload>';
-					return list;
-				},
-				
-				//
-				// Get the next part signature
-				//
-				next_part = function(part_number) {
-					//
-					// Check if we are past the end of the file
-					//
-					if ((part_number - 1) * part_size < file.size) {
-						build_request(part_number).then(function(result) {
-							if (self.state != UPLOADING)
-								return;						// upload was paused or aborted as we were reading the file
-							
-							api.edit(part_number, base64.encode(hexToBin(result.data_id))).
-								then(function(data) {
-									set_part(data, result);
-								}, defaultError);
-						
-						}, defaultError);	// END BUILD_REQUEST
-						
-					} else {
-						//
-						// We're after the final commit
-						//
-						api.edit('finish').
-							then(function(request) {
-								request['data'] = generatePartManifest();
-								api.process_request(request).then(completeUpload, defaultError);
-							}, defaultError);
-					}
-				},
-				
-					
-				//
-				// Send a part to amazon
-				//
-				set_part = function(request, part_info) {
-					request['data'] = part_info.data;
-					api.process_request(request, function(progress) {
-						self.progress = (part_info.part_number - 1) * part_size + progress;
-					}).then(function(result) {
-						part_ids.push(part_info.data_id);	// We need to record the list of part IDs for completion
-			        		last_part = part_info.part_number;
-			        		next_part(last_part + 1);
-					}, function(reason) {
-						self.progress = (part_info.part_number - 1) * part_size;
-						defaultError(reason);
-					});
-				};
-					
-
-				self.state = UPLOADING;
-	
-				this.resume = function() {
-					self.state = UPLOADING;
-					next_part(last_part + 1);
-				};
-				
-				this.pause = function() {
-					api.abort();
-				};
-				
-				
-				//
-				// We need to check if we are grabbing a parts list or creating an upload
-				//
-				api.process_request(data).then(function(response) {
-					if(data.type == 'parts') {	// was the original request for a list of parts
-		        			//
-		        			// NextPartNumberMarker == the final part in the current request
-		        			//	TODO:: if IsTruncated is set then we need to keep getting parts
-		        			//
-		        			response = $(response);
-		        			var next = parseInt(response.find('NextPartNumberMarker').eq(0).text()),
-		        				etags = response.find('ETag');
-		        			
-		        			etags.each(function(index) {
-		        				part_ids.push($(this).text().replace(/"{1}/gi,''));	// Removes " from strings
-		        			});
-		        			
-		        			last_part = next;		// So we can resume
-		        			next_part(next + 1);	// As NextPartNumberMarker is just the last part uploaded
-		        		} else {
-		        			//
-		        			// We've created the upload - we need to update the application with the upload id.
-		        			//	This will also return the request for uploading the first part which we've already prepared
-		        			//
-							api.update({
-								resumable_id: $(response).find('UploadId').eq(0).text(),
-								file_id: base64.encode(hexToBin(first_chunk.data_id)),
-								part: 1
-							}).then(function(data) {
-								set_part(data, first_chunk);		// Parts start at 1
-							}, function(reason) {
-								defaultError(reason);
-								restart();				// Easier to start from the beginning
-							});
-		        		}
-				}, function(reason) {
-					defaultError(reason);
-					restart();		// We need to get a new request signature
-				});
-			}; // END CHUNKED
-			
-			
-			//
-			// Variables required for all drivers
-			//
-			this.state = PENDING;
-			this.progress = 0;
-			this.message = 'pending';
-			this.name = file.name;
-			this.size = file.size;
-			this.error = false;
-			
-			
-			//
-			// File path is optional (amazon supports paths as part of the key name)
-			//	http://docs.amazonwebservices.com/AmazonS3/2006-03-01/dev/ListingKeysHierarchy.html
-			//
-			if(!!file.dir_path)
-				this.path = file.dir_path;
-			
-			
-			//
-			// Support file slicing
-			//	
-			if (typeof(file.slice) != 'function')
-				file.slice = file.webkitSlice || file.mozSlice;
-			
-			
-			this.start = function(){
-				if(strategy == null) {	// We need to create the upload
-					self.error = false;
-					pausing = false;
-					
-					//
-					// Update part size if required
-					//
-					if((part_size * 9999) < file.size)	{
-						part_size = file.size / 9999;
-						if(part_size > (5 * 1024 * 1024 * 1024)) {		// 5GB limit on part sizes
-							this.abort('file too big');
-							return;
-						}
-					}
-					
-					this.message = null;
-					this.state = STARTED;
-					strategy = {};			// This function shouldn't be called twice so we need a state (TODO:: fix this)
-					
-					build_request(1).then(function(result) {
-						if (self.state != STARTED)
-							return;						// upload was paused or aborted as we were reading the file
-						
-						api.create({file_id: base64.encode(hexToBin(result.data_id))}).
-							then(function(data) {
-								if(data.type == 'direct_upload') {
-									strategy = new AmazonDirect(data);
-								} else {
-									strategy = new AmazonChunked(data, result);
-								}
-							}, defaultError);
-						
-					}, defaultError);	// END BUILD_REQUEST
-					
-					
-				} else if (this.state == PAUSED) {				// We need to resume the upload if it is paused
-					this.message = null;
-					self.error = false;
-					pausing = false;
-					strategy.resume();
-				}
-			};
-			
-			this.pause = function(reason) {
-				if(strategy != null && this.state == UPLOADING) {	// Check if the upload is uploading
-					this.state = PAUSED;
-					pausing = true;
-					strategy.pause();
-				} else if (this.state <= STARTED) {
-					this.state = PAUSED;
-					restart();
-				}
-				if(this.state == PAUSED)
-					this.message = reason;
-			};
-			
-			this.abort = function(reason) {
-				if(strategy != null && this.state < COMPLETED) {	// Check the upload has not finished
-					var old_state = this.state;
-					
-					this.state = ABORTED;
-					api.abort();
-					
-					
-					//
-					// As we may not have successfully deleted the upload
-					//	or we aborted before we received a response from create
-					//
-					restart();	// nullifies strategy
-					
-					
-					//
-					// if we have an upload_id then we should destroy the upload
-					//	we won't worry if this fails as it should be automatically cleaned up by the back end
-					//
-					if(old_state > STARTED) {
-						api.destroy();
-					}
-					
-					this.message = reason;
-				}
-			};
-		}; // END AMAZON
-		
-		
-		//
-		// Register the residence with the API
-		//	Dependency injection succeeded
-		//
-		registrar.register('AmazonS3', {
-			new_upload: function(api, file) {
-				return new Amazon(api, file);
-			}
-		});
-	}]);
-	
-}));
+/**
+*	CoTag Condo Amazon S3 Strategy
+*	Direct to cloud resumable uploads for Amazon S3
+*	
+*   Copyright (c) 2012 CoTag Media.
+*	
+*	@author 	Stephen von Takach <steve@cotag.me>
+* 	@copyright  2012 cotag.me
+* 
+* 	
+* 	References:
+*		* 
+*
+**/
+
+
+(function(angular, base64, undefined) {
+	'use strict';
+	
+	angular.module('Condo').
+	
+	factory('Condo.Amazon', ['$q', 'Condo.Md5', function($q, md5) {
+		var PENDING = 0,
+			STARTED = 1,
+			PAUSED = 2,
+			UPLOADING = 3,
+			COMPLETED = 4,
+			ABORTED = 5,
+		
+		
+		
+		hexToBin = function(input) {
+			var result = "";
+			
+			if ((input.length % 2) > 0) {
+				input = '0' + input;
+			}
+			
+			for (var i = 0, length = input.length; i < length; i += 2) {
+				result += String.fromCharCode(parseInt(input.slice(i, i + 2), 16));
+			}
+			
+			return result;
+		},
+		
+		
+		Amazon = function (api, file) {
+			var self = this,
+				strategy = null,
+				part_size = 5242880,			// Multi-part uploads should be bigger then this
+				pausing = false,
+				defaultError = function(reason) {
+					self.error = !pausing;
+					pausing = false;
+					self.pause(reason);
+				},
+
+			restart = function() {
+				strategy = null;
+			},
+
+
+			completeUpload = function() {
+				api.update().then(function(data) {
+					self.progress = self.size;	// Update to 100%
+					self.state = COMPLETED;
+				}, defaultError);
+			},
+			
+			
+			//
+			// 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
+			//
+			build_request = function(part_number) {
+				var current_part;
+				
+				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;
+				}
+				
+				return md5.hash(current_part).then(function(val) {
+					return {
+						data: current_part,
+						data_id: val,
+						part_number: part_number
+					}
+				}, function(reason){
+					return $q.reject(reason);
+				});
+			},
+
+			//
+			// Direct file upload strategy
+			//
+			AmazonDirect = function(data) {
+				//
+				// resume
+				// abort
+				// pause
+				//
+				var $this = this,
+					finalising = false;
+					
+				//
+				// Update the parent
+				//
+				self.state = UPLOADING;
+	
+				
+				//
+				// This will only be called when the upload has finished and we need to inform the application
+				//
+				this.resume = function() {
+					self.state = UPLOADING;
+					completeUpload();
+				}
+				
+				this.pause = function() {
+					api.abort();
+						
+					if(!finalising) {
+						restart();		// Should occur before events triggered
+						self.progress = 0;
+					}
+				};
+				
+				
+				//
+				// AJAX for upload goes here
+				//
+				data['data'] = file;
+				api.process_request(data, function(progress) {
+					self.progress = progress;
+				}).then(function(result) {
+					finalising = true;
+		        	$this.resume();				// Resume informs the application that the upload is complete
+				}, function(reason) {
+					self.progress = 0;
+					defaultError(reason);
+				});
+			}, // END DIRECT
+
+
+			//
+			// Chunked upload strategy--------------------------------------------------
+			//
+			AmazonChunked = function (data, first_chunk) {
+				//
+				// resume
+				// abort
+				// pause
+				//
+				var part_ids = [],
+					last_part = 0,
+				
+				
+				generatePartManifest = function() {
+					var list = '<CompleteMultipartUpload>';
+					
+					for (var i = 0, length = part_ids.length; i < length; i += 1) {
+						list += '<Part><PartNumber>' + (i + 1) + '</PartNumber><ETag>"' + part_ids[i] + '"</ETag></Part>';
+					}
+					list += '</CompleteMultipartUpload>';
+					return list;
+				},
+				
+				//
+				// Get the next part signature
+				//
+				next_part = function(part_number) {
+					//
+					// Check if we are past the end of the file
+					//
+					if ((part_number - 1) * part_size < file.size) {
+						
+						self.progress = (part_number - 1) * part_size;	// Update the progress
+						
+						build_request(part_number).then(function(result) {
+							if (self.state != UPLOADING)
+								return;						// upload was paused or aborted as we were reading the file
+							
+							api.edit(part_number, base64.encode(hexToBin(result.data_id))).
+								then(function(data) {
+									set_part(data, result);
+								}, defaultError);
+						
+						}, defaultError);	// END BUILD_REQUEST
+						
+					} else {
+						//
+						// We're after the final commit
+						//
+						api.edit('finish').
+							then(function(request) {
+								request['data'] = generatePartManifest();
+								api.process_request(request).then(completeUpload, defaultError);
+							}, defaultError);
+					}
+				},
+				
+					
+				//
+				// Send a part to amazon
+				//
+				set_part = function(request, part_info) {
+					request['data'] = part_info.data;
+					api.process_request(request, function(progress) {
+						self.progress = (part_info.part_number - 1) * part_size + progress;
+					}).then(function(result) {
+						part_ids.push(part_info.data_id);	// We need to record the list of part IDs for completion
+			        		last_part = part_info.part_number;
+			        		next_part(last_part + 1);
+					}, function(reason) {
+						self.progress = (part_info.part_number - 1) * part_size;
+						defaultError(reason);
+					});
+				};
+					
+
+				self.state = UPLOADING;
+	
+				this.resume = function() {
+					self.state = UPLOADING;
+					next_part(last_part + 1);
+				};
+				
+				this.pause = function() {
+					api.abort();
+				};
+				
+				
+				//
+				// We need to check if we are grabbing a parts list or creating an upload
+				//
+				api.process_request(data).then(function(response) {
+					if(data.type == 'parts') {	// was the original request for a list of parts
+		        			//
+		        			// NextPartNumberMarker == the final part in the current request
+		        			//	TODO:: if IsTruncated is set then we need to keep getting parts
+		        			//
+		        			response = $(response[0]);
+		        			var next = parseInt(response.find('NextPartNumberMarker').eq(0).text()),
+		        				etags = response.find('ETag');
+		        			
+		        			etags.each(function(index) {
+		        				part_ids.push($(this).text().replace(/"{1}/gi,''));	// Removes " from strings
+		        			});
+		        			
+		        			last_part = next;		// So we can resume
+		        			next_part(next + 1);	// As NextPartNumberMarker is just the last part uploaded
+		        		} else {
+		        			//
+		        			// We've created the upload - we need to update the application with the upload id.
+		        			//	This will also return the request for uploading the first part which we've already prepared
+		        			//
+							api.update({
+								resumable_id: $(response[0]).find('UploadId').eq(0).text(),
+								file_id: base64.encode(hexToBin(first_chunk.data_id)),
+								part: 1
+							}).then(function(data) {
+								set_part(data, first_chunk);		// Parts start at 1
+							}, function(reason) {
+								defaultError(reason);
+								restart();				// Easier to start from the beginning
+							});
+		        		}
+				}, function(reason) {
+					defaultError(reason);
+					restart();		// We need to get a new request signature
+				});
+			}; // END CHUNKED
+			
+			
+			//
+			// Variables required for all drivers
+			//
+			this.state = PENDING;
+			this.progress = 0;
+			this.message = 'pending';
+			this.name = file.name;
+			this.size = file.size;
+			this.error = false;
+			
+			
+			//
+			// File path is optional (amazon supports paths as part of the key name)
+			//	http://docs.amazonwebservices.com/AmazonS3/2006-03-01/dev/ListingKeysHierarchy.html
+			//
+			if(!!file.dir_path)
+				this.path = file.dir_path;
+			
+			
+			//
+			// Support file slicing
+			//	
+			if (typeof(file.slice) != 'function')
+				file.slice = file.webkitSlice || file.mozSlice;
+			
+			
+			this.start = function(){
+				if(strategy == null) {	// We need to create the upload
+					self.error = false;
+					pausing = false;
+					
+					//
+					// Update part size if required
+					//
+					if((part_size * 9999) < file.size)	{
+						part_size = file.size / 9999;
+						if(part_size > (5 * 1024 * 1024 * 1024)) {		// 5GB limit on part sizes
+							this.abort('file too big');
+							return;
+						}
+					}
+					
+					this.message = null;
+					this.state = STARTED;
+					strategy = {};			// This function shouldn't be called twice so we need a state (TODO:: fix this)
+					
+					build_request(1).then(function(result) {
+						if (self.state != STARTED)
+							return;						// upload was paused or aborted as we were reading the file
+						
+						api.create({file_id: base64.encode(hexToBin(result.data_id))}).
+							then(function(data) {
+								if(data.type == 'direct_upload') {
+									strategy = new AmazonDirect(data);
+								} else {
+									strategy = new AmazonChunked(data, result);
+								}
+							}, defaultError);
+						
+					}, defaultError);	// END BUILD_REQUEST
+					
+					
+				} else if (this.state == PAUSED) {				// We need to resume the upload if it is paused
+					this.message = null;
+					self.error = false;
+					pausing = false;
+					strategy.resume();
+				}
+			};
+			
+			this.pause = function(reason) {
+				if(strategy != null && this.state == UPLOADING) {	// Check if the upload is uploading
+					this.state = PAUSED;
+					pausing = true;
+					strategy.pause();
+				} else if (this.state <= STARTED) {
+					this.state = PAUSED;
+					restart();
+				}
+				if(this.state == PAUSED)
+					this.message = reason;
+			};
+			
+			this.abort = function(reason) {
+				if(strategy != null && this.state < COMPLETED) {	// Check the upload has not finished
+					var old_state = this.state;
+					
+					this.state = ABORTED;
+					api.abort();
+					
+					
+					//
+					// As we may not have successfully deleted the upload
+					//	or we aborted before we received a response from create
+					//
+					restart();	// nullifies strategy
+					
+					
+					//
+					// if we have an upload_id then we should destroy the upload
+					//	we won't worry if this fails as it should be automatically cleaned up by the back end
+					//
+					if(old_state > STARTED) {
+						api.destroy();
+					}
+					
+					this.message = reason;
+				}
+			};
+		}; // END AMAZON
+		
+		
+		return {
+			new_upload: function(api, file) {
+				return new Amazon(api, file);
+			}
+		};
+	}]).
+
+	config(['Condo.ApiProvider', function (ApiProvider) {
+		ApiProvider.register('AmazonS3', 'Condo.Amazon');
+	}]);
+	
+})(angular, window.base64);