condo 1.0.1 → 1.0.2

data/README.textile

@@ -50,9 +50,11 @@ See the "example application":https://github.com/cotag/condo_example which imple
 
 # Add the following to your rails application gemfile:
 #* @gem 'condo'@
-#* @gem 'condo_active_record'@ (more backends coming soon)
-#* @gem 'condo_interface'@ (optional)
-# Run migrations
+#* 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)

data/app/assets/javascripts/condo.js

@@ -2,4 +2,5 @@
 //= require condo/base64
 //= require condo/broadcaster
 //= require condo/uploader
+//= require condo/config
 //= require condo/controller

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

@@ -51,7 +51,10 @@
 			hasher.onmessage = recievedMessage;
 			hasher.onerror = function(e) {
 				ready = false;
-				broadcaster.broadcast('coComponentLoadFailed', ['MD5', 'file fingerprinting']);		// Critical error
+				broadcaster.broadcast('coNotice', {
+					type: 'error',
+					number: 1
+				});
 			};
 			ready = true;
 		} else {
@@ -60,7 +63,10 @@
 				ready = true;
 				processNext();	// It is possible
 			}).fail(function(jqxhr, settings, exception) {
-				broadcaster.broadcast('coComponentLoadFailed', ['MD5', 'file fingerprinting']);
+				broadcaster.broadcast('coNotice', {
+					type: 'error',
+					number: 1
+				});
 			});
 		}
 		

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

@@ -26,12 +26,18 @@
 }(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 = '';
+		eventBroadcaster.message = {};
 		
 		// The event name is a string used to define event types.
 		eventBroadcaster.eventName = '';

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

@@ -0,0 +1,80 @@
+/**
+*	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/AUTO.$provide
+*		* http://jsfiddle.net/pkozlowski_opensource/PxdSP/14/
+*
+**/
+
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define('condo-config', ['jquery', 'condo-uploader'], factory);
+	} else {
+		// Browser globals
+		factory(jQuery, window.CondoUploader);
+	}
+}(function ($, uploads, undefined) {
+	'use strict';
+	
+
+
+	//
+	// Create a provider for defining the configuration
+	//
+	uploads.provider('Condo.Config', function() {
+		
+		//
+		// Controller options
+		//
+		this.endpoint = '/uploads';		// Default endpoint path
+		this.autostart = true;			// Start uploading as soon as the file is added?
+		this.ignore_errors = true;		// Continue to autostart after an error?
+		this.parallelism = 1;			// number of autostarted uploads at once
+		this.size_limit = undefined;	// defaults to unlimited
+		this.file_checker = function(file) {		// client side filtering of files
+				return true;
+		};
+		
+		//
+		// Directive options (specifically for the condo default interface)
+		//
+		this.delegate = undefined;			// defaults to the condo interface container
+		this.drop_targets = undefined;		// defaults to the condo interface container
+		this.hover_class = 'drag-hover';	// for styling the interface
+		this.supress_notifications = false;	// this prevents js alerts about warnings and errors if you are observing these yourself (Condo.Broadcast)
+		
+		
+		
+		this.$get = function() {
+			var self = this;
+			
+			return {
+				endpoint: self.endpoint,
+				autostart: self.autostart,
+				ignore_errors: self.ignore_errors,
+				parallelism: self.parallelism,
+				file_checker: self.file_checker,
+				size_limit: self.size_limit,
+				
+				delegate: self.delegate,
+				drop_targets: self.drop_targets,
+				hover_class: self.hover_class,
+				supress_notifications: self.supress_notifications
+			};
+		};
+	});
+	
+	
+	
+}));

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

@@ -22,7 +22,7 @@
 		define('condo-controller', ['jquery', 'condo-uploader'], factory);
 	} else {
 		// Browser globals
-		window.CondoController = factory(jQuery, window.CondoUploader);
+		factory(jQuery, window.CondoUploader);
 	}
 }(function ($, uploads, undefined) {
 	'use strict';
@@ -32,25 +32,44 @@
 	//
 	// Create a controller for managing the upload states
 	//
-	uploads.controller('Condo.Controller', ['$scope', 'Condo.Api', 'Condo.Broadcast', function($scope, api, broadcaster) {
+	uploads.controller('Condo.Controller', ['$scope', 'Condo.Api', 'Condo.Broadcast', 'Condo.Config', function($scope, api, broadcaster, config) {
 		
 		$scope.uploads = [];
 		$scope.upload_count = 0;
-		$scope.endpoint = '/uploads';	// Default, the directive can overwrite this
 		
-		$scope.autostart = true;
-		$scope.ignore_errors = true;		// Continue to autostart after an error
-		$scope.parallelism = 1;				// number of uploads at once
+		
+		//
+		// 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
+				ret = 0,		// We only want to check for auto-start after the files have been added
+				file;
 			
 			for (; i < length; i += 1) {
-				if(files[i].size <= 0 || files[i].type == '')
+				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;
 				
@@ -70,7 +89,7 @@
 					//
 					// broadcast this so it can be handled by a directive
 					//
-					broadcaster.broadcast('coFileAddFailed', failure);
+					broadcaster.broadcast('coNotice', failure);
 				});
 			}
 		};
@@ -172,10 +191,4 @@
 		
 	}]);
 	
-	
-	//
-	// Anonymous function return
-	//
-	return uploads;
-	
 }));

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

