@@ -48,7 +48,7 @@ end post '/suggest' do @preview_contents = Feed.preview_url(params[:url]) if @preview_contents.size == 1 - Feed.create(:feed_url => @preview_contents[0][1]) + Feed.create(:url => @preview_contents[0][1]) redirect '/' else haml :preview @@ -57,8 +57,7 @@ end post '/search' do @entries = Entry.search(:conditions => [params[:q].to_s], - :limit => SiteConfig.per_page, - 'feed.approved' => true) + :limit => SiteConfig.per_page) haml :search end application.rb @@ -131,3 +131,6 @@ form.action { padding: 0; display: inline; } +.sidebar-spacer { + height: 1em; +} \ No newline at end of file public/stylesheets/application.css @@ -52,7 +52,7 @@ describe 'Application' do end specify 'should return matching records' do - Entry.should_receive(:search).with(:conditions => ['power ring'], :limit => SiteConfig.per_page, 'feed.approved' => true).and_return([@entry]) + Entry.should_receive(:search).with(:conditions => ['power ring'], :limit => SiteConfig.per_page).and_return([@entry]) post '/search', :q => 'power ring' end spec/application_spec.rb @@ -30,7 +30,7 @@ source entries sql_host = localhost sql_pass = sql_user = root - sql_query = SELECT id, 'Entry' AS class, 0 as class_id, content, summary FROM entries + sql_query = SELECT id, 'Entry' AS class, 0 as class_id, content, summary FROM entries WHERE feed_id IN (SELECT id FROM feeds WHERE approved = 1) sql_attr_uint = class_id sql_query_info = SELECT * FROM entries WHERE entries.id = (($id - 0) / 1) sphinx.conf.example @@ -23,6 +23,7 @@ %a{:href => feed.url}= feed.title %h2 Subscribe %a{:href => '/feed'} Atom Feed + .sidebar-spacer %h2 Suggest a feed %form.suggest-form{:action => '/suggest', :method => 'post'} %input{:type => 'text', :value => '', :name => 'url'}/ views/layout.haml c81b7e6cb58baabf1b1a7041fc3d8deaa462e0a2 Darcy Laycock sutto@sutto.net http://github.com/zapnap/mogo/commit/ed336ab6f1c12b3a9572da87eb3fdf32b7a25485 ed336ab6f1c12b3a9572da87eb3fdf32b7a25485 2009-04-02T13:00:21-07:00 2009-04-02T13:00:21-07:00 Added in final fixes for suggested feeds (for the moment) 647157af4def101ef9558a02d10d63353b581190 Darcy Laycock sutto@sutto.net