app/models/comment.rb db/migrate/20080910173454_create_comments.rb lib/tasks/rspec.rake script/autospec @@ -19,12 +19,32 @@ class PicturesController < ApplicationController # View only one picture def show @picture = Picture.find_by_permalink params[:id] + prepare_picture + @comment = @picture.comments.new + rescue ActiveRecord::RecordNotFound + render :file => "#{RAILS_ROOT}/public/404.html", :status => 404 + end + + def create_comment + @comment = Comment.create(params[:comment]) + if @comment.save + flash[:notice] = 'You comment is save' + redirect_to picture_url(comment.picture) + else + flash[:notice] = 'Your comment failed' + @picture = Picture.find(params[:comment][:picture_id]) + prepare_picture + render :action => 'show' + end + end + + private + + def prepare_picture raise ActiveRecord::RecordNotFound if @picture.nil? @gallery = @picture.gallery @tags = @picture.tag_list @breadcrumb = @picture - rescue ActiveRecord::RecordNotFound - render :file => "#{RAILS_ROOT}/public/404.html", :status => 404 end end app/controllers/pictures_controller.rb @@ -81,4 +81,7 @@ module ApplicationHelper end str end + + def add_error_message + end end app/helpers/application_helper.rb @@ -2,6 +2,7 @@ class Picture < ActiveRecord::Base belongs_to :gallery has_many :thumbnails, :foreign_key => 'parent_id' + has_many :comments has_attachment :content_type => :image, :storage => :file_system, app/models/picture.rb @@ -9,3 +9,31 @@ <p> <%= @picture.description %> </p> + +<%= flash_notice %> + +<% form_for @comment, :url => {:action => 'create_comment'}, :html => {:id => 'commentform'} do |f| -%> + <h3>Add Comment</h3> + <%= error_messages_for 'comment' %> + + <div id='respond'> + <p> + <%= f.label :author %> + <%= f.text_field :author %> + </p> + + <p> + <%= f.label :email %> + <%= f.text_field :email %> + </p> + + <p> + <%= f.label :body %> + <%= f.text_area :body %> + </p> + <p class="button"> + <%= f.hidden_field :picture_id %> + <%= submit_tag %> + </p> + </div> +<% end %> app/views/pictures/show.html.erb @@ -13,7 +13,7 @@ ActionController::Routing::Routes.draw do |map| map.connect '/galleries/:id/page/:page', :controller => 'galleries', :action => 'show', :page => /\d+/ map.connect '/galleries/:gallery_id/pictures/:id/page/:page', :controller => 'pictures', :action => 'show', :page => /\d+/ - map.resources :pictures + map.resources :pictures, :collection => {:create_comment => :post} map.resources :tags # route to the paginate of all galleries config/routes.rb @@ -9,7 +9,19 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080824170446) do +ActiveRecord::Schema.define(:version => 20080910173454) do + + create_table "comments", :force => true do |t| + t.string "title" + t.text "body" + t.string "email" + t.string "author" + t.string "ip" + t.boolean "published" + t.integer "picture_id" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "galleries", :force => true do |t| t.string "name" db/schema.rb @@ -141,3 +141,105 @@ a.current_gallery { color : #CC6600; font-weight: bold; } + +/*------------------------------------------------------------------ +[4.1.2. Comments] +*/ + +#commentform { + background:url(../../images/theme/bg_white.png); + padding:10px 35px 25px 10px; + text-align: left; +} + + #commentform input { + width:180px; + padding:3px 3px 3px 23px; + margin: 15px; + } + + #commentform textarea { + padding:3px; + margin: 15px 0 15px 15px; + font-size:1em; + width:480px; + } + + #commentform label { + float:left; + width: 150px; + text-align:right; + height:30px; + padding-top:15px; + margin-left: 50px; + line-height:0.7em + } + + #commentform label small { + font-size:0.6em + } + + input#comment_author { + background:url(../../images/theme/user50.png) no-repeat #FFF 2% 50%; + } + + input#comment_author:hover { + background:url(../../images/theme/user.png) no-repeat #FFF 2% 50%; + } + } + + input#comment_email { + background:url(../../images/theme/email_open50.png) no-repeat #FFF 2% 50%; + } + + input#comment_email:hover { + background:url(../../images/theme/email_open.png) no-repeat #FFF 2% 50%; + } + + input#comment_url { + background:url(../../images/theme/world_link50.png) no-repeat #FFF 2% 50%; + } + + input#comment_url:hover { + background:url(../../images/theme/world_link.png) no-repeat #FFF 2% 50%; + } + + input#form-preview-button { + background:url(../../images/theme/page_edit50.png) no-repeat #f6e0c6 2% 50%; + width: 110px; + margin:0 + } + + input#form-preview-button:hover { + background:url(../../images/theme/page_edit.png) no-repeat #f6e0c6 2% 50%; + } + + + input#form-submit-button { + background:url(../../images/theme/accept50.png) no-repeat #f6e0c6 2% 50%; + width: 110px; + margin:0 + } + + input#form-submit-button:hover { + background:url(../../images/theme/accept.png) no-repeat #f6e0c6 2% 50%; + } + +ol#commentList { + margin-left: 25px; +} + +ol#commentList li { + margin: 10px 0 10px 0 +} + +div.commentContent { + padding:10px; + background:url(../../images/theme/bg_white.png); + margin:5px 0 0 0 + +} + +div.author cite { + font-style:normal +} public/stylesheets/pictrails.css @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn $LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin require 'rubygems' require 'drb/drb' @@ -23,20 +22,29 @@ module Spec active_connections.delete(name) end end - end + end if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) - dispatcher.cleanup_application(true) + dispatcher.cleanup_application elsif ::Dispatcher.respond_to?(:reset_application!) ::Dispatcher.reset_application! else raise "Application reloading failed" end + if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache) + Fixtures.reset_cache + end + ::Dependencies.mechanism = :load require_dependency('application.rb') unless Object.const_defined?(:ApplicationController) load File.dirname(__FILE__) + '/../spec/spec_helper.rb' + if in_memory_database? + load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default + ActiveRecord::Migrator.up('db/migrate') # use migrations + end + ::Spec::Runner::CommandLine.run( ::Spec::Runner::OptionParser.parse( argv, @@ -45,6 +53,12 @@ module Spec ) ) end + + def in_memory_database? + ENV["RAILS_ENV"] == "test" and + ::ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and + ::Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' + end end end end @@ -91,7 +105,7 @@ opts.parse!(ARGV) puts "Ready" exec_server = lambda { trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2") - DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new) + DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new) DRb.thread.join } script/spec_server @@ -4,9 +4,10 @@ describe PicturesController do controller_name :pictures before :each do - @picture = mock_model(Picture) - @picture.stub!(:gallery).and_return([]) - @picture.stub!(:tag_list).and_return([]) + @picture = mock_model(Picture,{ :gallery => mock_model(Gallery), + :tag_list => [], + :comments => mock("comments", { :new => mock_model(Comment)}) + }) @gallery = mock_model(Gallery) end spec/controllers/pictures_controller_spec.rb @@ -1,6 +1,4 @@ --colour ---format -progress ---loadby -mtime +--format progress +--loadby mtime --reverse spec/spec.opts @@ -1 +1 @@ -Subproject commit 7138144bd72b8a28123506fe7892007c85d43659 +Subproject commit 3391c8caacc99af5bc3a0f00dff6908c62dcaf27 vendor/plugins/rspec @@ -1 +1 @@ -Subproject commit 08670b640ee8da5bc29a8db751813aa259544036 +Subproject commit 2b25c672537fa3e4ce0341263e890aaa052a8b3e vendor/plugins/rspec-rails 9e0b990675746157c229629e3d7180d9bd6d5c10 shingara cyril.mougel@gmail.com http://github.com/shingara/pictrails/commit/d8a9f7f696b461e3f9a8d8f0e09e42440b5f6f27 d8a9f7f696b461e3f9a8d8f0e09e42440b5f6f27 2008-09-13T02:27:36-07:00 2008-09-13T02:27:36-07:00 start add comment, with a comment model and view of comment in view picture 827602f8678d4ffc04c6c2d0faa85ea42f1433f0 shingara cyril.mougel@gmail.com