amplify 1.0.1 → 1.1.0

data/lib/amplify/version.rb

@@ -1,3 +1,3 @@
 module Amplify
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/{app → lib}/assets/javascripts/amplify/core.js.erb

@@ -15,6 +15,7 @@ var slice = [].slice,
 var amplify = global.amplify = {
 	publish: function( topic ) {
 		var args = slice.call( arguments, 1 ),
+			topicSubscriptions,
 			subscription,
 			length,
 			i = 0,
@@ -24,8 +25,9 @@ var amplify = global.amplify = {
 			return true;
 		}
 
-		for ( length = subscriptions[ topic ].length; i < length; i++ ) {
-			subscription = subscriptions[ topic ][ i ];
+		topicSubscriptions = subscriptions[ topic ].slice();
+		for ( length = topicSubscriptions.length; i < length; i++ ) {
+			subscription = topicSubscriptions[ i ];
 			ret = subscription.callback.apply( subscription.context, args );
 			if ( ret === false ) {
 				break;
@@ -48,9 +50,11 @@ var amplify = global.amplify = {
 
 		var topicIndex = 0,
 			topics = topic.split( /\s/ ),
-			topicLength = topics.length;
+			topicLength = topics.length,
+			added;
 		for ( ; topicIndex < topicLength; topicIndex++ ) {
 			topic = topics[ topicIndex ];
+			added = false;
 			if ( !subscriptions[ topic ] ) {
 				subscriptions[ topic ] = [];
 			}
@@ -65,11 +69,14 @@ var amplify = global.amplify = {
 			for ( ; i >= 0; i-- ) {
 				if ( subscriptions[ topic ][ i ].priority <= priority ) {
 					subscriptions[ topic ].splice( i + 1, 0, subscriptionInfo );
-					return callback;
+					added = true;
+					break;
 				}
 			}
-	
-			subscriptions[ topic ].unshift( subscriptionInfo );
+
+			if ( !added ) {
+				subscriptions[ topic ].unshift( subscriptionInfo );
+			}
 		}
 
 		return callback;
@@ -93,4 +100,3 @@ var amplify = global.amplify = {
 };
 
 }( this ) );
-

data/{app → lib}/assets/javascripts/amplify/request.js.erb

@@ -15,6 +15,24 @@ function isFunction( obj ) {
 	return ({}).toString.call( obj ) === "[object Function]";
 }
 
+function async( fn ) {
+	var isAsync = false;
+	setTimeout(function() {
+		isAsync = true;
+	}, 1 );
+	return function() {
+		var that = this,
+			args = arguments;
+		if ( isAsync ) {
+			fn.apply( that, args );
+		} else {
+			setTimeout(function() {
+				fn.apply( that, args );
+			}, 1 );
+		}
+	};
+}
+
 amplify.request = function( resourceId, data, callback ) {
 	// default to an empty hash just so we can handle a missing resourceId
 	// in one place
@@ -36,18 +54,18 @@ amplify.request = function( resourceId, data, callback ) {
 		resource = amplify.request.resources[ settings.resourceId ],
 		success = settings.success || noop,
 		error = settings.error || noop;
-	settings.success = function( data, status ) {
+	settings.success = async( function( data, status ) {
 		status = status || "success";
 		amplify.publish( "request.success", settings, data, status );
 		amplify.publish( "request.complete", settings, data, status );
 		success( data, status );
-	};
-	settings.error = function( data, status ) {
+	});
+	settings.error = async( function( data, status ) {
 		status = status || "error";
 		amplify.publish( "request.error", settings, data, status );
 		amplify.publish( "request.complete", settings, data, status );
 		error( data, status );
-	};
+	});
 
 	if ( !resource ) {
 		if ( !settings.resourceId ) {
@@ -101,10 +119,8 @@ amplify.request.types.ajax = function( defnSettings ) {
 	return function( settings, request ) {
 		var xhr,
 			url = defnSettings.url,
-			data = settings.data,
 			abort = request.abort,
-			ajaxSettings = {},
-			mappedKeys = [],
+			ajaxSettings = $.extend( true, {}, defnSettings, { data: settings.data } ),
 			aborted = false,
 			ampXHR = {
 				readyState: 0,
@@ -136,27 +152,10 @@ amplify.request.types.ajax = function( defnSettings ) {
 				}
 			};
 
-		if ( typeof data !== "string" ) {
-			data = $.extend( true, {}, defnSettings.data, data );
-			
-			url = url.replace( rurlData, function ( m, key ) {
-				if ( key in data ) {
-				    mappedKeys.push( key );
-				    return data[ key ];
-				}
-			});
-			
-			// We delete the keys later so duplicates are still replaced
-			$.each( mappedKeys, function ( i, key ) {
-				delete data[ key ];
-			});
-		}
+		amplify.publish( "request.ajax.preprocess",
+			defnSettings, settings, ajaxSettings, ampXHR );
 
-		$.extend( ajaxSettings, defnSettings, {
-			url: url,
-			type: defnSettings.type,
-			data: data,
-			dataType: defnSettings.dataType,
+		$.extend( ajaxSettings, {
 			success: function( data, status ) {
 				handleResponse( data, status );
 			},
@@ -212,6 +211,56 @@ amplify.request.types.ajax = function( defnSettings ) {
 
 
 
+amplify.subscribe( "request.ajax.preprocess", function( defnSettings, settings, ajaxSettings ) {
+	var mappedKeys = [],
+		data = ajaxSettings.data;
+
+	if ( typeof data === "string" ) {
+		return;
+	}
+
+	data = $.extend( true, {}, defnSettings.data, data );
+
+	ajaxSettings.url = ajaxSettings.url.replace( rurlData, function ( m, key ) {
+		if ( key in data ) {
+		    mappedKeys.push( key );
+		    return data[ key ];
+		}
+	});
+
+	// We delete the keys later so duplicates are still replaced
+	$.each( mappedKeys, function ( i, key ) {
+		delete data[ key ];
+	});
+
+	ajaxSettings.data = data;
+});
+
+
+
+amplify.subscribe( "request.ajax.preprocess", function( defnSettings, settings, ajaxSettings ) {
+	var data = ajaxSettings.data,
+		dataMap = defnSettings.dataMap;
+
+	if ( !dataMap || typeof data === "string" ) {
+		return;
+	}
+
+	if ( $.isFunction( dataMap ) ) {
+		ajaxSettings.data = dataMap( data );
+	} else {
+		$.each( defnSettings.dataMap, function( orig, replace ) {
+			if ( orig in data ) {
+				data[ replace ] = data[ orig ];
+				delete data[ orig ];
+			}
+		});
+		ajaxSettings.data = data;
+	}
+});
+
+
+
 var cache = amplify.request.cache = {
 	_key: function( resourceId, url, data ) {
 		data = url + data;
@@ -334,4 +383,3 @@ amplify.subscribe( "request.before.ajax", function( resource, settings, ajaxSett
 });
 
 }( amplify, jQuery ) );
-

data/{app → lib}/assets/javascripts/amplify/store.js.erb

@@ -123,7 +123,7 @@ for ( var webStorageType in { localStorage: 1, sessionStorage: 1 } ) {
 // globalStorage
 // non-standard: Firefox 2+
 // https://developer.mozilla.org/en/dom/storage#globalStorage
-if ( window.globalStorage ) {
+if ( !store.types.localStorage && window.globalStorage ) {
 	// try/catch for file protocol in Firefox
 	try {
 		createFromStorageInterface( "globalStorage",
@@ -153,65 +153,88 @@ if ( window.globalStorage ) {
 		attrKey = "amplify";
 	div.style.display = "none";
 	document.getElementsByTagName( "head" )[ 0 ].appendChild( div );
-	if ( div.addBehavior ) {
+
+	// we can't feature detect userData support
+	// so just try and see if it fails
+	// surprisingly, even just adding the behavior isn't enough for a failure
+	// so we need to load the data as well
+	try {
 		div.addBehavior( "#default#userdata" );
+		div.load( attrKey );
+	} catch( e ) {
+		div.parentNode.removeChild( div );
+		return;
+	}
 
-		store.addType( "userData", function( key, value, options ) {
-			div.load( attrKey );
-			var attr, parsed, prevValue, i, remove,
-				ret = value,
-				now = (new Date()).getTime();
+	store.addType( "userData", function( key, value, options ) {
+		div.load( attrKey );
+		var attr, parsed, prevValue, i, remove,
+			ret = value,
+			now = (new Date()).getTime();
 
-			if ( !key ) {
-				ret = {};
-				remove = [];
-				i = 0;
-				while ( attr = div.XMLDocument.documentElement.attributes[ i++ ] ) {
-					parsed = JSON.parse( attr.value );
-					if ( parsed.expires && parsed.expires <= now ) {
-						remove.push( attr.name );
-					} else {
-						ret[ attr.name ] = parsed.data;
-					}
-				}
-				while ( key = remove.pop() ) {
-					div.removeAttribute( key );
+		if ( !key ) {
+			ret = {};
+			remove = [];
+			i = 0;
+			while ( attr = div.XMLDocument.documentElement.attributes[ i++ ] ) {
+				parsed = JSON.parse( attr.value );
+				if ( parsed.expires && parsed.expires <= now ) {
+					remove.push( attr.name );
+				} else {
+					ret[ attr.name ] = parsed.data;
 				}
-				div.save( attrKey );
-				return ret;
 			}
+			while ( key = remove.pop() ) {
+				div.removeAttribute( key );
+			}
+			div.save( attrKey );
+			return ret;
+		}
 
-			// convert invalid characters to dashes
-			// http://www.w3.org/TR/REC-xml/#NT-Name
-			// simplified to assume the starting character is valid
-			// also removed colon as it is invalid in HTML attribute names
-			key = key.replace( /[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g, "-" );
+		// convert invalid characters to dashes
+		// http://www.w3.org/TR/REC-xml/#NT-Name
+		// simplified to assume the starting character is valid
+		// also removed colon as it is invalid in HTML attribute names
+		key = key.replace( /[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g, "-" );
 
-			if ( value === undefined ) {
-				attr = div.getAttribute( key );
-				parsed = attr ? JSON.parse( attr ) : { expires: -1 };
-				if ( parsed.expires && parsed.expires <= now ) {
-					div.removeAttribute( key );
-				} else {
-					return parsed.data;
-				}
+		if ( value === undefined ) {
+			attr = div.getAttribute( key );
+			parsed = attr ? JSON.parse( attr ) : { expires: -1 };
+			if ( parsed.expires && parsed.expires <= now ) {
+				div.removeAttribute( key );
 			} else {
-				if ( value === null ) {
-					div.removeAttribute( key );
-				} else {
-					// we need to get the previous value in case we need to rollback
-					prevValue = div.getAttribute( key );
-					parsed = JSON.stringify({
-						data: value,
-						expires: (options.expires ? (now + options.expires) : null)
-					});
-					div.setAttribute( key, parsed );
-				}
+				return parsed.data;
+			}
+		} else {
+			if ( value === null ) {
+				div.removeAttribute( key );
+			} else {
+				// we need to get the previous value in case we need to rollback
+				prevValue = div.getAttribute( key );
+				parsed = JSON.stringify({
+					data: value,
+					expires: (options.expires ? (now + options.expires) : null)
+				});
+				div.setAttribute( key, parsed );
+			}
+		}
+
+		try {
+			div.save( attrKey );
+		// quota exceeded
+		} catch ( error ) {
+			// roll the value back to the previous value
+			if ( prevValue === null ) {
+				div.removeAttribute( key );
+			} else {
+				div.setAttribute( key, prevValue );
 			}
 
+			// expire old data and try again
+			store.userData();
 			try {
+				div.setAttribute( key, parsed );
 				div.save( attrKey );
-			// quota exceeded
 			} catch ( error ) {
 				// roll the value back to the previous value
 				if ( prevValue === null ) {
@@ -219,31 +242,18 @@ if ( window.globalStorage ) {
 				} else {
 					div.setAttribute( key, prevValue );
 				}
-
-				// expire old data and try again
-				store.userData();
-				try {
-					div.setAttribute( key, parsed );
-					div.save( attrKey );
-				} catch ( error ) {
-					// roll the value back to the previous value
-					if ( prevValue === null ) {
-						div.removeAttribute( key );
-					} else {
-						div.setAttribute( key, prevValue );
-					}
-					throw store.error();
-				}
+				throw store.error();
 			}
-			return ret;
-		});
-	}
+		}
+		return ret;
+	});
 }() );
 
 // in-memory storage
 // fallback for all browsers to enable the API even if we can't persist data
 (function() {
-	var memory = {};
+	var memory = {},
+		timeout = {};
 
 	function copy( obj ) {
 		return obj === undefined ? undefined : JSON.parse( JSON.stringify( obj ) );
@@ -258,6 +268,11 @@ if ( window.globalStorage ) {
 			return copy( memory[ key ] );
 		}
 
+		if ( timeout[ key ] ) {
+			clearTimeout( timeout[ key ] );
+			delete timeout[ key ];
+		}
+
 		if ( value === null ) {
 			delete memory[ key ];
 			return null;
@@ -265,8 +280,9 @@ if ( window.globalStorage ) {
 
 		memory[ key ] = value;
 		if ( options.expires ) {
-			setTimeout(function() {
+			timeout[ key ] = setTimeout(function() {
 				delete memory[ key ];
+				delete timeout[ key ];
 			}, options.expires );
 		}
 
@@ -275,4 +291,3 @@ if ( window.globalStorage ) {
 }() );
 
 }( this.amplify = this.amplify || {} ) );
-

metadata

@@ -1,16 +1,11 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amplify
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Scott Gonz\xC3\xA1lez"
+authors:
+- Scott González
 - Andrew Wirick
 - Jonathan Sharp
 - Douglas Neiner
@@ -20,94 +15,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jquery-rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70335421748260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        - 12
-        version: 1.0.12
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70335421748260
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70335421747780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 62196471
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 10
-        version: 2.0.0.beta.10
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id002
-description: AmplifyJS is a set of components designed to solve common web application problems with a simplistic API.
+  prerelease: false
+  version_requirements: *70335421747780
+description: AmplifyJS is a set of components designed to solve common web application
+  problems with a simplistic API.
 email: alassek@lyconic.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/amplify/engine.rb
 - lib/amplify/version.rb
 - lib/amplify.rb
-- app/assets/javascripts/amplify/core.js.erb
-- app/assets/javascripts/amplify/index.js.erb
-- app/assets/javascripts/amplify/request.js.erb
-- app/assets/javascripts/amplify/store.js.erb
-has_rdoc: true
+- lib/assets/javascripts/amplify/core.js.erb
+- lib/assets/javascripts/amplify/index.js.erb
+- lib/assets/javascripts/amplify/request.js.erb
+- lib/assets/javascripts/amplify/store.js.erb
 homepage: http://amplifyjs.com
-licenses: 
+licenses:
 - MIT
 - GPL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A Javascript Component Library
 test_files: []
-