@@ -12,7 +12,7 @@ all: -cp ../../clients/js/*.js out/ -rm out/JSON.js -rm out/md5.js - -rm out/*dojo*.js + #rm out/*dojo*.js -rm template/elem/*.tt~ jemplate --runtime > out/blog-jemplate.js jemplate --compile template/elem/ >> out/blog-jemplate.js @@ -46,7 +46,8 @@ pack: all cp -r out/* pack_out/ for file in `find out -name '*.js' | grep -v 'jquery.js'`; do echo "packing $$file..."; cat $$file | jsmin > pack_out/`basename $$file`; done cat pack_out/blog-jemplate.js pack_out/openresty.js pack_out/blog.js > pack_out/blog_min.js - rm pack_out/blog-jemplate.js pack_out/openresty.js pack_out/blog.js + cat pack_out/jquery.js pack_out/dojo.openresty.js > pack_out/jquery-dojo.js + rm pack_out/blog-jemplate.js pack_out/openresty.js pack_out/blog.js pack_out/dojo.openresty.js pack_out/jquery.js rm -rf out mv pack_out out demo/Blog/Makefile @@ -41,6 +41,7 @@ function debug (msg) { $.fn.postprocess = function (className, options) { return this.find("a[@href*='#']").each( function () { + //debug("HERE!"); var href = $(this).attr('href'); // We need the following hack because IE expands href to // absolute URL: @@ -57,7 +58,7 @@ $.fn.postprocess = function (className, options) { } ); }; -var count = 0;; +//var count = 0;; function setStatus (isLoading, category) { if (isLoading) { if (++loadingCount == 1) { @@ -80,8 +81,8 @@ function setStatus (isLoading, category) { } } - count++; - debug("[" + count + "] setStatus: " + category + ": " + loadingCount + "(" + isLoading + ")"); + //count++; + //debug("[" + count + "] setStatus: " + category + ": " + loadingCount + "(" + isLoading + ")"); } function init () { @@ -281,11 +282,13 @@ function getSidebar () { //getRecentPosts(); //getRecentComments(); //getArchiveList(); + setStatus(true, 'renderSidebar'); openresty.callback = function (res) { renderSidebar(res) }; openresty.get('/=/action/GetSidebar/~/~', { year: thisYear, month: thisMonth + 1 }); } function renderSidebar (res) { + setStatus(false, 'renderSidebar'); getCalendar(thisYear, thisMonth, res[0]); setStatus(true, 'renderRecentPosts'); @@ -455,7 +458,7 @@ function postComment (form) { data.email = $("#comment-email").val(); data.url = $("#comment-url").val(); data.body = $("#comment-text").val(); - data.post = $("#comment-for").val(); + data.post_id = $("#comment-for").val(); //alert(JSON.stringify(data)); if (!data.sender) { error("Name is required."); @@ -473,8 +476,8 @@ function postComment (form) { //openresty.purge(); setStatus(true, 'afterPostComment'); openresty.callback = afterPostComment; - //openresty.formId = 'comment-form'; - openresty.postByGet('/=/model/Comment/~/~', data); + openresty.formId = 'comment-form'; + openresty.post('/=/action/NewComment/~/~', data); return false; } @@ -492,22 +495,11 @@ function afterPostComment (res) { //debug(JSON.stringify(res)); var commentId; - var match = res.last_row.match(/\d+$/); + var match = res[0].last_row.match(/\d+$/); if (match.length) commentId = match[0]; location.hash = 'post-' + postId + ':' + (commentId ? 'comment-' + commentId : 'comments'); - openresty.callback = function (res) { - if (!openresty.isSuccess(res)) { - error("Failed to increment the comment count for post " + - postId + ": " + res.error); - } else { - spans.text(commentCount + 1); - } - }; - openresty.putByGet( - '/=/model/Post/id/' + postId, - { comments: commentCount + 1 } - ); + spans.text(commentCount + 1); getRecentComments(0); } } demo/Blog/js/blog.js @@ -323,10 +323,31 @@ $resty->post( ); $resty->post( + '/=/action/NewComment', + { + description => "Get full post (with the navigator and comments", + parameters => [ + { name => 'sender', type => 'literal' }, + { name => 'email', type => 'literal' }, + { name => 'url', type => 'literal' }, + { name => 'body', type => 'literal' }, + { name => 'post_id', type => 'literal' }, + ], + definition => q{ + POST '/=/model/Comment/~/~' + { sender: $sender, email: $email, url: $url, body: $body, post: $post_id }; + update Post set comments = comments + 1 where id = $post_id; + }, + } +); + + +$resty->post( '/=/role/Public/~/~', [ { method => "GET", url => '/=/action/GetSidebar/~/~' }, { method => "GET", url => '/=/action/GetFullPost/~/~' }, + { method => "POST", url => '/=/action/NewComment/~/~' }, { method => "GET", url => '/=/model/Post/~/~' }, { method => "GET", url => '/=/model/Comment/~/~' }, demo/Blog/script/init.pl @@ -7,10 +7,11 @@ 'jquery.js', 'blog-jemplate.js', 'openresty.js', + 'dojo.openresty.js', 'blog.js', ]; ELSE; - js_files = ['jquery.js', 'blog_min.js']; + js_files = ['jquery-dojo.js', 'blog_min.js']; END; -%] <head> demo/Blog/template/header.tt @@ -530,7 +530,7 @@ sub compile_frags { my %vars; my @canon_cmds; for my $cmd (@$cmds) { - die "Invalid command: ", Dumper($cmd), "\n" unless ref $cmd; + die "Invalid command: ", $OpenResty::Dumper->($cmd), "\n" unless ref $cmd; if ( @$cmd == 1 and ref $cmd->[0] ) { # being a SQL command my $seq = $cmd->[0]; @@ -541,10 +541,10 @@ sub compile_frags { # Make sure inferenced variable type is consistent # FIXME: 'unknown' type should be overwritten by concrete types (eg. 'symbol') - if ( exists $vars{$var_name} + if ( $var_type ne 'unknown' && exists $vars{$var_name} && $vars{$var_name} ne $var_type ) { - die "Type inference conflict for variable \"$var_name\"."; + die "Type inference conflict for variable \"$var_name\": $var_type expected.\n"; } # Collect variable and its type lib/OpenResty/Handler/Action.pm @@ -637,7 +637,7 @@ GET /=/model?_user=$TestAccount2&_password=$TestPass2 === TEST 63: recheck Test account 1: --- request -GET /=/model?_user=$TestAccount&_password=$TestPass +GET /=/model?_user=$TestAccount&_password=$TestPass&_use_cookie=1 --- response [ {"src":"/=/model/Carrie","name":"Carrie","description":"我的书签"}, @@ -646,7 +646,26 @@ GET /=/model?_user=$TestAccount&_password=$TestPass -=== TEST 64: logout +=== TEST 64: NewComment +--- request +POST /=/action/NewComment +{ + "description":"New comment", + "parameters":[ + { "name": "sender", "type": "literal" }, + { "name": "email", "type": "literal" }, + { "name": "url", "type": "literal" }, + { "name": "body", "type": "literal" }, + { "name": "post_id", "type": "literal" } + ], + "definition":"POST '/=/model/Comment/~/~' { sender: $sender, email: $email, url: $url, body: $body, post: $post_id }; update Carrie set num = num + 1 where id = $post_id;" +} +--- response +{"success":1} + + + +=== TEST 65: logout --- request GET /=/logout --- response t/31-action.t 20cb17c288cdee0129c4ca01eb891c11a8d52590 agentz agentz@b2c27d59-8999-dc11-853b-000bcdefe56b http://github.com/agentzh/openresty/commit/53a794a1024462db29d02d5a7381ce2246345a81 53a794a1024462db29d02d5a7381ce2246345a81 2008-09-26T21:08:00-07:00 2008-09-26T21:08:00-07:00 demo/Blog - now we use action for comment posting git-svn-id: http://svn.openfoundry.org/openapi/trunk@2066 b2c27d59-8999-dc11-853b-000bcdefe56b ee8ad72c7fb4c9a265cbf756190a2d8df59450d2 agentz agentz@b2c27d59-8999-dc11-853b-000bcdefe56b