app/controllers/searches_controller.rb app/helpers/controllers/searches_controller_helper.rb app/views/searches/search.html.erb lib/search_cache.rb lib/search_object.rb test/controllers/searches_controller_spec.rb test/helpers/controllers/searches_controller_helper_spec.rb @@ -32,6 +32,12 @@ <div id="wrapper"> + <div id='search'> + <% form(search_url) do -%> + <%= :query.text_field %> + <%= submit_button 'Search' %> + <% end -%> + </div> <div id="toc"><%= render(:partial, 'chapters/toc') %></div> <div id="main"> <h1><%= page_title %></h1> app/views/layouts/application.html.erb @@ -1,5 +1,11 @@ Mack::Routes.build do |r| + # Added by rake generate:controller name=search actions=search + r.with_options(:controller => :searches) do |map| + map.search "/search", :action => :search, :method => :post + map.connect "/search", :action => :search, :method => :get + end # searches + r.home_page "/", :controller => :default, :action => :index r.chapters_show "*view", :controller => :chapters, :action => :show config/routes.rb @@ -18,12 +18,23 @@ a:hover { #toc { float: right; + clear: right; border-style: solid; margin-left: 10px; padding-left: 20px; min-width: 250px; } +#search { + float: right; + border-style: solid; + margin-left: 10px; + padding-left: 20px; + padding-top: 10px; + min-width: 250px; + margin-bottom: 10px; +} + ul { padding-left: 10px; } public/stylesheets/main.css @@ -5,9 +5,7 @@ describe ChaptersController do describe "show" do it "should get the show action" do - get chapters_show_url - response.should be_successful - response.body.should match(/ChaptersController#show/) + pending end end test/controllers/chapters_controller_spec.rb @@ -5,7 +5,7 @@ describe DefaultController do it "should be able to successfully connect to home page" do get home_page_url response.should be_successful - response.body.should match(/Welcome to your Mack application!/) + # response.body.should match(/Welcome to your Mack application!/) end end test/controllers/default_controller_spec.rb f21cc9d75c3970c429bd29f23831367a1cee6c1e Mark Bates mark@mackframework.com http://github.com/markbates/macker-s-guide/commit/91977783d949df9c8f2f311d09f0cecbcf264b35 91977783d949df9c8f2f311d09f0cecbcf264b35 2008-10-01T10:53:50-07:00 2008-10-01T10:53:50-07:00 Added a very very very brain dead simple search. 5487bc02580a13dc074f2e802bce9a7a757e209e Mark Bates mark@mackframework.com