app/helpers/sessions_helper.rb db/migrate/006_remove_comments.rb db/migrate/007_create_commentable_schema.rb lib/ActionView/base.rb spec/helpers/sessions_helper_spec.rb vendor/plugins/acts_as_commentable/CHANGELOG vendor/plugins/acts_as_commentable/MIT-LICENSE vendor/plugins/acts_as_commentable/README vendor/plugins/acts_as_commentable/init.rb vendor/plugins/acts_as_commentable/install.rb vendor/plugins/acts_as_commentable/lib/acts_as_commentable.rb vendor/plugins/acts_as_commentable/lib/comment.rb vendor/plugins/acts_as_commentable/tasks/acts_as_commentable_tasks.rake vendor/plugins/acts_as_commentable/test/acts_as_commentable_test.rb @@ -1,2 +1,4 @@ class CommentsController < ResourceController::Base + belongs_to :post + end app/controllers/comments_controller.rb @@ -1,5 +1,5 @@ class PostsController < ResourceController::Base - + new_action.wants.html do for_admin_only do render :html => @posts app/controllers/posts_controller.rb @@ -5,47 +5,6 @@ module ApplicationHelper end def format_date_short(date) - date.strftime("%D") - end -end - -# Move this to 'lib' once I find out how to load from 'lib' -module ActionView - class Base - - def method_missing(symbol, *args) - if symbol.to_s. =~ /_label$/ - self.class.instance_eval do - - define_method(symbol){ - options = args[1] || {} - options = args[0] if args[0].class == Hash - - prompt_char = options[:prompt_char] || ':' - is_required = options[:is_required] || false - required_char = options[:required_char] || '*' - label_text = args[0].class == String ? args[0] : symbol.to_s.gsub(/_label/, '').to_friendly_name - - label(:post, symbol.to_s.gsub(/_label/, ''), label_text) + (is_required ? required_char : '') + prompt_char - } - - send symbol - - end - - end - - end - - end - -end - -class String - def to_friendly_name - s = self.gsub(/[_]/, ' ') - ns = "" - s.each("\s"){|w| ns << w.capitalize } - return ns + date.to_s(:short_date_only) end end \ No newline at end of file app/helpers/application_helper.rb @@ -1,7 +1,5 @@ -require 'lib/string' - class Post < ActiveRecord::Base - has_many :comments + acts_as_commentable def body=(value) self[:body] = value.gsub("\n", " ") app/models/post.rb @@ -19,11 +19,11 @@ %img{ :src => "/images/glasses.png" }/ %h1 %a{ :href => "/" } - %em - faithfulgeek.org + faithfulgeek.org #main - #page-content - = yield + #wrapper + #page-content + = yield #modules .twitter.module %fieldset app/views/layouts/application.html.haml @@ -4,22 +4,22 @@ <% form_for(@post) do |f| %> - Title + <%= title_label %> <%= f.text_field :title %> - Body + <%= body_label %> <%= f.text_area :body %> - Excerpt + <%= excerpt_label %> <%= f.text_area :excerpt %> - Is published + <%= is_published_label %> <%= f.check_box :is_published %> app/views/posts/new.html.erb @@ -1,13 +1,30 @@ = render_partial 'post', @post -- form_for([@post, Comment.new], :html => {:id => 'comment-submission'}) do |f| -/ - %p - .form-field - = #label :name, 'Name:' - = #f.text_field :name - = #f.text_field :email - = #f.text_field :url - = #f.text_area :body +.comments + - @post.comments.each do |c| + .comment + - if c.url + = link_to c.name, c.url + - else + = c.name + says: + %p.comment-body + = c.comment -- end \ No newline at end of file +%fieldset + %legend Voice Your Opinion! + - form_for([@post, Comment.new], :html => {:id => 'comment-submission'}) do |f| + + %p + .form-field + = label :name, 'Name:' + = f.text_field :name + .form-field + = label :email, 'Email:' + = f.text_field :email + .form-field + = label :url, 'URL:' + = f.text_field :url + .form-field + = f.text_area :comment + = submit_tag app/views/posts/show.html.haml @@ -10,6 +10,8 @@ RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') +Time::DATE_FORMATS[:short_date_only] = "%D" + Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -56,4 +58,6 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc -end \ No newline at end of file +end + +require 'lib/ActionView/base' \ No newline at end of file config/environment.rb @@ -5,10 +5,8 @@ ActionController::Routing::Routes.draw do |map| map.login 'login', :controller => 'sessions', :action => 'new' map.logout 'logout', :controller => 'sessions', :action => 'destroy' - map.resources :posts do |post| - post.resources :comments - end - + map.resources :posts, :has_many => :comments + map.connect '/:month', :controller => 'posts', :action => 'index', config/routes.rb @@ -34,17 +34,10 @@ p fieldset { - border: 1px inset #999; + border: 1px dashed #999; padding: .5em; } -legend -{ - font-size: 1em; - background: url('/images/icons/16-tool-a.png') no-repeat; - padding-left:18px; -} - #main { margin-left: auto; @@ -55,13 +48,19 @@ legend margin-top: 1em; } -#page-content +#wrapper { float: left; width: 100%; padding-right: .75em; } +#page-content +{ + margin-right: 310px; + padding-bottom: 1em; +} + #modules { margin-left: -310px; @@ -89,11 +88,7 @@ legend margin:55px 0 30px 15px; background: url('/images/logo.jpg') no-repeat; display:block; -} - -#header h1 em -{ - display: none; + text-indent: -9999px; } #footer @@ -108,11 +103,7 @@ legend { margin-bottom: 1em; } -.post -{ - margin-right: 310px; - padding-bottom: 1em; -} + .post-content { text-align: left; @@ -149,3 +140,9 @@ legend padding-left: 18px; } +div.post-content legend +{ + font-size: 1em; + background: url('/images/icons/16-tool-a.png') no-repeat; + padding-left:18px; +} public/stylesheets/site.css @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Post do it "should have many comments" do - Post.should_receive(:has_many).with(:comments) + Post.should_receive(:acts_as_commentable) load 'post.rb' end end @@ -29,7 +29,7 @@ describe Post do @post.save post = Post.find(:first) - post.comments.size.should == 1 + post.comments.length.should == 1 end it "should replace new lines with when setting body" do spec/models/post_spec.rb @@ -18,15 +18,13 @@ describe "/posts/show.html.haml" do end it "should render add comment form" do - pending "saving comments for a future sprint" do render "/posts/show" response.should have_tag("form#comment-submission") do response.should have_tag("label", "Name:") response.should have_tag("input#comment_name") response.should have_tag("input#comment_email") response.should have_tag("input#comment_url") - response.should have_tag("textarea#comment_body") - end + response.should have_tag("textarea#comment_comment") end end end spec/views/posts/show.html.haml_spec.rb app/models/comment.rb lib/string.rb spec/models/comment_spec.rb 754d289290aa6bac67a4dbce9f04c1d82f0a87cb Joe Fiorini joe@joe-fiorinis-macbook-pro.local http://github.com/faithfulgeek/blog-starter-kit/commit/3ec125e4465956c74a77b3a8d43e6828f947364f 3ec125e4465956c74a77b3a8d43e6828f947364f

2008-04-12T22:00:11-07:00

Added initial comments implementation; implemented suggestions from code review with Corey; design changes to allow for better resizing 36b5fac1140f124b61de5b23f27be0cfaab88464 Joe Fiorini joe@joe-fiorinis-macbook-pro.local