views/preview.haml @@ -83,7 +83,7 @@ namespace :gems do task :install do required_gems = %w{ sinatra dm-core dm-aggregates dm-validations dm-timestamps dm-is-paginated dm-is-searchable shanna-dm-sphinx-adapter merb-pagination haml - pauldix-feedzirra thoughtbot-factory_girl rspec rspec_hpricot_matchers } + pauldix-feedzirra thoughtbot-factory_girl rspec rspec_hpricot_matchers jnunemaker-columbus} required_gems.each { |required_gem| system "sudo gem install #{required_gem}" } end end Rakefile @@ -33,6 +33,16 @@ get '/feed' do builder :feed end +post '/suggest' do + @preview_contents = Feed.preview_url(params[:url]) + if @preview_contents.size == 1 + Feed.create(:feed_url => @preview_contents[0][1]) + redirect '/' + else + haml :preview + end +end + post '/search' do @entries = Entry.search({ :content => params[:q] }) haml :search application.rb @@ -10,6 +10,7 @@ require 'merb-pagination' require 'haml' require 'ostruct' require 'feedzirra' +require 'columbus' require 'sinatra' unless defined?(Sinatra) environment.rb @@ -38,6 +38,18 @@ class Feed @feed == 0 ? nil : @feed end + def self.preview_url(feed_or_blog_url, recurse = true) + @feed = Feedzirra::Feed.fetch_and_parse(feed_or_blog_url.to_s) + if @feed + [[@feed.title, feed_or_blog_url, @feed.entries.map { |e| [e.title, e.url] }]] + elsif recurse + urls = Columbus.new(feed_or_blog_url).all + urls.map { |u| preview_url(u.url, false) }.reject { |u| u.empty? }.inject([]) { |a, c| a + c } + else + [] + end + end + private # update feed attributes from remote feed lib/feed.rb @@ -22,6 +22,10 @@ %a{:href => feed.url}= feed.title %h2 Subscribe %a{:href => '/feed'} Atom Feed + %h2 Suggest a feed + %form.suggest-form{:action => '/suggest', :method => 'post'} + %input{:type => 'text', :value => '', :name => 'url'}/ + %input{:type => 'submit', :value => "suggest »"}/ #content= yield .clear #footer views/layout.haml c1b5c4df0e6780b195b2770f8ee2ec467165c55f Darcy Laycock sutto@sutto.net http://github.com/Sutto/mogo/commit/31f04b801f002b46daa476e800928db4a238f2b3 31f04b801f002b46daa476e800928db4a238f2b3 2009-03-30T08:52:11-07:00 2009-03-30T08:52:11-07:00 Added in suggest feature via columbus, requires styling bf1ed588c7ea11d73cecfaebbe0908b3564bc335 Darcy Laycock sutto@sutto.net