app/controllers/photos_controller.rb app/helpers/photos_helper.rb app/models/photo.rb app/views/people/show.html.erb config/amazon_s3.yml db/migrate/004_create_photos.rb lib/tasks/sample_data.rake lib/tasks/sample_data/female_descriptions.txt lib/tasks/sample_data/female_names.txt lib/tasks/sample_data/female_photos/102896_300.jpg lib/tasks/sample_data/female_photos/103043_300.jpg lib/tasks/sample_data/female_photos/110450_300.jpg lib/tasks/sample_data/female_photos/110851_300.jpg lib/tasks/sample_data/female_photos/113292_300.jpg lib/tasks/sample_data/female_photos/113820_300.jpg lib/tasks/sample_data/female_photos/124234_300.jpg lib/tasks/sample_data/female_photos/128285_300.jpg lib/tasks/sample_data/female_photos/132958_300.jpg lib/tasks/sample_data/female_photos/142498_300.jpg lib/tasks/sample_data/female_photos/145069_300.jpg lib/tasks/sample_data/female_photos/146440_300.jpg lib/tasks/sample_data/female_photos/148760_300.jpg lib/tasks/sample_data/female_photos/158962_300.jpg lib/tasks/sample_data/female_photos/163564_300.jpg lib/tasks/sample_data/female_photos/1779_300.jpg lib/tasks/sample_data/female_photos/184987_300.jpg lib/tasks/sample_data/female_photos/194562_300.jpg lib/tasks/sample_data/female_photos/207551_300.jpg lib/tasks/sample_data/female_photos/215048_300.jpg lib/tasks/sample_data/female_photos/223833_300.jpg lib/tasks/sample_data/female_photos/232065_300.jpg lib/tasks/sample_data/female_photos/2349_300.jpg lib/tasks/sample_data/female_photos/284082_300.jpg lib/tasks/sample_data/female_photos/28412_300.jpg lib/tasks/sample_data/female_photos/298625_300.jpg lib/tasks/sample_data/female_photos/76264_300.jpg lib/tasks/sample_data/female_photos/83652_300.jpg lib/tasks/sample_data/female_photos/84442_300.jpg lib/tasks/sample_data/female_photos/919_300.jpg lib/tasks/sample_data/lipsum.txt lib/tasks/sample_data/male_descriptions.txt lib/tasks/sample_data/male_names.txt lib/tasks/sample_data/male_photos/002.jpg lib/tasks/sample_data/male_photos/01ijal_17082550192604.jpg lib/tasks/sample_data/male_photos/107372_300.jpg lib/tasks/sample_data/male_photos/115002_920.jpg lib/tasks/sample_data/male_photos/119872_300.jpg lib/tasks/sample_data/male_photos/120259_920.jpg lib/tasks/sample_data/male_photos/1202_300.jpg lib/tasks/sample_data/male_photos/129621_300.jpg lib/tasks/sample_data/male_photos/130630_920.jpg lib/tasks/sample_data/male_photos/141912_300.jpg lib/tasks/sample_data/male_photos/145893_300.jpg lib/tasks/sample_data/male_photos/147212_300.jpg lib/tasks/sample_data/male_photos/147411_920.jpg lib/tasks/sample_data/male_photos/1670_300.jpg lib/tasks/sample_data/male_photos/167509_300.jpg lib/tasks/sample_data/male_photos/184578_300.jpg lib/tasks/sample_data/male_photos/218255_920.jpg lib/tasks/sample_data/male_photos/2292_300.jpg lib/tasks/sample_data/male_photos/257338_920.jpg lib/tasks/sample_data/male_photos/286580_300.jpg lib/tasks/sample_data/male_photos/99347_920.jpg lib/tasks/sample_data/male_photos/HughMcCutcheon.jpg lib/tasks/sample_data/male_photos/Img4783.jpg lib/tasks/sample_data/male_photos/a0be.jpg lib/tasks/sample_data/male_photos/alantse-2.jpg lib/tasks/sample_data/male_photos/jhedrick.jpg lib/tasks/sample_data/male_photos/male_main.jpg lib/tasks/sample_data/male_photos/mathias_lauridsen.jpg lib/tasks/sample_data/male_photos/portrait-bits.jpg lib/tasks/sample_data/male_photos/profile.jpg test/fixtures/photos.yml test/functional/photos_controller_test.rb test/unit/photo_test.rb vendor/plugins/attachment_fu/CHANGELOG vendor/plugins/attachment_fu/README vendor/plugins/attachment_fu/Rakefile vendor/plugins/attachment_fu/amazon_s3.yml.tpl vendor/plugins/attachment_fu/init.rb vendor/plugins/attachment_fu/install.rb vendor/plugins/attachment_fu/lib/geometry.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb vendor/plugins/attachment_fu/test/amazon_s3.yml vendor/plugins/attachment_fu/test/backends/db_file_test.rb vendor/plugins/attachment_fu/test/backends/file_system_test.rb vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb vendor/plugins/attachment_fu/test/base_attachment_tests.rb vendor/plugins/attachment_fu/test/basic_test.rb vendor/plugins/attachment_fu/test/database.yml vendor/plugins/attachment_fu/test/extra_attachment_test.rb vendor/plugins/attachment_fu/test/fixtures/attachment.rb vendor/plugins/attachment_fu/test/fixtures/files/fake/rails.png vendor/plugins/attachment_fu/test/fixtures/files/foo.txt vendor/plugins/attachment_fu/test/fixtures/files/rails.png vendor/plugins/attachment_fu/test/geometry_test.rb vendor/plugins/attachment_fu/test/processors/image_science_test.rb vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb vendor/plugins/attachment_fu/test/processors/rmagick_test.rb vendor/plugins/attachment_fu/test/schema.rb vendor/plugins/attachment_fu/test/test_helper.rb vendor/plugins/attachment_fu/test/validation_test.rb @@ -8,6 +8,10 @@ class PeopleController < ApplicationController end end + def show + @person = Person.find(params[:id]) + end + def new end app/controllers/people_controller.rb @@ -1,7 +1,6 @@ # This controller handles the login/logout function of the site. class SessionsController < ApplicationController - # render new.rhtml def new end app/controllers/sessions_controller.rb @@ -1,8 +1,14 @@ # Methods added to this helper will be available to all templates in the application. module ApplicationHelper def menu - [{ :content => "Home", :href => home_url }, - { :content => "People", :href => people_url }] + if logged_in? + [{ :content => "Home", :href => home_path }, + { :content => "My Profile" , :href => person_path(current_person) }, + { :content => "People", :href => people_path }] + else + [{ :content => "Home", :href => home_path }, + { :content => "People", :href => people_path }] + end end def menu_link_to(link, options = {}) app/helpers/application_helper.rb @@ -2,7 +2,7 @@ <%= will_paginate %> <ul> <%- @people.each do |person| -%> - <li><%= person.name %></li> + <li><%= link_to person.name, person %></li> <%- end -%> </ul> <%= will_paginate %> app/views/people/index.html.erb @@ -1,4 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.resources :photos + map.resources :people map.resource :session config/routes.rb @@ -40,6 +40,11 @@ describe PeopleController do get :index response.should be_success end + + it "should show a person" do + get :show, :id => people(:quentin) + response.should be_success + end end describe "edit" do spec/controllers/people_controller_spec.rb @@ -37,7 +37,7 @@ end describe "layout when logged in" do before(:each) do - login_as :quentin + @person = login_as :quentin render "/layouts/application.html.erb" end @@ -52,4 +52,8 @@ describe "layout when logged in" do it "should have a sign out link" do response.should have_tag("a[href=?]", logout_path) end + + it "should have a profile link" do + response.should have_tag("a[href=?]", person_path(@person)) + end end \ No newline at end of file spec/views/layouts/application.html.erb_spec.rb 204ad3eef07c89f92bd124d3399fc746f6c8db49 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/ee0767fb44704ca61af682a493b4290abcba5418 ee0767fb44704ca61af682a493b4290abcba5418 2008-02-20T20:43:12-08:00 2008-02-20T20:43:12-08:00 Got sample data to load Improved menus 8c2d20b27645828faba0159394674c85a5a0b405 Michael Hartl michael@michaelhartl.com