app/controllers/users.rb app/helpers/users_helper.rb app/models/message.rb app/views/users/index.html.erb spec/controllers/users_spec.rb spec/models/message_spec.rb @@ -1,5 +1,5 @@ class Topics < Application - # provides :xml, :yaml, :js + provides :xml, :js def index @topics = Topic.all app/controllers/topics.rb @@ -8,6 +8,6 @@ class Forum has n, :topics has n, :posts, :through => :topics belongs_to :last_post, :class_name => "Post" - belongs_to :last_post_forum, :class_name => "LastPostForum" + belongs_to :last_post_forum, :class_name => "Forum" end app/models/forum.rb @@ -14,4 +14,6 @@ class User property :id, Serial property :login, String + has n, :unread_messages, :class_name => "Message", :conditions => { :read => false } + end app/models/user.rb @@ -1,14 +1,17 @@ -<tr><td align='left'><h1><%= link_to(forum.title, url(forum)) %></h1><%= forum.description %></td> +<tr> + <td align='left'><h1><%= link_to(forum.title, resource(forum)) %></h1><%= forum.description %></td> <td align='center'><%= forum.topics.size %></td> <td align='center'><%= forum.posts.size %></td> - <td align='right'><% if !forum.last_post.nil? %> + <td align='right'> + <% if !forum.last_post.nil? %> <%= time_ago_in_words(forum.last_post.created_at) %> ago by <%= link_to(forum.last_post.user.login, :controller => "accounts", :action => "user", :id => forum.last_post.user.login) %> in <%= link_to(forum.last_post.topic.subject, forum_topic_path(forum,forum.last_post.topic)) %> <% if !forum.last_post_forum.nil? %> in <%= link_to(forum.last_post_forum, forum_path(forum.last_post_forum)) %> - <% end %> - <% else %> - None <% end %> - </td></tr> + <% else %> + None + <% end %> + </td> +</tr> app/views/forums/_forum.html.erb @@ -17,17 +17,17 @@ <div class='menu-bar'> <%= link_to "Home", url(:forums) %> | - <% unless false %> + <% if session.user.nil? %> <%= link_to "Login", url(:login) %> | <%= link_to "Signup" %> <% else %> - Logged in as <%= link_to current_user.login, :controller => "accounts", :action => "user", :id => current_user.login %> | + Logged in as <%= link_to session.user.login, :controller => "accounts", :action => "user", :id => session.user.login %> | <%= link_to "Profile", :controller => "/accounts", :action => "profile" %> | <%= link_to "Member List", :controller => "/accounts", :action => "index" %> | - <%= link_to "Search", search_path %> | - <%= link_to pluralize(@current_user.unread_messages.size,"new message"), messages_path %> | - <%= link_to "Logout", logout_path %> + <%= link_to "Search" %> | + <%= link_to session.user.unread_messages.size.to_s + " new message", resource(:messages) %> | + <%= link_to "Logout", url("logout") %> <% end %> </div> <div class='time-now'> app/views/layout/application.html.erb @@ -1,51 +1,11 @@ -# Merb::Router is the request routing mapper for the merb framework. -# -# You can route a specific URL to a controller / action pair: -# -# match("/contact"). -# to(:controller => "info", :action => "contact") -# -# You can define placeholder parts of the url with the :symbol notation. These -# placeholders will be available in the params hash of your controllers. For example: -# -# match("/books/:book_id/:action"). -# to(:controller => "books") -# -# Or, use placeholders in the "to" results for more complicated routing, e.g.: -# -# match("/admin/:module/:controller/:action/:id"). -# to(:controller => ":module/:controller") -# -# You can specify conditions on the placeholder by passing a hash as the second -# argument of "match" -# -# match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/). -# to(:controller => "registration") -# -# You can also use regular expressions, deferred routes, and many other options. -# See merb/specs/merb/router.rb for a fairly complete usage sample. - Merb.logger.info("Compiling routes...") Merb::Router.prepare do - # RESTful routes - - namespace :admin do - resources :forums - end - - resources :forums do - resources :topics - end - # Adds the required routes for merb-auth using the password slice + resources :forums, Forum, :singular => 'forum' + resources :messages + match('/signup').to(:controller => 'users', :action => 'new') slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "") - - # This is the default route for /:controller/:action/:id - # This is fine for most cases. If you're heavily using resource-based - # routes, you may want to comment/remove this line to prevent - # clients from calling your create or destroy actions with a GET default_routes - - # Change this for your home page to be available at / + match('/').to(:controller => 'forums', :action =>'index') end \ No newline at end of file config/router.rb ffffadf6bfdd1f21258ea055bb7ccb45c984b6fe Ryan Bigg radarlistener@gmail.com http://github.com/radar/mboard/commit/228c66457c838c327fdf08fe4ef7421ee6aaff5e 228c66457c838c327fdf08fe4ef7421ee6aaff5e 2008-10-19T03:22:12-07:00 2008-10-19T03:22:12-07:00 Fixed up a few things... 2376be8b70888e7908994007138a40eb865c8e58 Ryan Bigg radarlistener@gmail.com