0
@@ -5,7 +5,6 @@ class FeedsController < ApplicationController
0
   end
0
   
0
   def new
0
-    pp params
0
     
0
     feed = Feed.new(:title => params[:url].gsub('[', '[@'), :link => params[:url].gsub('[', '[@'), 
0
             :link_regexp => params[:link].gsub('[', '[@'), :title_regexp => params[:title].gsub('[', '[@'), 
0
@@ -19,23 +18,10 @@ class FeedsController < ApplicationController
0
   def show
0
     @feed = Feed.find_by_id(params[:id])
0
     
0
-    parsed_items = @feed.execute
0
-
0
-    existing_items = Item.find(:all, 
0
-      :conditions => ["feed_id =? and guid in (?)", @feed.id, parsed_items.collect(&:guid)])
0
-
0
-
0
-    existing_items.collect!(&:guid) unless existing_items.empty?
0
-
0
-    new_items = parsed_items.reject {|item| existing_items.include?(item.guid)}
0
-
0
-    @feed.items << new_items unless new_items.empty?
0
-
0
-    @feed.last_published = Time.now
0
-
0
-    @feed.save unless new_items.empty?
0
+    Feed.async_send :refresh, params[:id]
0
+    #Feed.send :refresh, params[:id]
0
     
0
-    @items = Item.find(:all, :conditions => ["feed_id = ?", @feed.id], 
0
+    @items = Item.find(:all, :conditions => ["feed_id = ?", params[:id]], 
0
       :order => "created_at DESC")
0
     
0
     respond_to do |format|

0
@@ -4,18 +4,37 @@ require "hpricot"
0
 
0
 class Feed < ActiveRecord::Base
0
   has_many :items
0
+  
0
+  def self.refresh(id)
0
+    feed = Feed.find_by_id(id)
0
+    
0
+    parsed_items = feed.execute
0
+
0
+    existing_items = Item.find(:all, :select =>"guid",
0
+      :conditions => ["feed_id =? and guid in (?)", feed.id, parsed_items.collect(&:guid)])
0
+
0
+    existing_items.collect!(&:guid) unless existing_items.empty?
0
+
0
+    new_items = parsed_items.reject {|item| existing_items.include?(item.guid)}
0
+
0
+    feed.items << new_items unless new_items.empty?
0
+
0
+    feed.last_published = Time.now
0
+
0
+    feed.save unless new_items.empty?
0
+  end
0
 
0
   def execute
0
     doc = Hpricot(fetch_page(link))
0
     pages = []
0
     
0
     if !more_regexp.blank?
0
-      links = doc.search(more_regexp).collect do |link|
0
-        fix_relative_url(link.search("a[@href]").first.attributes["href"])
0
-      end
0
+      links = doc.search(more_regexp)[0].search("a[@href]").collect do |link|
0
+        fix_relative_url(link.attributes["href"])
0
+      end.uniq
0
       
0
-      0.upto([links.length, more].sort[0]) do |i|
0
-        pages << Hpricot(fetch_page(links[i]))
0
+      1.upto([links.length, more].sort[0]) do |i|
0
+        pages << Hpricot(fetch_page(links[i-1]))
0
       end
0
     end
0
     pages << doc
0
@@ -23,9 +42,6 @@ class Feed < ActiveRecord::Base
0
     items = pages.collect { |page| parse_page(page) }.flatten.uniq
0
   end
0
   
0
-  
0
-  
0
-  
0
   def parse_page(doc)
0
     links = doc.search(link_regexp).collect do |link|
0
       fix_relative_url(link.search("a[@href]").first.attributes["href"])