condo 1.0.4 → 1.0.6

data/lib/condo/version.rb

@@ -1,3 +1,3 @@
 module Condo
-	VERSION = "1.0.4"
+	VERSION = "1.0.6"
 end

metadata

@@ -1,62 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: condo
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides signed upload signatures to your users browsers so they can
@@ -67,20 +46,23 @@ 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/condo.js
 - app/assets/javascripts/condo/config.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/uploader.js
+- app/assets/javascripts/condo/services/abstract-md5.js.erb
+- app/assets/javascripts/condo/services/base64.js
+- app/assets/javascripts/condo/services/broadcaster.js
+- app/assets/javascripts/condo/services/uploader.js
 - app/assets/javascripts/condo.js
+- app/assets/javascripts/core/core.js
+- app/assets/javascripts/core/services/1-safe-apply.js
+- app/assets/javascripts/core/services/2-messaging.js
 - lib/condo/configuration.rb
 - lib/condo/engine.rb
 - lib/condo/errors.rb
@@ -115,8 +97,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -128,27 +108,26 @@ files:
 - test/test_helper.rb
 homepage: http://cotag.me/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Direct Cloud Storage Uploader
 test_files:
 - test/condo_test.rb
@@ -173,8 +152,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

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

@@ -1,60 +0,0 @@
-/**
-*	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

@@ -1,194 +0,0 @@
-/**
-*	CoTag Condo
-*	Direct to cloud resumable uploads
-*	
-*   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
-*		* http://ericterpstra.com/2012/09/angular-cats-part-3-communicating-with-broadcast/
-*		* http://docs.angularjs.org/api/ng.$rootScope.Scope#$watch
-*
-**/
-
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		// AMD
-		define('condo-controller', ['jquery', 'condo-uploader'], factory);
-	} else {
-		// Browser globals
-		factory(jQuery, window.CondoUploader);
-	}
-}(function ($, uploads, undefined) {
-	'use strict';
-	
-
-
-	//
-	// Create a controller for managing the upload states
-	//
-	uploads.controller('Condo.Controller', ['$scope', 'Condo.Api', 'Condo.Broadcast', 'Condo.Config', function($scope, api, broadcaster, config) {
-		
-		$scope.uploads = [];
-		$scope.upload_count = 0;
-		
-		
-		//
-		// See Condo.Config for configuration options
-		//
-		$scope.endpoint = config.endpoint;
-		$scope.autostart = config.autostart;
-		$scope.ignore_errors = config.ignore_errors;			// Continue to autostart after an error?
-		$scope.parallelism = config.parallelism;				// number of uploads at once
-		
-		
-		$scope.add = function(files) {
-			var length = files.length,
-				i = 0,
-				ret = 0,		// We only want to check for auto-start after the files have been added
-				file;
-			
-			for (; i < length; i += 1) {
-				file = files[i];
-				
-				if(file.size <= 0 || file.type == '')
-					continue;
-					
-				//
-				// check file size is acceptable
-				//
-				if(!config.file_checker(file) || (config.size_limit != undefined && file.size > config.size_limit)) {
-					broadcaster.broadcast('coNotice', {
-						type: 'warn',
-						number: 0,
-						file: file
-					});
-					continue;
-				}
-				
-				$scope.upload_count += 1;
-				
-				api.check_provider($scope.endpoint, files[i]).then(function(upload){
-					ret += 1;
-					$scope.uploads.push(upload);
-					if(ret == length)
-						$scope.check_autostart();
-				}, function(failure) {
-					
-					$scope.upload_count -= 1;
-					
-					ret += 1;
-					if(ret == length)
-						$scope.check_autostart();
-						
-					//
-					// broadcast this so it can be handled by a directive
-					//
-					broadcaster.broadcast('coNotice', failure);
-				});
-			}
-		};
-		
-		
-		$scope.abort = function(upload) {
-			upload.abort();
-			$scope.check_autostart();
-		};
-		
-		
-		$scope.remove = function(upload) {
-			//
-			// Splice(upload, 1) was unreliable. This is better
-			//
-			for (var i = 0, length = $scope.uploads.length; i < length; i += 1) {
-				if($scope.uploads[i] === upload) {
-					$scope.uploads.splice(i, 1);
-					$scope.upload_count -= 1;
-					break;
-				}
-			}
-		};
-		
-		
-		$scope.playpause = function(upload) {
-			if (upload.state == 3)					// Uploading
-				upload.pause();
-			else
-				upload.start();
-		};
-		
-		
-		//
-		// Watch autostart and trigger a check when it is changed
-		//
-		$scope.$watch('autostart', function(newValue, oldValue) {
-			if (newValue === true)
-				$scope.check_autostart();
-		});
-		
-		
-		//
-		// Autostart more uploads as this is bumped up
-		//
-		$scope.$watch('parallelism', function(newValue, oldValue) {
-			if(newValue > oldValue)
-				$scope.check_autostart();
-		});
-		
-		
-		$scope.check_autostart = function() {
-			//
-			// Check if any uploads have been started already
-			//	If there are no active uploads we'll auto-start
-			//
-			// PENDING = 0,
-			// STARTED = 1,
-			// PAUSED = 2,
-			// UPLOADING = 3,
-			// COMPLETED = 4,
-			// ABORTED = 5
-			//
-			if ($scope.autostart) {
-				var shouldStart = true,
-					state, i, length, started = 0;
-					
-				for (i = 0, length = $scope.uploads.length; i < length; i += 1) {
-					state = $scope.uploads[i].state;
-					
-					//
-					// Count started uploads (that don't have errors if we are ignoring errors)
-					//	Up until we've reached our parallel limit, then stop
-					//
-					if (state > 0 && state < 4 && !($scope.uploads[i].error && $scope.ignore_errors)) {
-						started += 1;
-						if(started >= $scope.parallelism) {
-							shouldStart = false;
-							break;
-						}
-					}
-				}
-				
-				if (shouldStart) {
-					started = $scope.parallelism - started;		// How many can we start
-					
-					for (i = 0; i < length; i += 1) {
-						if ($scope.uploads[i].state == 0) {
-							$scope.uploads[i].start();
-							
-							started -= 1;
-							if(started <= 0)	// Break if we can't start anymore
-								break;
-						}
-					}
-				}
-			}
-		};
-		
-	}]);
-	
-}));

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

