app/controllers/attachments.rb app/models/attachment.rb app/views/topics/_post_form.html.erb schema/migrations/009_attachment_migration.rb spec/controllers/attachments_spec.rb spec/helpers/attachments_helpers.rb spec/models/attachment_spec.rb @@ -4,4 +4,5 @@ db/*.sqlite3 schema/schema.rb log/* gems -script \ No newline at end of file +script +public/uploads \ No newline at end of file .gitignore @@ -22,6 +22,7 @@ class Forums < Application def create @forum = Forum.new(params[:forum]) if @forum.save + flash[:notice] = @forum.name + " created successfully" redirect url(:forums) else render :new @@ -39,6 +40,7 @@ class Forums < Application @forum = Forum.find_by_param(params[:id]) raise NotFound unless @forum if @forum.update_attributes(params[:forum]) + flash[:notice] = @forum.name + " updated successfully" redirect url(:forums) else raise BadRequest app/controllers/forums.rb @@ -11,6 +11,7 @@ class Posts < Application def create @post = Post.new(params[:post].merge({ :user => current_user, :forum => @forum, :topic => @topic })) if @post.save + flash[:notice] = "Post Created" redirect url(:forum_topic, { :forum_id => @forum, :id => @topic }) else render :new @@ -28,6 +29,7 @@ class Posts < Application @post = Post.find(params[:id]) raise NotFound unless @post if @post.update_attributes(params[:post]) + flash[:notice] = "Post Updated" redirect url(:forum_topic, { :forum_id => @forum, :id => @topic }) else raise BadRequest app/controllers/posts.rb @@ -13,6 +13,7 @@ class Sessions < Application self.current_user.remember_me cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at } end + flash[:notice] = "Welcome back, " + self.current_user.login redirect_back_or_default('/') else render :new app/controllers/sessions.rb @@ -29,6 +29,7 @@ class Topics < Application def create @topic = @forum.topics.new(params[:topic].merge(:user => current_user)) if @topic.save + flash[:notice] = @topic.name + " created successfully" redirect url(:forum_topic, { :forum_id => @forum, :id => @topic }) else render :new @@ -46,6 +47,7 @@ class Topics < Application @topic = Topic.find_by_param(params[:id]) raise NotFound unless @topic if @topic.update_attributes(params[:topic]) + flash[:notice] = @topic.name + " updated successfully" redirect url(:forum_topic_posts,:topic_id => @topic) else raise BadRequest app/controllers/topics.rb @@ -1,7 +1,7 @@ -class Post < ActiveRecord::Base - +class Post < ActiveRecord::Base before_save :formatted_body + has_many :attachments belongs_to :forum, :counter_cache => true belongs_to :topic, :counter_cache => true belongs_to :user, :counter_cache => true @@ -14,4 +14,9 @@ class Post < ActiveRecord::Base write_attribute(:body_html, RedCloth.new(Whistler.white_list(body)).to_html ) end + def attachments=(upload) + self.attachments.build(upload) unless upload.empty? + end + + end \ No newline at end of file app/models/post.rb @@ -1,6 +1,6 @@ class Topic < ActiveRecord::Base - has_many :posts + has_many :posts, :order => :updated_at belongs_to :forum, :counter_cache => true belongs_to :user, :counter_cache => true app/models/topic.rb @@ -26,6 +26,9 @@ <p>Merbums is a merb powered forum heavily inspired by Beast.</p> <p>Git repo at <a href="http://github.com/shayarnett/merbums/tree/master">http://github.com/shayarnett/merbums/tree/master</a>.</p> <p>This is a development deployment, there will be bugs, errros, and maybe even occasional database emptying. Feel free to register and play around, also post any bugs or feature requests you may have.</p></div> + <% if flash[:notice] %><div class="notice"><%= flash[:notice] %></div><% end %> + <% if flash[:error] %><div class="error"><%= flash[:error] %></div><% end %> + <% if flash[:message] %><div class="notice"><%= flash[:message] %></div><% end %> <% if controller_name == 'topics' && action_name == 'index' %> <p><%= link_to "Home", url(:forums) %></p> <% elsif controller_name == 'topics' && action_name == 'show' %> app/views/layout/application.html.erb @@ -15,19 +15,16 @@ <%= post.user.login %><br /> <%= post.user.posts.size %> Posts</p> </td> - <td><div><%= link_to "Edit", url(:edit_forum_topic_post,{ :forum_id => @forum,:topic_id => @topic, :id => post} ) if can_edit?(post) %></div><%= post.body_html %></td> + <td> + <div><%= link_to "Edit", url(:edit_forum_topic_post,{ :forum_id => @forum,:topic_id => @topic, :id => post} ) if can_edit?(post) %></div><%= post.body_html %> + <%= tag :p, "Attachments" unless post.attachments.empty? %> + <% post.attachments.each do |attachment| %> + <p><%= link_to attachment.title, attachment.path %></p> + <% end %> + </td> </tr> <% end %> </tbody> </table> -<% if logged_in? %> - <% form_for @post, :action => url(:forum_topic_post, { :forum_id => @forum, :topic_id => @topic }) do %> - <% fieldset :legend => "Post a Reply" do %> - <p><%= text_area_control :body, :label => "Reply" %></p> - <p><%= submit_button "Submit" %></p> - <% end %> - <% end %> -<% else %> -<p><%= link_to "Login", url(:login) %> to reply</p> -<% end %> \ No newline at end of file +<%= partial :post_form, :with => @post if logged_in? %> app/views/topics/show.html.erb @@ -50,8 +50,11 @@ use_test :rspec # dependency "RedCloth", "> 3.0" # OR # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" +%w(RedCloth whistler).each do |file| + require file +end -dependencies "merb-assets", "merb_helpers", "RedCloth", "whistler" +dependencies "merb-assets", "merb_helpers", "merb_has_flash" Merb::BootLoader.after_app_loads do ### Add dependencies here that must load after the application loads: config/init.rb d620ecd20f8f86435ef43d3cf1e4faa81db557f5 Shay Arnett shayarnett@gmail.com http://github.com/shayarnett/merbums/commit/0aecfad24ec78213bbe1695e36b14eab1fbc1abe 0aecfad24ec78213bbe1695e36b14eab1fbc1abe 2008-03-27T17:16:01-07:00 2008-03-27T17:16:01-07:00 added attachments and lots of flash[] fa4421731896069c05b0ac5df45e0f14c372f20b Shay Arnett shayarnett@gmail.com