spiderfw 0.5.10 → 0.5.11

data/CHANGELOG

@@ -0,0 +1,6 @@
+= 0.5.11
+=== 15 June, 2010
+* Many bugfixes
+* Javascript api enhancements, JS plugins
+* Minor Visual refactoring
+* Autogenerated DataTypes

data/Rakefile

@@ -5,7 +5,10 @@ require 'pathname'
 def check_app_path(full, partial)
     p = Pathname.new(full)
     rel = p.relative_path_from(Pathname.new(Spider.paths[:core_apps]))
-    return rel.to_s == partial
+    return true if rel.to_s == partial
+    rel = p.relative_path_from(Pathname.new(Spider.paths[:apps]))
+    return true if rel.to_s == partial
+    return false
 end
 
 desc "Update pot/po files. To update a single app, call rake updatepo[app_relative_path], where app_relative_path is the path relative to the apps folder (or 'spider')."

data/VERSION

@@ -0,0 +1 @@
+0.5.11

data/apps/core/auth/controllers/login_controller.rb

@@ -10,6 +10,10 @@ module Spider; module Auth
             nil
         end
         
+        def self.logout_redirect
+            nil
+        end
+        
         def self.users=(val)
             @user_classes = val
         end
@@ -85,7 +89,12 @@ module Spider; module Auth
         def logout
             @request.session[:auth] = nil
             @scene.did_logout = true
-            render('login')
+            red = self.class.logout_redirect
+            if red
+                redirect(red)
+            else
+                redirect('index')
+            end
         end
         
     end

data/apps/core/auth/controllers/mixins/auth_helper.rb

@@ -11,7 +11,9 @@ module Spider; module Auth
         
         def before(action='', *arguments)
             @request.extend(RequestMethods)
-            return super if action.index(Spider::Auth.route_url) == 0
+            super
+            return if action.index(Spider::Auth.route_url) == 0
+            return if respond_to?(:serving_static?) && serving_static?
             self.class.auth_require_users.each do |req|
                 klasses, params = req
                 klasses = [klasses] unless klasses.is_a?(Array)
@@ -64,7 +66,7 @@ module Spider; module Auth
                 end
                 @request.user = user
             end
-            super
+            
         end
         
         def try_rescue(exc)

data/apps/core/auth/views/login.shtml

@@ -1,4 +1,4 @@
-<div>
+<div class="login-page">
     <div class='error' sp:if='@failed_login'>
         Login errata
     </div>

data/apps/core/components/_init.rb

@@ -16,7 +16,7 @@ require 'apps/core/components/widgets/crud/crud'
 require 'apps/core/components/widgets/menu/menu'
 require 'apps/core/components/widgets/admin/admin'
 require 'apps/core/components/widgets/confirm/confirm'
-# require 'apps/core/components/widgets/tabs/tabs'
+require 'apps/core/components/widgets/tabs/tabs'
 require 'apps/core/components/widgets/list/list'
 require 'apps/core/components/widgets/switcher/switcher'
 require 'apps/core/components/widgets/month_calendar/month_calendar'

data/apps/core/components/public/css/spider.css

@@ -1,5 +1,4 @@
 .loading-empty{
-	height: 40px;
 	background: url(img/ajax-loader.gif) no-repeat 10px 10px;
 }
 

data/apps/core/components/public/js/jquery/plugins/jquery.form.js

