app/views/album_arts/search.html.erb @@ -96,4 +96,14 @@ class AlbumArtsController < ApplicationController format.xml { head :ok } end end + + def search + q = params[:q] + @album_arts = AlbumArt.find(:all, :conditions => "album_name LIKE '%#{q}%' OR artist_name LIKE '%#{q}%'") + + respond_to do |format| + format.html + end + end + end app/controllers/album_arts_controller.rb @@ -6,8 +6,10 @@ <%= render :partial => 'album_art_info', :locals => { :album_art => album_art } %> + <% if album_art.user == current_user %> <p><%= link_to 'Editar', edit_album_art_path(album_art) %>, - <%= link_to 'Apagar', album_art, :confirm => 'Are you sure?', :method => :delete %></p> + <%= link_to 'Apagar', album_art, :confirm => 'Are you sure?', :method => :delete %></p> + <% end %> </li> <% end %> <% end %> app/views/album_arts/index.html.erb @@ -33,9 +33,11 @@ <% if flash[:notice] %><p class="flash notice"><%= flash[:notice] %></p><% end %> <% if flash[:error] %><p class="flash error"><%= flash[:error] %></p><% end %> - <% form_tag 'album_arts/search', {:id => "album_art_search"} do -%> - <%= text_field_tag :q %> - <%= submit_tag 'Buscar' %> + <% form_tag '/album_arts/search', {:id => "album_art_search", :method => "GET"} do -%> + <fieldset> + <%= text_field_tag :q %> + <%= submit_tag 'Buscar' %> + </fieldset> <% end -%> <div id="content"> app/views/layouts/application.html.erb @@ -1,6 +1,6 @@ ActionController::Routing::Routes.draw do |map| - map.resources :album_arts + map.resources :album_arts, :collection => { :search => :get } map.resources :users, :has_many => :album_arts map.resource :sessions @@ -13,4 +13,5 @@ ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' -end + +end \ No newline at end of file config/routes.rb @@ -37,6 +37,12 @@ h2{ clear:right; } +form#album_art_search fieldset { + width:1000px; + margin:10px auto; + text-align:right; +} + #content { width:1000px; margin:auto; public/stylesheets/cdcovers.css @@ -193,7 +193,7 @@ describe AlbumArtsController do response.should be_redirect end - it "should be successful" do + it "should be successful when logged in" do do_login do_get response.should be_success @@ -336,4 +336,32 @@ describe AlbumArtsController do response.should redirect_to(album_arts_url) end end + + describe "searching album art" do + + before(:each) do + @album_art = mock_model(AlbumArt) + AlbumArt.stub!(:find).and_return(@album_art) + end + + def do_get + get :search, :q => "pitty" + end + + it "should search for the album art with the parameter passed" do + AlbumArt.should_receive(:find).and_return(@album_art) + do_get + end + + it "should render the results page" do + do_get + response.should render_template('search') + end + + it "should assign the found album_arts for the view" do + do_get + assigns[:album_arts].should == @album_art + end + + end end \ No newline at end of file spec/controllers/album_arts_controller_spec.rb fe1154bdba5d4adf80bf61ac02e5a6760fb78568 Ricardo Shiota Yasuda shadow11@gmail.com http://github.com/shadow11/cd-covers/commit/24ff67b3ee89929ae31eaf2f65e8af3d19cca211 24ff67b3ee89929ae31eaf2f65e8af3d19cca211 2008-06-11T15:18:27-07:00 2008-06-11T15:18:27-07:00 Added search 89a55f96d6e74995f49e32a2591510565b567f5c Ricardo Shiota Yasuda shadow11@gmail.com