@@ -1,310 +0,0 @@
-/**
-*	CoTag Condo
-*	Direct to cloud resumable uploads
-*	
-*   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
-*		* http://docs.angularjs.org/api/ng.$http
-*		* http://docs.angularjs.org/api/ng.$q
-*
-**/
-
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		// AMD
-		define('condo-uploader', ['jquery', 'condo-broadcaster'], factory);
-	} else {
-		// Browser globals
-		window.CondoUploader = factory(jQuery);
-	}
-}(function ($) {
-	'use strict';
-	
-	var uploads = angular.module('CondoUploader', ['CondoBroadcaster']),
-		residencies = {};
-	
-	
-	//
-	// Implements the Condo API
-	//
-	uploads.factory('Condo.Api', ['$http', '$rootScope', '$q', function($http, $rootScope, $q) {
-		
-		
-		var token = $('meta[name="csrf-token"]').attr('content'),
-
-		
-		condoConnection = function(api_endpoint, params) {
-			this.endpoint = api_endpoint;		// The API mounting point
-			this.params = params;				// Custom API parameters
-			
-			this.upload_id = null;		// The current upload ID
-			this.aborting = false;		// Has the user has requested an abort?
-			this.xhr = null;			// Any active cloud file xhr requests
-		};
-
-
-		$http.defaults.headers = {};
-		$http.defaults.headers['common'] = {'X-Requested-With': 'XMLHttpRequest'};
-		$http.defaults.headers['post'] = {'X-CSRF-Token': token};
-		$http.defaults.headers['put'] = {'X-CSRF-Token': token};
-		$http.defaults.headers['delete'] = {'X-CSRF-Token': token};
-		
-		condoConnection.prototype = {
-			
-			
-			//
-			// Creates an entry in the database for the requested file and returns the upload signature
-			//	If an entry already exists it returns a parts request signature for resumable uploads
-			//
-			create: function(options) {		// file_id: 123, options: {} 
-				var self = this;
-				options = options || {};
-				this.aborting = false;
-				
-				if(!!options['file_id'])
-					this.params['file_id'] = options['file_id'];
-				
-				if(!!options['parameters'])
-					this.params['parameters'] = options['parameters'];		// We may be requesting the next set of parts
-				
-				return $http({
-					method: 'POST',
-					url: this.endpoint,
-					params: this.params
-				}).then(function(result){
-					result = result.data;
-					self.upload_id = result.upload_id;	// Extract the upload id from the results
-					
-					if (!self.aborting)
-						return result;
-					else
-						return $q.reject(undefined);
-				}, function(reason) {
-					return $q.reject('upload error');
-				});
-			},
-			
-			
-			//
-			// This requests a chunk signature
-			//	Only used for resumable uploads
-			//
-			edit: function(part_number, part_id) {
-				var self = this;
-				this.aborting = false;
-				
-				return $http({
-					method: 'GET',
-					url: this.endpoint + '/' + this.upload_id + '/edit',
-					params: {
-						part: part_number,
-						file_id: part_id
-					}
-				}).then(function(result){
-					if (!self.aborting)
-						return result.data;
-					else
-						return $q.reject(undefined);
-				}, function(reason) {
-					return $q.reject('upload error');
-				});
-			},
-			
-			
-			//
-			// If resumable id is present the upload is updated
-			//	Otherwise the upload deemed complete
-			//
-			update: function(params) {	// optional parameters (resumable_id, file_id and part)
-				var self = this;
-				
-				this.aborting = false;
-				params = params || {};
-					
-				return $http({
-					method: 'PUT',
-					url: this.endpoint + '/' + this.upload_id,
-					params: params
-				}).then(function(result){
-					if (!self.aborting)
-						return result.data;
-					else
-						return $q.reject(undefined);
-				}, function(reason) {
-					if (reason.status == 401 && params.resumable_id == undefined) {
-						return '';		// User may have paused upload as put was being sent. We should let this through just to update the UI
-					} else
-						return $q.reject('upload error');
-				});
-			},
-			
-			
-			//
-			// Cancels a resumable upload
-			//	The actual destruction of the file is handled on the server side as we can't trust the client to do this
-			//	We don't care if this succeeds as the back-end will destroy the file eventually anyway.
-			//
-			destroy: function() {
-				return $http({
-					method: 'DELETE',
-					url: this.endpoint + '/' + this.upload_id
-				});
-			},
-			
-			
-			
-			//
-			// Provides a promise for any request this is what communicated with the cloud storage servers
-			//
-			process_request: function(signature, progress_callback) {
-				var self = this,
-					result = $q.defer(),
-					params = {
-						url: signature.signature.url,
-						type: signature.signature.verb,
-						headers: signature.signature.headers,
-						processData: false,
-						success: function(response, textStatus, jqXHR) {
-							self.xhr = null;
-							result.resolve(response);
-						},
-						error: function(jqXHR, textStatus, errorThrown) {
-							self.xhr = null;
-							if (!self.aborting)
-								result.reject('upload error');
-							else
-								result.reject(undefined);
-						},
-						complete: function(jqXHR, textStatus) {
-							if(!$rootScope.$$phase) {
-								$rootScope.$apply();					// This triggers the promise response
-							}
-						}
-					};
-					
-				this.aborting = false;
-					
-				if (!!self.xhr) {
-					result.reject('request in progress');	// This is awesome
-					return result.promise;
-				}
-				
-				if(!!signature.data){
-					params['data'] = signature.data;
-				}
-				
-				if(!!progress_callback) {
-					params['xhr'] = function() {
-						var xhr = $.ajaxSettings.xhr();
-						if(!!xhr.upload){
-							xhr.upload.addEventListener('progress', function(e) {
-								if (e.lengthComputable) {
-									var phase = $rootScope.$$phase;
-									if(phase == '$apply' || phase == '$digest') {
-										progress_callback(e.loaded);
-									} else {
-										$rootScope.$apply(function(){
-											progress_callback(e.loaded);
-										});
-									}
-								}
-							}, false);
-						}
-						return xhr;
-					};
-				}
-				
-				this.xhr = $.ajax(params);
-				
-				return result.promise;
-			},
-			
-			
-			//
-			// Will trigger the error call-back of the xhr object
-			//
-			abort: function() {
-				this.aborting = true;
-				if(!!this.xhr) {
-					this.xhr.abort();
-				}
-			}
-		};
-		
-		return {
-			//
-			// Used to determine what upload strategy to use (Amazon, Google, etc)
-			//
-			check_provider: function(api_endpoint, the_file, params) {
-				params = params || {};
-				params['file_size'] = the_file.size;
-				params['file_name'] = the_file.name;
-				
-				if(!!the_file.dir_path)
-					params['file_path'] = the_file.dir_path;
-				
-				return $http({
-					method: 'GET',
-					url: api_endpoint + '/new',
-					params: params
-				}).then(function(result){
-					if(!!residencies[result.data.residence]) {
-						
-						var api = new condoConnection(api_endpoint, params);
-						
-						//
-						// TODO:: Check if a file is already in the list and reject if it is
-						//
-						return residencies[result.data.residence].new_upload(api, the_file);	// return the instantiated provider
-						
-					} else {
-						return $q.reject({
-							type: 'error',
-							number: 0,
-							file: the_file
-						});
-					}
-				}, function(reason) {
-					if(reason.status == 406) {
-						return $q.reject({
-							type: 'warn',
-							number: 0,
-							details: reason.data,
-							file: the_file
-						});
-					} else {
-						return $q.reject({
-							type: 'warn',
-							number: 1,
-							file: the_file
-						});
-					}
-				});
-			}
-		};
-	}]).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;
-			}
-		};
-	});
-	
-	
-	
-	//
-	// Anonymous function return
-	//
-	return uploads;
-	
-}));