@@ -373,8 +373,9 @@ $.fn.ajaxSubmit = function(options) {
  * the form itself.
  */
 $.fn.ajaxForm = function(options) {
-	return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
 		$(this).ajaxSubmit(options);
+		e.stopPropagation();
 		return false;
 	}).bind('click.form-plugin', function(e) {
 		var $el = $(e.target);

data/apps/core/components/public/js/list.js

@@ -1,6 +1,8 @@
 Spider.defineWidget('Spider.Components.List', {
 	
 	autoInit: '.wdgt-Spider-Components-List',
+	
+	includePlugins: [Spider.Sortable],
     
     startup: function(){
     },
@@ -12,7 +14,16 @@ Spider.defineWidget('Spider.Components.List', {
 			this.listTagName = this.listEl.get(0).tagName;
 			if (this.el.hasClass('collapsed')) options.collapsed = true;
 	        if (this.el.hasClass('tree')) $(this.listTagName, this.el).treeview(options);
-	        if (this.el.hasClass('sortable')) this.makeSortable();
+	        if (this.el.hasClass('sortable')){
+				this.plugin(Spider.Sortable);
+				this.makeSortable({
+					listEl: this.listEl,
+					handle: '> span.desc',
+					helper: function(e,item) {
+						return $("<div class='treeview-helper'>"+item.find("span.desc").html()+"</div>");
+					}			        
+				});
+			} 
 	        
 		};
 		this.ajaxify($('form, .paginator a', this.el));
@@ -22,141 +33,18 @@ Spider.defineWidget('Spider.Components.List', {
 	update: function(){
 	},
     
-    
-    makeSortable: function(){
-        var options = {
-			items: '>li',
-            helper: function(e,item) {
-				return $("<div class='treeview-helper'>"+item.find("span.desc").html()+"</div>");
-			},
-			handle: '> span.desc',
-			update: this.handleSort.bind(this),
-			receive: this.handleReceive.bind(this)
-		};
-        if (this.el.hasClass('tree')){
-            options = $.extend(options, {
-    			//revert: true,
-    			sortIndication: {
-    				down: function(item) {
-						item.before($('<li id="list-sort-indicator" />'));
-    				},
-    				up: function(item) {
-						item.after($('<li id="list-sort-indicator" />'));
-    				},
-    				remove: function(item) {
-						$('#list-sort-indicator').remove();
-    				}
-    			},
-    			start: function(e, ui) {
-                    console.log("Tree start:");
-                    console.log(e);
-                    console.log(ui);
-//					ui.instance.element.treeview({update: ui.item});
-				},
-				update: this.handleTreeUpdate.bind(this)
-            });
-            this.listEl.sortableTree(options);
-            // handles drops on non-subtrees nodes
-//            debugger;
-            $('.desc', this.el).droppable({
-                accept: "li",
-                hoverClass: "drop",
-                tolerance: "pointer",
-//                greedy: true,
-                drop: this.handleTreeDrop.bind(this)
-                // over: function(e,ui) {
-                //     ui.helper.css("outline", "1px dotted green");
-                // },
-                // out: function(e,ui) {
-                //     ui.helper.css("outline", "1px dotted red");
-                // }
-            });
-        }
-        else{
-            this.listEl.sortable(options);
-        }
-    },
-    
-    handleSort: function(e, ui){
-		if (ui.sender) return; // handled by handleReceive
-        var item = ui.item;
-        var pos = this.findLiPosition(item);
-		if (pos == -1) return;
-		if (this.listEl.data('sortable').fromOutside){ // hack to work around strange jquery ui behaviour...
-			return this.acceptFromSender(null, ui.item, pos);
-		}
-		this.remote('sort', this.getSortItemId(item), pos);
-    },
-
-
-	handleReceive: function(e, ui){
-		if (ui.sender == ui.item){
-			// the item is received from a draggable, not from a list. For some reason the receiver is not
-			// yet ready to find the position; will call acceptFromSender from handleSort.
-			return;
-		}
-		var pos = this.findLiPosition(ui.item);
-		return this.acceptFromSender(ui.sender, ui.item, pos);
-	},
-    
-    handleTreeUpdate: function(e, ui){
-        var parentId = this.getItemId(ui.item.parents('li.tree').eq(0));
-        var prevId = this.getItemId(ui.item.prev('li.tree'));
-        this.remote('tree_sort', this.getItemId(ui.item), parentId, prevId);
-    },
-    
-    handleTreeDrop: function(e, ui){
-        if (e.target.parentNode == ui.draggable[0]) return false; //dropped over itself
-        console.log('dropped inside');
-        var dropLi = $(e.target.parentNode);
-        var subUl = $("> "+this.listTagName, dropLi);
-        if (subUl.length == 0){
-            subUl = $("<"+this.listTagName+" />").appendTo(dropLi);
-            this.el.treeview({add: e.target.parentNode});
-        }
-        subUl.append(ui.draggable);
-		var parentId = this.getItemId($(e.target).parents('li.tree').eq(0));
-		var prevId = null;
-		this.remote('tree_sort', this.getItemId(ui.draggable), parentId, prevId);
-		return false;
-    },
-
-	acceptFromSender: function(sender, item, pos){
-		console.error("Accept from sender must be implemented by the widget instance");
-	},
-    
-    getItemId: function(li){
-        return $('> .dataobject-key', li).text();
-    },
-
 	getItemById: function(id){
 		var found = null;
 		var self = this;
 		$('>li', this.listEl).each(function(){
-			if (self.getItemId(this) == id){
+			$this = $(this);
+			if ($this.dataObjectKey == id){
 				found = $(this);
 				return false;
 			}
 		});
 		return found;
 	},
-
-	getSortItemId: function(li){
-		var k = $('> .sort-key', li);
-		if (k.length > 0) return k.text();
-		return this.getItemId(li);
-	},
-	
-	findLiPosition: function(item){
-		var cnt = 1;
-		var li = $('> li', this.listEl);
-        li.each(function(){
-            if (this == item.get(0)) return false;
-            cnt++;
-        });
-		if (cnt > li.length) return -1; // the row was dropped outside
-		return cnt;
-	},
     
     sortResult: function(res){
         console.log(res);

data/apps/core/components/public/js/plugins/plugin.js

@@ -0,0 +1,7 @@
+Spider.Plugin = Class.extend({
+	
+	init: function(widget){
+		this.widget = widget;
+	}
+	
+});

data/apps/core/components/public/js/plugins/sortable.js

@@ -0,0 +1,124 @@
+Spider.Sortable = Spider.Plugin.extend({
+	
+	
+    makeSortable: function(options){
+		var options = $.extend({
+			listSelector: 'ul',
+			items: '>li',			
+			update: this.handleSort.bind(this),
+			receive: this.handleReceive.bind(this)
+		}, options);
+		this.listEl = options.listEl;
+		if (!this.listEl) this.listEl = $(options.listSelector, this.el);
+        if (this.el.hasClass('tree')){
+            options = $.extend(options, {
+    			//revert: true,
+    			sortIndication: {
+    				down: function(item) {
+						item.before($('<li id="list-sort-indicator" />'));
+    				},
+    				up: function(item) {
+						item.after($('<li id="list-sort-indicator" />'));
+    				},
+    				remove: function(item) {
+						$('#list-sort-indicator').remove();
+    				}
+    			},
+    			start: function(e, ui) {
+                    console.log("Tree start:");
+                    console.log(e);
+                    console.log(ui);
+//					ui.instance.element.treeview({update: ui.item});
+				},
+				update: this.handleTreeUpdate.bind(this)
+            });
+            this.listEl.sortableTree(options);
+            // handles drops on non-subtrees nodes
+//            debugger;
+            $('.desc', this.el).droppable({
+                accept: "li",
+                hoverClass: "drop",
+                tolerance: "pointer",
+//                greedy: true,
+                drop: this.handleTreeDrop.bind(this)
+                // over: function(e,ui) {
+                //     ui.helper.css("outline", "1px dotted green");
+                // },
+                // out: function(e,ui) {
+                //     ui.helper.css("outline", "1px dotted red");
+                // }
+            });
+        }
+        else{
+            this.listEl.sortable(options);
+        }
+    },
+
+	
+    
+    handleSort: function(e, ui){
+		if (ui.sender) return; // handled by handleReceive
+        var item = ui.item;
+        var pos = this.findLiPosition(item);
+		if (pos == -1) return;
+		if (this.listEl.data('sortable').fromOutside){ // hack to work around strange jquery ui behaviour...
+			return this.acceptFromSender(null, ui.item, pos);
+		}
+		this.remote('sort', this.getSortItemId(item), pos);
+    },
+
+
+	handleReceive: function(e, ui){
+		if (ui.sender == ui.item){
+			// the item is received from a draggable, not from a list. For some reason the receiver is not
+			// yet ready to find the position; will call acceptFromSender from handleSort.
+			return;
+		}
+		var pos = this.findLiPosition(ui.item);
+		return this.acceptFromSender(ui.sender, ui.item, pos);
+	},
+    
+    handleTreeUpdate: function(e, ui){
+        var parentId = ui.item.parents('li.tree').eq(0).dataObjectKey();
+        var prevId = ui.item.prev('li.tree').dataObjectKey();
+        this.remote('tree_sort', this.getItemId(ui.item), parentId, prevId);
+    },
+    
+    handleTreeDrop: function(e, ui){
+        if (e.target.parentNode == ui.draggable[0]) return false; //dropped over itself
+        console.log('dropped inside');
+        var dropLi = $(e.target.parentNode);
+        var subUl = $("> "+this.listTagName, dropLi);
+        if (subUl.length == 0){
+            subUl = $("<"+this.listTagName+" />").appendTo(dropLi);
+            this.el.treeview({add: e.target.parentNode});
+        }
+        subUl.append(ui.draggable);
+		var parentId = $(e.target).parents('li.tree').eq(0).dataObjectKey();
+		var prevId = null;
+		this.remote('tree_sort', ui.draggable.dataObjectKey(), parentId, prevId);
+		return false;
+    },
+
+	acceptFromSender: function(sender, item, pos){
+		console.error("Accept from sender must be implemented by the widget instance");
+	},
+	
+	findLiPosition: function(item){
+		var cnt = 1;
+		var li = $('> li', this.listEl);
+        li.each(function(){
+            if (this == item.get(0)) return false;
+            cnt++;
+        });
+		if (cnt > li.length) return -1; // the row was dropped outside
+		return cnt;
+	},
+	
+	getSortItemId: function(li){
+		var k = $('> .sort-key', li);
+		if (k.length > 0) return k.text();
+		return li.dataObjectKey();
+	}
+	
+});

data/apps/core/components/public/js/spider.js

@@ -7,7 +7,7 @@ function $W(path){
     if (Spider.widgets[path]) return Spider.widgets[path];
     var wdgt_id = path.replace(/\//g, '-');
     var wdgt = $('#'+wdgt_id);
-    if (!wdgt) return null;
+    if (wdgt.length == 0) return null;
     return Spider.Widget.initFromEl(wdgt);
 }
 
@@ -23,6 +23,8 @@ Spider.Widget = Class.extend({
     init: function(container, path, config){
         this.el = container;
         this.path = path;
+		var pathParts = path.split('/');
+		this.widgetId = pathParts[pathParts.length - 1];
         this.backend = new Spider.WidgetBackend(this);
 		this.readyFunctions = [];
 		config = $.extend({}, config);
@@ -30,15 +32,26 @@ Spider.Widget = Class.extend({
 		this.model = config.model;
         Spider.widgets[path] = this;
 		this.events = [];
+		this.onWidgetCallbacks = {};
+		this.widgets = {};
+		this.findWidgets();		
 		this.startup();
 		this.ready();
 		this.applyReady();
+		this.plugins = [];
+		if (this.includePlugins) for (var i=0; i<this.includePlugins.length; i++){
+			this.plugin(this.includePlugins[i]);
+		}
     },
     
     remote: function(){
         var args = Array.prototype.slice.call(arguments); 
         var method = args.shift();
-        return this.backend.send(method, args);
+		var options = {};
+		if ($.isFunction(args[args.length-1])){
+			options.callback = args.pop();
+		}
+        return this.backend.send(method, args, options);
     },
 
 	onReady: function(callback){
@@ -53,9 +66,17 @@ Spider.Widget = Class.extend({
 	},
 	
 	reload: function(params, callback){
+		if (!callback && $.isFunction(params)){
+			callback = params;
+			params = {};
+		}
 		$C.loadWidget(this.path, params, callback);
 	},
 	
+	isLoaded: function(){
+		return !this.el.is(':empty');
+	},
+	
 	startup: function(){},
 	ready: function(){},
 	update: function(){},
@@ -63,6 +84,7 @@ Spider.Widget = Class.extend({
 	replaceHTML: function(html){
 		var el = $(html);
 		this.el.html(el.html());
+		this.findWidgets();
 		this.update();
 		this.ready();
 		Spider.newHTML(this.el);
@@ -72,11 +94,34 @@ Spider.Widget = Class.extend({
 	
 	replaceEl: function(el){
 		this.el = el;
+		this.findWidgets();		
 		this.update();
 		this.ready();
 		this.applyReady();
 	},
 	
+	findWidgets: function(){
+		var self = this;
+		$('.widget', this.el).filter(function(index){
+			if ($(this).parents('.widget').get(0) == self.el.get(0)) return true;
+			return false;
+		}).each(function(){
+			var $this = $(this);
+			var w = $this.spiderWidget();
+			if (!self.widgets[w.widgetId]) self.addWidget(w.widgetId, w);
+			else self.widgets[w.widgetId].replaceEl($this);
+		});
+	},
+	
+	addWidget: function(id, w){
+		this.widgets[id] = w;
+		if (this.onWidgetCallbacks[id]){
+			for (var i=0; i<this.onWidgetCallbacks[id].length; i++){
+				this.onWidgetCallbacks[id][i].call(this, w);
+			}
+		}
+	},
+	
 	paramName: function(key){
 		var pathParts = this.path.split('/');
 		var param = "_w";
@@ -91,69 +136,111 @@ Spider.Widget = Class.extend({
 	},
 	
 	
+	ajaxifyAll: function(options){
+		var els = $('form:not(.ajaxified), a:not(.ajaxified)', this.el);
+		if (!options) options = {};
+		if (options.filter) els = els.filter(options.filter);
+		if (options.not) els = els.not(options.not);
+		this.ajaxify(els, options);
+	},
+	
+	findWidgetsAjaxifiable: function(options){
+		var selfEl = this.el.get(0);
+		return $('form:not(.ajaxified), a:not(.ajaxified)', this.el).filter(function(index){
+			var p = $(this).parent();
+			while (p){
+				if (p.is('.widget')){
+					if (p.get(0) == selfEl) return true;
+					return false;
+				}
+				p = p.parent();
+			}
+			return false;
+		});
+	},
+	
+	
 	ajaxify: function(el, options){
 		var w = this;
+		if (!el || !el.eq){
+			options = el;
+			el = this.findWidgetsAjaxifiable();
+		}
 		if (!options) options = {};
 		el.each(function(){
 			var $this = $(this);
 			if (this.tagName == 'FORM'){
-				w.ajaxifyForm($(this));
+				w.ajaxifyForm($(this), options);
 			}
 			else if (this.tagName == 'A'){
-				$this.click(function(e){
-					if (options.before){
-						var res = options.before.apply(this);
-						if (res === false) return false ;
-					}
-					e.preventDefault();
-					var a = $(e.target);
-					var url = $(this).attr('href');
-					var parts = url.split('?');
-					url = parts[0]; //+'.json';
-					url += '?';
-					if (parts[1]) url += parts[1]+'&';
-					url += '_wt='+w.path;
-					w.setLoading();
-					$.ajax({
-						url: url,
-						type: 'GET',
-						dataType: 'html',
-						success: function(res){
-							w.replaceHTML(res);
-							w.removeLoading();
-						}
-					});
-				});
+				w.ajaxifyLink($(this), options);
 			}
 		});
 
 	},
 	
-	ajaxifyForm: function(form){
-		var w = this;
+	ajaxifyForm: function(form, options){
 		var isForm = form.get(0).tagName == 'FORM';
-		$('input[type=submit]', form).click(function(e){
+		if (!options) options = {};
+		$('input[type=submit]', form).addClass('ajaxified').bind('click.ajaxify', function(e){
+			var $this = $(this);
+			var w = $this.parentWidget();
 			e.preventDefault();
 			w.setLoading();
-			var submitName = $(this).attr('name');
-			var submitValue = $(this).val();
+			var submitName = $this.attr('name');
+			var submitValue = $this.val();
 			form.ajaxSubmit({
 				dataType: 'html',
 				semantic: !isForm,
 				beforeSubmit: function(data, form, options){
 					data.push({name: submitName, value: submitValue});
 					data.push({name: '_wt', value: w.path});
+					if (options.before) options.before();
 				},
 				success: function(res){
 					w.replaceHTML(res);
 					w.removeLoading();
+					if (options.onLoad) options.onLoad(form);
+					w.trigger('ajaxifyLoad', form);
+				}
+			});
+		});
+	},
+	
+	ajaxifyLink: function(a, options){
+		var w = this;
+		if (!options) options = {};
+		a.addClass('ajaxified').bind('click.ajaxify', function(e){
+			if (options.before){
+				var res = options.before.apply(w);
+				if (res === false) return false ;
+			}
+			e.preventDefault();
+			var a = $(e.target);
+			var url = $(this).attr('href');
+			var parts = url.split('?');
+			url = parts[0]; //+'.json';
+			url += '?';
+			if (parts[1]) url += parts[1]+'&';
+			url += '_wt='+w.path;
+			if (options.before) options.before();
+			w.setLoading();
+			$.ajax({
+				url: url,
+				type: 'GET',
+				dataType: 'html',
+				success: function(res){
+					w.replaceHTML(res);
+					w.removeLoading();
+					if (options.onLoad) options.onLoad(a);
+					w.trigger('ajaxifyLoad', a);
 				}
 			});
 		});
 	},
 	
 	setLoading: function(){
-		if (this.el.is(':empty')){
+		if (this.el.is(':empty') || this.el.children().hasClass('empty-placeholder')){
 			this.el.addClass('loading-empty');
 		}
 		else{
@@ -201,18 +288,73 @@ Spider.Widget = Class.extend({
 	},
 	
 	bind: function(eventName, callback){
-		if (!this.events[eventName]){
-			this.events[eventName] = [];
+		var handleObj = {
+			callback: callback
+		};
+		if ( eventName.indexOf(".") > -1 ) {
+			var namespaces = eventName.split(".");
+			eventName = namespaces.shift();
+			handleObj.namespace = namespaces.slice(0).sort().join(".");
 		}
-		this.events[eventName].push(callback);
+		if (!this.events[eventName]) this.events[eventName] = [];
+		this.events[eventName].push(handleObj);
 	},
 	
+	on: function(eventName, callback){ return this.bind(eventName, callback); },
+	
 	trigger: function(eventName){
+		if ( eventName.indexOf(".") > -1 ) {
+			var namespaces = eventName.split(".");
+			eventName = namespaces.shift();
+			namespace = namespaces.slice(0).sort().join(".");
+		}
 		if (!this.events[eventName]) return;
 		var args = Array.prototype.slice.call(arguments, 1); 
 		for (var i=0; i < this.events[eventName].length; i++){
-			this.events[eventName][i].apply(this, args);
+			this.events[eventName][i].callback.apply(this, args);
+		}
+	},
+	
+	unbind: function(eventName){
+		var namespace = null;
+		if ( eventName.indexOf(".") > -1 ) {
+			var namespaces = eventName.split(".");
+			eventName = namespaces.shift();
+			namespace = namespaces.slice(0).sort().join(".");
 		}
+		if (namespace){
+			for (var i=0; i<this.events[eventName].length; i++){
+				if (this.events[eventName][i].namespace == namespace){
+					this.events[eventName].splice(i);
+				}
+			}
+		}
+		else this.events[eventName] = [];
+	},
+	
+	plugin: function(pClass, prop){
+		if (prop) pClass = pClass.extend(prop);
+		this.plugins[pClass] = new pClass(this);
+		var plugin = this.plugins[pClass];
+		for (var name in pClass.prototype){
+			if (name.substring(0, 1) == '_') continue;
+			if (typeof pClass.prototype[name] == "function" && !this[name]){
+				this[name] = function(name){
+					return function(){
+						return plugin[name].apply(this, arguments);
+					};
+				}(name);
+			}
+		}
+	},
+	
+	widget: function(id){
+		return this.widgets[id];
+	},
+	
+	onWidget: function(id, callback){
+		if (!this.onWidgetCallbacks[id]) this.onWidgetCallbacks[id] = [];
+		this.onWidgetCallbacks[id].push(callback);
 	}
 	
 	
@@ -276,20 +418,29 @@ Spider.WidgetBackend = Class.extend({
 	},
 
 	send: function(method, args, options){
-		var url = this.urlForMethod(method);
-		for (var i=0; i<args.length; i++){
-			url += '&_wp[]='+args[i];
-		}
-		var data = {};
-		var callback = this.widget[method+'_response'];
-		if (!callback) callback = function(){};
+		if (!options) options = {};
 		var defaults = {
-			url: url,
 			type: 'POST',
-			success: callback,
-			data: data
+			dataType: 'json'
 		};
 		options = $.extend(defaults, options);
+		if (!options.format) options.format = options.dataType;
+		var url = this.baseUrl;
+		var data = {};
+		if ($.isPlainObject(args[0])) data = args[0];
+		else data = {'_wp': args};
+		$.extend(data, {
+			'_wt': this.widget.path,
+			'_we': method,
+			'_wf': options.format
+		});
+		var callback = this.widget[method+'_response'];
+		if (!callback) callback = options.callback;
+		if (!callback) callback = function(){};
+		delete(options.callback);
+		options.success = callback;
+		options.data = data;
+		options.url = url;
 		$.ajax(options);
 	}
 
@@ -327,6 +478,7 @@ Spider.defineWidget = function(name, parent, w){
 			});
 		});
 	}
+	return widget;
 };
 
 Spider.Controller = Class.extend({
@@ -335,8 +487,14 @@ Spider.Controller = Class.extend({
 		var url = ''+document.location;
 		var slashPos = url.lastIndexOf('/');
 		url = url.substr(0, slashPos);
-		this.url = url;
+		this.setUrl(url);
     },
+
+	setUrl: function(url){
+		this.url = url;
+		this.publicUrl = this.url+'/public'; // FIXME
+		this.homeUrl = this.url+'/_h';
+	},
     
 	remote: function(method, params, callback, options){
 		var args = Array.prototype.slice.call(arguments); 
@@ -345,8 +503,9 @@ Spider.Controller = Class.extend({
 		var defaults = {
 			url: url,
 			type: 'POST',
-			complete: callback,
-			data: params
+			success: callback,
+			data: params,
+			dataType: 'json'
 		};
 		options = $.extend(defaults, options);
 		$.ajax(options);
@@ -431,7 +590,9 @@ $(document).ready(function(){
 
 $.fn.spiderWidget = function(){
 	if (!this.attr('id')) return;
-	return $W(Spider.Widget.pathFromId(this.attr('id')));
+	var path = Spider.Widget.pathFromId(this.attr('id'));
+	if (Spider.widgets[path]) return Spider.widgets[path];
+	return Spider.Widget.initFromEl(this);
 };
 
 $.fn.parentWidget = function(){