@@ -266,19 +266,23 @@
 						
 					} else {
 						return $q.reject({
-							reason: 'storage provider not found'
+							type: 'error',
+							number: 0,
+							file: the_file
 						});
 					}
 				}, function(reason) {
 					if(reason.status == 406) {
 						return $q.reject({
-							reason: 'file not accepted',
+							type: 'warn',
+							number: 0,
 							details: reason.data,
 							file: the_file
 						});
 					} else {
 						return $q.reject({
-							reason: 'server error',
+							type: 'warn',
+							number: 1,
 							file: the_file
 						});
 					}

data/lib/condo/engine.rb

@@ -13,11 +13,15 @@ module Condo
 		
 		config.autoload_paths << File.expand_path("../../../lib", __FILE__)
 		
+		
 		#
-		# Set the proper error types for Rails.
+		# Set the proper error types for Rails and add assets for compilation
 		#
-		initializer "load http errors" do |app|
+		initializer "condo initializer" do |app|
+			
 			config.after_initialize do
+				Rails.application.config.assets.precompile += ['condo/md5/hash.worker.js', 'condo/md5/hash.worker.emulator.js']
+				
 				responses = {
 					"Condo::Errors::MissingFurniture" => :not_found,
 					"Condo::Errors::LostTheKeys" => :forbidden,
@@ -29,6 +33,7 @@ module Condo
 					ActionDispatch::ShowExceptions.rescue_responses.update(responses)	# Rails 3.0/3.1
 				end
 			end
+			
 		end
 		
 		

data/lib/condo/strata/google_cloud_storage.rb

@@ -17,15 +17,19 @@ class Condo::Strata::GoogleCloudStorage
 			:location => :na,				# US or Europe, set at bucket creation time
 			:fog => {
 				:provider => 'Google',
-				:google_storage_access_key_id => options[:access_id],
-				:google_storage_secret_access_key => options[:secret_key]
-			}
+				:google_storage_access_key_id => options[:fog_access_id] || options[:access_id],
+				:google_storage_secret_access_key => options[:fog_secret_key] || options[:secret_key]
+			},
+			:api => 1
 		}.merge!(options)
 		
 		
 		raise ArgumentError, 'Google Access ID missing' if @options[:access_id].nil?
 		raise ArgumentError, 'Google Secret Key missing' if @options[:secret_key].nil?
 		
+		if @options[:api] == 2
+			@options[:secret_key] = OpenSSL::PKey::RSA.new(@options[:secret_key])
+		end
 		
 		@options[:location] = @options[:location].to_sym
 	end
@@ -128,7 +132,7 @@ DATA
 		#
 		# Set the access control headers
 		#
-		options[:object_options][:headers]['x-goog-api-version'] = 1
+		options[:object_options][:headers]['x-goog-api-version'] = @options[:api]
 		
 		if options[:object_options][:headers]['x-goog-acl'].nil?
 			options[:object_options][:headers]['x-goog-acl'] = case options[:object_options][:permissions]
@@ -283,12 +287,16 @@ DATA
 		#
 		# Encode the request signature
 		#
-		signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), @options[:secret_key], signature)).chomp!
+		if @options[:api] == 1
+			signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), @options[:secret_key], signature)).gsub("\n","")
+			options[:object_options][:headers]['Authorization'] = "GOOG1 #{@options[:access_id]}:#{signature}"
+		else
+			signature = Base64.encode64(@options[:secret_key].sign(OpenSSL::Digest::SHA256.new, signature)).gsub("\n","")
+		end
 		
 		
 		url += signed_params.present? ? '&' : '?'
 		url = "#{options[:object_options][:protocol]}://#{options[:bucket_name]}.storage.googleapis.com#{url}#{other_params}GoogleAccessId=#{@options[:access_id]}&Expires=#{options[:object_options][:expires]}&Signature=#{CGI::escape(signature)}"
-		options[:object_options][:headers]['Authorization'] = "GOOG1 #{@options[:access_id]}:#{signature}"
 		
 		
 		#

data/lib/condo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/condo/amazon.js
 - app/assets/javascripts/condo/base64.js
 - app/assets/javascripts/condo/broadcaster.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
@@ -183,3 +184,4 @@ test_files:
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
 - test/test_helper.rb
+has_rdoc: