@@ -1,4 +1,4 @@ -== 0.0.1 2009-06-03 +== 0.0.1 2009-06-08 * 1 major enhancement: * Initial release History.txt @@ -2,7 +2,7 @@ <script type="text/javascript" charset="utf-8"> <%= sammy_js %> (function($) { - var app = $.sammy(function() { with(this) { + app = $.sammy(function() { with(this) { <% @sammy_options.each do |option, value| %> this.<%= option %> = <%= value.inspect %>; @@ -13,6 +13,25 @@ partial(params['splat'] + '?_sammy=true'); }}); + post(/^(.*)$/, function() { with(this) { + try { + var context = this; + trigger('loading'); + $.ajax({ + type: 'post', + url: this.params['splat'][0], + data: this.params.toHash(), + success: function(data) { + context.app.swap(data); + context.trigger('changed'); + } + }); + } catch(e) { + this.log(e); + } + return false; + }}); + bind('changed', function() { with(this) { $('a').attr('href', function() { var href = $(this).attr('href'); @@ -23,7 +42,7 @@ } }); }}); - + }}); $(function() { lib/sinatra/sammy.erb @@ -24,7 +24,7 @@ module Sinatra end def sammy_js - File.read(vendor_path('sammy.js')) + File.read(vendor_path('sammy.min.js')) end private lib/sinatra/sammy.rb @@ -14,4 +14,9 @@ class TestApp < Sinatra::Default haml :user end + post '/user' do + @name = params['name'] + " POSTED" + haml :user + end + end spec/test_app/test_app.rb @@ -4,4 +4,10 @@ %h2 Check out these users! - ['aq', 'team_lazer'].each do |name| %p - %a{:href => "/user/#{name}"}= name \ No newline at end of file + %a{:href => "/user/#{name}"}= name + +%h2 Or create your own! + +%form{:method => 'post', :action => '/user'} + %input{:type => 'text', :name => 'name'} + %input{:type => 'submit', :value => 'Go!'} \ No newline at end of file spec/test_app/views/index.haml @@ -106,6 +106,17 @@ return $.extend({}, obj); }, + // Returns a copy of the object with Functions removed. + toHash: function() { + var json = {}; + this.each(function(k,v) { + if (!$.isFunction(v)) { + json[k] = v + } + }); + return json; + }, + // Renders a simple HTML version of this Objects attributes. // Does not render functions. // For example. Given this Sammy.Object: @@ -116,7 +127,7 @@ toHTML: function() { var display = ""; this.each(function(k, v) { - if (v.constructor != Function) { + if (!$.isFunction(v)) { display += "<strong>" + k + "</strong> " + v + "<br />"; } }); @@ -634,6 +645,8 @@ // reset last location this.last_location = location; } catch(e) { + // reset last location + this.last_location = location; // unless the error is a 404 and 404s are silenced if (e.toString().match(/^404/) && this.silence_404) { return returned; vendor/sammy.js @@ -1,5 +1,5 @@ // -- Sammy -- // http://code.quirkey.com/sammy -// Version: 0.1.4 -// Built: Wed Jun 03 16:29:52 -0400 2009 -(function(){var a=false,b=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(g){var f=this.prototype;a=true;var e=new this();a=false;for(var d in g){e[d]=typeof g[d]=="function"&&typeof f[d]=="function"&&b.test(g[d])?(function(h,i){return function(){var k=this._super;this._super=f[h];var j=i.apply(this,arguments);this._super=k;return j}})(d,g[d]):g[d]}function c(){if(!a&&this.init){this.init.apply(this,arguments)}}c.prototype=e;c.constructor=c;c.extend=arguments.callee;return c}})();(function(a){a.srender=function(b,c,d){a.srender.cache=a.srender.cache||{};if(a.srender.cache[b]){fn=a.srender.cache[b]}else{if(typeof c=="undefined"){return false}fn=a.srender.cache[b]=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+c.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');")}if(typeof d!="undefined"){return fn(d)}else{return fn}}})(jQuery);(function(c){var a="([^/]+)";var b=/:([\w\d]+)/g;Sammy={};Sammy.VERSION="0.1.4";Sammy.Object=Class.extend({init:function(d){c.extend(this,d)},clone:function(d){if(typeof d=="undefined"){d=this}return c.extend({},d)},toHTML:function(){var d="";this.each(function(f,e){if(e.constructor!=Function){d+="<strong>"+f+"</strong> "+e+"<br />"}});return d},uuid:function(){if(typeof this._uuid=="undefined"||!this._uuid){this._uuid=(new Date()).getTime()+"-"+parseInt(Math.random()*1000)}return this._uuid},each:function(){var f,e,g,d;f=this;if(typeof arguments[0]!="function"){e=arguments[0];g=arguments[1]}else{e=this;g=arguments[0]}d=function(){return g.apply(f,arguments)};c.each(e,d)},log:function(){var d=[].slice.call(arguments);d.unshift("["+Date()+"]");if(typeof window.console!="undefined"){window.console.log.apply(window.console,d)}else{if(typeof console!="undefined"){console.log.apply(this,d)}else{}}}});Sammy.Application=Sammy.Object.extend({ROUTE_VERBS:["get","post","put","delete"],APP_EVENTS:["run","unload","lookup-route","run-route","route-found","event-context-before","event-context-after","changed","error-404","check-form-submission","redirect"],_last_route:null,_running:false,data_store_name:"sammy-app",element_selector:"body",debug:false,silence_404:true,run_interval_every:50,init:function(d){var e=this;this.routes={};this.listeners={};this.befores=[];this.namespace=this.uuid();this.context_prototype=Sammy.EventContext.extend({});this.each(this.ROUTE_VERBS,function(f,g){this._defineRouteShortcut(g)});d.apply(this);if(this.debug){this.addLogger(function(g,f){e.log(e.toString(),g.cleaned_type,f||{})})}},toString:function(){return"Sammy.Application:"+this.element_selector},$element:function(){return c(this.element_selector)},route:function(h,f,j){var g=this;var i=[];if(f.constructor==String){while((path_match=b.exec(f))!=null){i.push(path_match[1])}f=new RegExp(f.replace(b,a)+"$")}var d={verb:h,path:f,callback:j,param_names:i};if(typeof this.routes[h]=="undefined"||this.routes[h].length==0){this.routes[h]=[d]}else{var e=false;this.each(this.routes[h],function(l,k){if(f.toString().length>=k.path.toString().length){this.routes[h].splice(l,0,d);e=true;return false}});if(!e){this.routes[h].push(d)}}return d},eventNamespace:function(){return this.data_store_name+"-"+this.namespace+"-"},bind:function(d,f,g){if(typeof g=="undefined"){g=f}var e=function(){var j,h,i;j=arguments[0];h=arguments[1];i=arguments[2];j.cleaned_type=j.type.replace(h.eventNamespace(),"");g.apply(h,[j,i])};if(!this.listeners[d]){this.listeners[d]=[]}this.listeners[d].push(e);if(this.isRunning()){return this._listen(d,e)}},trigger:function(d,f,e){if(typeof e=="undefined"){e=new this.context_prototype(this,"bind",d,f)}return this.$element().triggerHandler(e.eventNamespace()+d,[e,f])},before:function(d){return this.befores.push(d)},after:function(d){return this.bind("event-context-after",d)},isRunning:function(){return this._running},helpers:function(d){this.context_prototype=this.context_prototype.extend(d)},run:function(d){if(this.isRunning()){return false}var e=this;this.each(this.listeners,function(f,g){this.each(g,function(j,h){this._listen(f,h)})});this.trigger("run",{start_url:d});this._running=true;this.$element().data(this.data_store_name,this);this.last_location={href:"",pathname:"",hash:""};if(typeof d!="undefined"){window.location=d}this._checkURL();this._interval=setInterval(function(){e._checkURL.apply(e)},this.run_interval_every);this.bind("changed",function(){e.$element().find("form:not(."+e.eventNamespace()+")").bind("submit",function(){return e._checkFormSubmission(this)}).addClass(e.eventNamespace())});c("body").bind("onunload",function(){e.unload()});this.trigger("changed")},unload:function(){if(!this.isRunning()){return false}var d=this;this.trigger("unload");clearInterval(this._interval);this.$element().find("form").unbind("submit").removeClass(d.eventNamespace());this.$element().removeData(this.data_store_name);this.each(this.listeners,function(e,f){this.each(f,function(h,g){this._unlisten(e,g)})});this._running=false},addLogger:function(d){this.each(this.APP_EVENTS,function(f,g){this.bind(g,d)})},lookupRoute:function(f,e){var d=false;this.trigger("lookup-route",{verb:f,path:e});if(typeof this.routes[f]!="undefined"){this.each(this.routes[f],function(h,g){if(e.match(g.path)){d=g;return false}})}return d},runRoute:function(k,h,j){this.trigger("run-route",{verb:k,path:h,params:j});if(typeof j=="undefined"){j={}}var e=this.lookupRoute(k,h);if(e){this.trigger("route-found",{route:e});if((path_params=e.path.exec(h))!=null){path_params.shift();this.each(path_params,function(l,m){if(e.param_names[l]){j[e.param_names[l]]=m}else{if(!j.splat){j.splat=[]}j.splat.push(m)}})}var f=new this.context_prototype(this,k,h,j);this.last_route=e;var d=true;var i=this.befores.slice(0);while(i.length>0){if(i.shift().apply(f)===false){return false}}f.trigger("event-context-before");var g=e.callback.apply(f);f.trigger("event-context-after");f.trigger("changed");return g}else{this.notFound(k,h)}},currentLocation:function(){var d=this.clone(window.location);return d},notFound:function(e,d){this.trigger("error-404",{verb:e,path:d});throw ("404 Not Found "+e+" "+d)},_defineRouteShortcut:function(e){var d=this;this[e]=function(f,g){d.route.apply(d,[e,f,g])}},_checkURL:function(){try{var d,f;d=this.currentLocation();if(d.hash!=""&&d.hash!=this.last_location.hash){f=this.runRoute("get",d.hash)}else{if(d.pathname!=this.last_location.pathname){f=this.runRoute("get",d.pathname)}}this.last_location=d}catch(g){if(g.toString().match(/^404/)&&this.silence_404){return f}else{throw (g)}}return f},_checkFormSubmission:function(g){var d,i,k,j,f;this.trigger("check-form-submission",{form:g});d=c(g);i=d.attr("action");k=d.attr("method").toString().toLowerCase();j={};d.find(":input[type!=submit]").each(function(){j[c(this).attr("name")]=c(this).val()});try{f=this.runRoute(k,i,j)}catch(h){if(h.toString().match(/^404/)&&this.silence_404){return true}else{throw (h)}}return(typeof f=="undefined")?false:f},_listen:function(d,e){return this.$element().bind(this.eventNamespace()+d,e)},_unlisten:function(d,e){return this.$element().unbind(this.eventNamespace()+d,e)}});Sammy.EventContext=Sammy.Object.extend({init:function(g,f,d,e){this.app=g;this.verb=f;this.path=d;this.params=new Sammy.Object(e)},$element:function(){return this.app.$element()},template:function(e,f,d){if(typeof d=="undefined"){d=e}return c.srender(d,e,c.extend({},f,this))},partial:function(g,f,i){var e,h,d;d=this;if(typeof i=="undefined"){if(typeof f=="function"){i=f;f={}}else{i=function(j){d.app.$element().html(j)}}}e=c.srender(g);f=c.extend({},f,this);if(e){h=e(f);i.apply(d,[h]);d.trigger("changed")}else{c.get(g,function(j){h=c.srender(g,j,f);i.apply(d,[h]);d.trigger("changed")})}},redirect:function(d){this.trigger("redirect",{to:d});if(d.match(/^\#/)){window.location.hash=d}else{if(d.match(/^\//)){window.location.pathname=d}else{window.location=d}}return true},trigger:function(d,e){return this.app.trigger(d,e,this)},eventNamespace:function(){return this.app.eventNamespace()},notFound:function(){return this.app.notFound(this.verb,this.path)}});c.sammy=function(d){return new Sammy.Application(d)}})(jQuery); \ No newline at end of file +// Version: 0.2.0pre +// Built: Tue Jun 09 18:18:42 -0400 2009 +(function(){var a=false,b=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(g){var f=this.prototype;a=true;var e=new this();a=false;for(var d in g){e[d]=typeof g[d]=="function"&&typeof f[d]=="function"&&b.test(g[d])?(function(h,i){return function(){var k=this._super;this._super=f[h];var j=i.apply(this,arguments);this._super=k;return j}})(d,g[d]):g[d]}function c(){if(!a&&this.init){this.init.apply(this,arguments)}}c.prototype=e;c.constructor=c;c.extend=arguments.callee;return c}})();(function(a){a.srender=function(b,c,d){a.srender.cache=a.srender.cache||{};if(a.srender.cache[b]){fn=a.srender.cache[b]}else{if(typeof c=="undefined"){return false}fn=a.srender.cache[b]=new Function("obj",'var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push("'+c.replace(/[\r\t\n]/g," ").replace(/\"/g,'\\"').split("<%").join("\t").replace(/((^|%>)[^\t]*)/g,"$1\r").replace(/\t=(.*?)%>/g,'",$1,"').split("\t").join('");').split("%>").join('p.push("').split("\r").join("")+"\");}return p.join('');")}if(typeof d!="undefined"){return fn(d)}else{return fn}}})(jQuery);(function(c){var a="([^/]+)";var b=/:([\w\d]+)/g;Sammy={};Sammy.VERSION="0.2.0pre";Sammy.Object=Class.extend({init:function(d){c.extend(this,d)},clone:function(d){if(typeof d=="undefined"){d=this}return c.extend({},d)},toHash:function(){var d={};this.each(function(f,e){if(!c.isFunction(e)){d[f]=e}});return d},toHTML:function(){var d="";this.each(function(f,e){if(!c.isFunction(e)){d+="<strong>"+f+"</strong> "+e+"<br />"}});return d},uuid:function(){if(typeof this._uuid=="undefined"||!this._uuid){this._uuid=(new Date()).getTime()+"-"+parseInt(Math.random()*1000)}return this._uuid},each:function(){var f,e,g,d;f=this;if(typeof arguments[0]!="function"){e=arguments[0];g=arguments[1]}else{e=this;g=arguments[0]}d=function(){return g.apply(f,arguments)};c.each(e,d)},log:function(){var d=[].slice.call(arguments);d.unshift("["+Date()+"]");if(typeof window.console!="undefined"){window.console.log.apply(window.console,d)}else{if(typeof console!="undefined"){console.log.apply(this,d)}else{}}}});Sammy.Application=Sammy.Object.extend({ROUTE_VERBS:["get","post","put","delete"],APP_EVENTS:["run","unload","lookup-route","run-route","route-found","event-context-before","event-context-after","changed","error-404","check-form-submission","redirect"],_last_route:null,_running:false,data_store_name:"sammy-app",element_selector:"body",debug:false,silence_404:true,run_interval_every:50,init:function(d){var e=this;this.routes={};this.listeners={};this.befores=[];this.namespace=this.uuid();this.context_prototype=Sammy.EventContext.extend({});this.each(this.ROUTE_VERBS,function(f,g){this._defineRouteShortcut(g)});d.apply(this);if(this.debug){this.addLogger(function(g,f){e.log(e.toString(),g.cleaned_type,f||{})})}},toString:function(){return"Sammy.Application:"+this.element_selector},$element:function(){return c(this.element_selector)},route:function(h,f,j){var g=this;var i=[];if(f.constructor==String){while((path_match=b.exec(f))!=null){i.push(path_match[1])}f=new RegExp(f.replace(b,a)+"$")}var d={verb:h,path:f,callback:j,param_names:i};if(typeof this.routes[h]=="undefined"||this.routes[h].length==0){this.routes[h]=[d]}else{var e=false;this.each(this.routes[h],function(l,k){if(f.toString().length>=k.path.toString().length){this.routes[h].splice(l,0,d);e=true;return false}});if(!e){this.routes[h].push(d)}}return d},eventNamespace:function(){return this.data_store_name+"-"+this.namespace+"-"},bind:function(d,f,g){if(typeof g=="undefined"){g=f}var e=function(){var j,h,i;j=arguments[0];h=arguments[1];i=arguments[2];j.cleaned_type=j.type.replace(h.eventNamespace(),"");g.apply(h,[j,i])};if(!this.listeners[d]){this.listeners[d]=[]}this.listeners[d].push(e);if(this.isRunning()){return this._listen(d,e)}},trigger:function(d,f,e){if(typeof e=="undefined"){e=new this.context_prototype(this,"bind",d,f)}return this.$element().triggerHandler(e.eventNamespace()+d,[e,f])},before:function(d){return this.befores.push(d)},after:function(d){return this.bind("event-context-after",d)},isRunning:function(){return this._running},helpers:function(d){this.context_prototype=this.context_prototype.extend(d)},run:function(d){if(this.isRunning()){return false}var e=this;this.each(this.listeners,function(f,g){this.each(g,function(j,h){this._listen(f,h)})});this.trigger("run",{start_url:d});this._running=true;this.$element().data(this.data_store_name,this);this.last_location=null;if(this.getLocation()==""&&typeof d!="undefined"){this.setLocation(d)}this._checkLocation();this._interval=setInterval(function(){e._checkLocation.apply(e)},this.run_interval_every);this.bind("changed",function(){e.$element().find("form:not(."+e.eventNamespace()+")").bind("submit",function(){return e._checkFormSubmission(this)}).addClass(e.eventNamespace())});c("body").bind("onunload",function(){e.unload()});this.trigger("changed")},unload:function(){if(!this.isRunning()){return false}var d=this;this.trigger("unload");clearInterval(this._interval);this.$element().find("form").unbind("submit").removeClass(d.eventNamespace());this.$element().removeData(this.data_store_name);this.each(this.listeners,function(e,f){this.each(f,function(h,g){this._unlisten(e,g)})});this._running=false},addLogger:function(d){this.each(this.APP_EVENTS,function(f,g){this.bind(g,d)})},lookupRoute:function(f,e){var d=false;this.trigger("lookup-route",{verb:f,path:e});if(typeof this.routes[f]!="undefined"){this.each(this.routes[f],function(h,g){if(e.match(g.path)){d=g;return false}})}return d},runRoute:function(k,h,j){this.trigger("run-route",{verb:k,path:h,params:j});if(typeof j=="undefined"){j={}}var e=this.lookupRoute(k,h);if(e){this.trigger("route-found",{route:e});if((path_params=e.path.exec(h))!=null){path_params.shift();this.each(path_params,function(l,m){if(e.param_names[l]){j[e.param_names[l]]=m}else{if(!j.splat){j.splat=[]}j.splat.push(m)}})}var f=new this.context_prototype(this,k,h,j);this.last_route=e;var d=true;var i=this.befores.slice(0);while(i.length>0){if(i.shift().apply(f)===false){return false}}f.trigger("event-context-before");var g=e.callback.apply(f);f.trigger("event-context-after");return g}else{this.notFound(k,h)}},getLocation:function(){return this.clone(window.location).hash.toString()},setLocation:function(d){window.location=d},swap:function(d){return this.$element().html(d)},notFound:function(e,d){this.trigger("error-404",{verb:e,path:d});throw ("404 Not Found "+e+" "+d)},_defineRouteShortcut:function(e){var d=this;this[e]=function(f,g){d.route.apply(d,[e,f,g])}},_checkLocation:function(){try{var d,f;d=this.getLocation();if(d!=this.last_location){f=this.runRoute("get",d)}this.last_location=d}catch(g){this.last_location=d;if(g.toString().match(/^404/)&&this.silence_404){return f}else{throw (g)}}return f},_checkFormSubmission:function(g){var d,i,k,j,f;this.trigger("check-form-submission",{form:g});d=c(g);i=d.attr("action");k=d.attr("method").toString().toLowerCase();j={};d.find(":input[type!=submit]").each(function(){j[c(this).attr("name")]=c(this).val()});try{f=this.runRoute(k,i,j)}catch(h){if(h.toString().match(/^404/)&&this.silence_404){return true}else{throw (h)}}return(typeof f=="undefined")?false:f},_listen:function(d,e){return this.$element().bind(this.eventNamespace()+d,e)},_unlisten:function(d,e){return this.$element().unbind(this.eventNamespace()+d,e)}});Sammy.EventContext=Sammy.Object.extend({init:function(g,f,d,e){this.app=g;this.verb=f;this.path=d;this.params=new Sammy.Object(e)},$element:function(){return this.app.$element()},template:function(e,f,d){if(typeof d=="undefined"){d=e}return c.srender(d,e,c.extend({},f,this))},partial:function(g,f,i){var e,h,d;d=this;if(typeof i=="undefined"){if(typeof f=="function"){i=f;f={}}else{i=function(j){d.app.swap(j)}}}e=c.srender(g);f=c.extend({},f,this);if(e){h=e(f);i.apply(d,[h]);d.trigger("changed")}else{c.get(g,function(j){h=c.srender(g,j,f);i.apply(d,[h]);d.trigger("changed")})}},redirect:function(d){this.trigger("redirect",{to:d});return this.app.setLocation(d)},trigger:function(d,e){return this.app.trigger(d,e,this)},eventNamespace:function(){return this.app.eventNamespace()},notFound:function(){return this.app.notFound(this.verb,this.path)}});c.sammy=function(d){return new Sammy.Application(d)}})(jQuery); \ No newline at end of file vendor/sammy.min.js c772d4134b7ec6450aec4ae380f3e246712430ca Aaron Quint aaron@quirkey.com http://github.com/quirkey/sinatra-sammy/commit/a833ebecd73230323c8b4b4ac3f064b01df7846f a833ebecd73230323c8b4b4ac3f064b01df7846f 2009-06-09T15:19:54-07:00 2009-06-09T15:19:54-07:00 Updated Sammy to lastest and got POST forms working 65e85f1c615a7b836d5a08f953e9c23cf757d500 Aaron Quint aaron@quirkey.com