couchapp/_attachments/js/controllers/page_versions.js couchapp/_attachments/js/controllers/pages.js couchapp/_attachments/js/controllers/statistics.js couchapp/_attachments/js/models/page.js couchapp/_attachments/templates/page_versions/_page_version.html.erb couchapp/_attachments/templates/page_versions/index.html.erb couchapp/_attachments/templates/page_versions/show.html.erb couchapp/_attachments/templates/statistics/_stat.html.erb couchapp/_attachments/templates/statistics/index.html.erb couchapp/views/page_versions_by_page_id_and_created_at/map.js @@ -18,10 +18,20 @@ <div id="notice"></div> <div id="content"></div> </body> + <script type="text/javascript" charset="utf-8"> + Wiki = { + Models: {}, + Controllers: {} + }; + </script> <script src="/_utils/script/json2.js"></script> <script src="./jquery.js"></script> <script src="/_utils/script/jquery.couch.js"></script> <script src="./vendor/couchapp/jquery.couchapp.js"></script> <script src="./vendor/sammy/sammy.js"></script> + <script src="./js/models/page.js"></script> + <script src="./js/controllers/pages.js"></script> + <script src="./js/controllers/page_versions.js"></script> + <script src="./js/controllers/statistics.js"></script> <script src="./js/app.js"></script> </html> couchapp/_attachments/index.html @@ -4,155 +4,13 @@ $.CouchApp(function(app) { }); var content = $('#content'); -var Wiki = { - Page: { - init: function(attributes) { - this.id = attributes.id; - this._rev = attributes._rev; - this.title = attributes.title; - this.body = attributes.body; - this.created_at = attributes.created_at || Date(); - return this; - }, - errors: [], - valid: function() { - this.errors = []; - if(this.title.length == 0) { - this.errors.push("Title can't be blank"); - } - if(this.body.length == 0) { - this.errors.push("Body can't be blank"); - } - return this.errors.length == 0; - }, - to_json: function() { - return { - title: this.title, - body: this.body, - created_at: this.created_at, - type: 'Page' - } - } - } -}; var sammy = $.sammy(function() { with(this) { element_selector = '#content'; - get('#/', function() { with(this) { - couchapp.design.view("pages_by_created_at", { - limit: 1, - success: function(json) { - if(json.rows[0]) { - redirect('#/pages/' + json.rows[0]['id']); - content.html(); - } else { - redirect('#/new_page'); - } - } - }); - }}); - - get('#/pages', function() { with(this) { - var context = this; - couchapp.design.view("pages_by_created_at", { - include_docs: true, - success: function(json) { - context.partial('./templates/pages/index.html.erb', function(html) { - content.html(html); - this.each(json['rows'], function(i, page) { - this.partial('./templates/pages/_page.html.erb', {page: page.doc}, function(page_html) { - $(page_html).appendTo('#all_pages') - }) - - }); - }); - } - }); - }}); - - get('#/pages/:id', function() { with(this) { - var context = this; - couchapp.db.openDoc(params['id'], { - success: function(doc) { - context.page = doc; - context.partial('./templates/pages/show.html.erb') - }, - error: function() { - trigger('error', {message: "Page not found"}); - } - }); - }}); - - get('#/pages/edit/:id', function() { with(this) { - var context = this; - couchapp.db.openDoc(params['id'], { - success: function(doc) { - context.page = doc; - context.partial('./templates/pages/edit.html.erb') - }, - error: function() { - trigger('error', {message: "Page not found"}); - } - }); - }}); - - get('#/new_page', function() { with(this) { - partial('./templates/pages/new.html.erb'); - }}); - - post('#/pages/:id', function() { with(this) { - var page = Wiki.Page.init(params); - if(page.valid()) { - couchapp.db.saveDoc(page.to_json(), { - success: function(res) { - trigger('notice', {message: 'Page Saved'}); - redirect('#/pages/' + res.id) - }, - error: function(response_code, res) { - trigger('error', {message: 'Error saving page: ' + res}); - } - }); - } else { - trigger('error', {message: page.errors.join(", ")}); - }; - return false; - }}); - - post('#/pages', function() { with(this) { - var page = Wiki.Page.init(params); - if(page.valid()) { - couchapp.db.saveDoc(page.to_json(), { - success: function(res) { - trigger('notice', {message: 'Page Saved'}); - redirect('#/pages/' + res.id) - }, - error: function(response_code, res) { - trigger('error', {message: 'Error saving page: ' + res}); - } - }); - } else { - trigger('error', {message: page.errors.join(", ")}); - }; - return false; - }}); - - get('#/statistics', function() { with(this) { - var context = this; - couchapp.design.view('statistics', { - group: true, - success: function(json) { - context.partial('./templates/pages/statistics.html.erb', function(html) { - content.html(html); - this.each(json['rows'], function(i, row) { - this.partial('./templates/pages/_stat.html.erb', {stat: row}, function(stat_html) { - $(stat_html).appendTo('#statistics') - }); - }); - }); - } - }) - }}); + Wiki.Controllers.Pages(this); + Wiki.Controllers.PageVersions(this); + Wiki.Controllers.Statistics(this); before(function() { $('#error').html('').hide(); couchapp/_attachments/js/app.js @@ -1,5 +1,14 @@ /* add styles here */ +body { + font-family: Verdana; +} + +h2 { + background-color: #CCC; + padding: 10px; +} + #error { display:none; background-color: rgb(255, 100, 80); @@ -16,6 +25,12 @@ margin: 10px; } +#nav li { + display: inline-block; + background-color: #DDD; + padding: 5px; +} + table.grid { border-collapse: collapse; } @@ -23,4 +38,27 @@ table.grid { table.grid td, table.grid th { border: 1px solid gray; padding: 10px; +} + +#page { + background-color: #EEE; + padding: 20px; +} + +#subnav { + padding: 5px; + background-color: #666; +} + +#subnav li { + display: inline-block; + background-color: #888; + color: white; + font-size: 1.2em; + padding: 10px; + padding-right: 20px; +} + +#subnav li a { + color: white; } \ No newline at end of file couchapp/_attachments/style/main.css @@ -1,4 +1,4 @@ <li> - <a href="#/pages/<%= page._id %>"><%= page.title %></a> + <a href="#/pages/<%= page._id %>"><%= page._id %></a> </li> couchapp/_attachments/templates/pages/_page.html.erb @@ -1,10 +1,6 @@ -<h2><%= page.title %></h2> +<h2><%= page._id %></h2> -<form action="#/pages/<%= page._id %>" method="post"> - <input type="hidden" name="_rev" value="<%= page._rev %>"/> - <label for="title">Title</label> - <p><input type="text" name="title" id="title" value="<%= page.title %>"/></p> - <label for="body">Body</label> - <p><textarea name="body" id="body"><%= page.body %></textarea></p> +<form action="#/pages/<%= page._id %>" method="put"> + <p><textarea name="body" id="body" rows="20" cols="80"><%= page.body %></textarea></p> <p><input type="submit" value="Update Page"/></p> </form> couchapp/_attachments/templates/pages/edit.html.erb @@ -1,6 +1,6 @@ <form action="#/pages" method="post"> <label for="title">Title</label> - <p><input type="text" name="title" id="title"/></p> + <p><input type="text" name="_id" id="title" value="<%= title %>"/></p> <label for="body">Body</label> <p><textarea name="body" id="body"></textarea></p> <p><input type="submit" value="Create Page"/></p> couchapp/_attachments/templates/pages/new.html.erb @@ -1,5 +1,10 @@ -<h2><%= page.title %></h2> +<h2><%= page._id %></h2> -<p><a href="#/pages/edit/<%= page._id %>">edit</a></p> +<ul id="subnav"> + <li><a href="#/pages/<%= page._id %>/edit">edit</a></li> + <li><a href="#/pages/<%= page._id %>/versions">versions</a></li> +</ul> -<p><%= page.body %></p> \ No newline at end of file +<div id="page"> + <p><%= page.body.replace(/([A-Z][a-z]+([A-Z][a-z]+)+)/g, function(match) {return "<a href=\"#/pages/" + match + "\">" + match + "</a>"}) %></p> +</div> \ No newline at end of file couchapp/_attachments/templates/pages/show.html.erb @@ -6,6 +6,7 @@ Feature: wiki Scenario: create first page When I go to the start page + And I wait for the AJAX call to finish And I fill in "Page One" for "Title" And I fill in "this is page one" for "Body" And I press "Create Page" couchapp/features/create_page.feature @@ -1,4 +1,7 @@ +require 'rubygems' +gem 'langalex-culerity' require 'culerity' +require 'tempfile' Before do $server ||= Culerity::run_server @@ -108,6 +111,7 @@ def assert_successful_response tmp << $browser.html tmp.close `open -a /Applications/Safari.app #{tmp.path}` + sleep 1 raise "Brower returned Response Code #{$browser.page.web_response.status_code}" end end \ No newline at end of file couchapp/features/step_definitions/common_celerity.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem 'jchris-couchrest' +gem 'couchrest' require 'couchrest' Before do couchapp/features/step_definitions/page_steps.rb @@ -2,7 +2,7 @@ def path_to(page_name) case page_name when /the start page/i - '/_design/couchapp/_show/new' + '/_design/couchapp/index.html' # Add more page name => path mappings here couchapp/features/support/paths.rb couchapp/_attachments/templates/pages/_stat.html.erb couchapp/_attachments/templates/pages/statistics.html.erb 8bdeca054679e2d3478963b7ee084a2152675b70 Alexander Lang alex@upstream-berlin.com http://github.com/langalex/couchdb_example_wiki/commit/4edff3ed2750a19bf57e74d19dc3e9153e461762 4edff3ed2750a19bf57e74d19dc3e9153e461762 2009-05-22T12:33:39-07:00 2009-05-22T12:33:39-07:00 added creating new pages via camelcase links, refactored app into multiple controllers 32cf78e9467a29367f9cfbbd73f6755a330e0441 Alexander Lang alex@upstream-berlin.com