@@ -1,6 +1,4 @@
= TODO
-* Add feed 'update now' capability to admin page
-* Auto-Reindex search after admin changes (ex: delete a feed) -- is this necessary?
* Allow users to suggest feeds?
-
+* Overhaul theme / design
TODO.rdoc
@@ -25,7 +25,7 @@ helpers do
end
end
-# root page
+# main page, index of recent entries
['/', '/page/:page'].each do |action|
get action do
@pages, @entries = Entry.paginated(:order => [:published_at.desc],
@@ -35,6 +35,7 @@ end
end
end
+# atom feed
get '/feed' do
content_type 'application/atom+xml', :charset => 'utf-8'
@entries = Entry.all(:order => [:published_at.desc],
@@ -42,12 +43,14 @@ get '/feed' do
builder :feed
end
+# search
post '/search' do
@entries = Entry.search(:conditions => [params[:q].to_s],
:limit => SiteConfig.per_page)
haml :search
end
+# admin page, feed management
['/admin', '/admin/feeds'].each do |action|
get action do
login_required
@@ -56,6 +59,7 @@ end
end
end
+# admin feed create
post '/admin/feeds' do
login_required
@feed = Feed.new(:url => params[:url])
@@ -63,9 +67,18 @@ post '/admin/feeds' do
redirect '/admin'
end
+# admin feed delete
delete '/admin/feeds/:id' do
login_required
@feed = Feed.get(params[:id])
@feed.destroy
redirect '/admin'
end
+
+# admin feed update (from remote)
+post '/admin/feeds/:id/update' do
+ login_required
+ @feed = Feed.get(params[:id])
+ @feed.update_from_remote
+ redirect '/admin'
+end
application.rb
@@ -126,7 +126,8 @@ ul.feeds li.feed {
.clear {
clear: both;
}
-form.delete {
+form.action {
margin: 0;
padding: 0;
+ display: inline;
}
public/stylesheets/application.css
@@ -126,5 +126,26 @@ describe 'Application' do
last_response.status.should == 401
end
end
+
+ context 'updating feeds' do
+ specify 'should run update for the specified feed' do
+ authorize SiteConfig.admin_login, SiteConfig.admin_password
+ Feed.should_receive(:get).with('1').and_return(@feed)
+ @feed.should_receive(:update_from_remote).and_return(true)
+ post "/admin/feeds/#{@feed.id}/update"
+ end
+
+ specify 'should redirect to the main admin page' do
+ authorize SiteConfig.admin_login, SiteConfig.admin_password
+ post "/admin/feeds/#{@feed.id}/update"
+ follow_redirect!
+ last_request.url.should match(/.*\/admin$/)
+ end
+
+ specify 'should require login' do
+ post '/admin/feeds/1/update'
+ last_response.status.should == 401
+ end
+ end
end
end
spec/application_spec.rb
@@ -2,11 +2,13 @@
%ul.feeds
- @feeds.each do |feed|
%li{:id => "feed-#{feed.id}", :class => 'feed'}
- %form{:action => "/admin/feeds/#{feed.id}", :method => 'post', :class => 'delete'}
+ %form{:action => "/admin/feeds/#{feed.id}", :method => 'post', :class => 'action'}
%input{:type => 'hidden', :name => '_method', :value => 'delete'}
%input{:type => 'submit', :value => 'X', :onclick => "return confirm('Are you sure? This will delete the feed and all its entries')"}
- %a{:href => feed.url, :target => '_blank'}= feed.title
- = "- #{feed.entries.length} entries"
+ %form{:action => "/admin/feeds/#{feed.id}/update", :method => 'post', :class => 'action'}
+ %input{:type => 'submit', :value => 'Update'}
+ %a{:href => feed.url, :target => '_blank'}= feed.title
+ = "- #{feed.entries.length} entries"
%form{:action => '/admin/feeds', :method => 'post'}
%input{:type => 'text', :name => 'url'}
%input{:type => 'submit', :value => 'Add New Feed'}
views/admin.haml
d21eb5239b6a3ddd24e12ec5fe399eee2e687dfc
Nick Plante
nap@zerosum.org
http://github.com/zapnap/mogo/commit/65bcb3ce7bf409cfbe99547e5ac3915a40f1ead5
65bcb3ce7bf409cfbe99547e5ac3915a40f1ead5
2009-04-01T10:30:40-07:00
2009-04-01T10:30:40-07:00
add feed update buttons to admin interface
6ba4ac8593357d45a6c94b7bef521e5d60248227
Nick Plante
nap@zerosum.org