now passing the post object along with the entry object to entries_be…

…come block

app/models/feed.rb

@@ -19,7 +19,7 @@ def entries_become(entry_type, &block)
       has_many entry_type, :foreign_key => :feed_id, :dependent => :destroy
       define_method(:refresh!) do
         logger.debug "=> creating #{entry_type} from #{uri}"
-        entries.each(&block.bind(self))
+        entries.each { |entry| block.call(send(entry_type).build, entry) }
         self.updated_at = Time.now
         self.save
       end

app/models/feeds/blog.rb

@@ -1,7 +1,8 @@
 class Blog < Feed
 
-  entries_become :articles do |entry|
-    article = articles.build :content => entry.content, :header => entry.title
+  entries_become :articles do |article, entry|
+    article.header = entry.title
+    article.content = entry.content
     article.permalink  = entry.urls.first
     article.created_at = entry.try(:date_published)
     article.updated_at = entry.try(:last_updated)

app/models/feeds/delicious.rb

@@ -1,7 +1,9 @@
 class Delicious < Feed
 
-  entries_become :links do |entry|
-    link = links.build :permalink => entry.urls.first, :header => entry.title, :content => entry.content
+  entries_become :links do |link, entry|
+    link.header = entry.title
+    link.content = entry.content
+    link.permalink = entry.urls.first
     link.created_at = entry.date_published
     link.save
   end

app/models/feeds/flickr.rb

@@ -1,12 +1,10 @@
 class Flickr < Feed
 
-  entries_become :pictures do |entry|
-    doc = Hpricot(entry.content)
-    picture = pictures.build \
-      :permalink => (doc/"img").first['src'].gsub(/_m/, ''),
-      :header => entry.title,
-      :cite => entry.urls.first
-    # picture.created_at = entry.try(:date_published)
+  entries_become :pictures do |picture, entry|
+    picture.cite = entry.urls.first
+    picture.header = entry.title
+    picture.permalink = (Hpricot(entry.content)/"img").first['src'].gsub(/_m/, '')
+    picture.created_at = entry.try(:date_published)
     picture.updated_at = entry.try(:last_updated)
     picture.save
   end

app/models/feeds/twitter.rb

@@ -1,7 +1,8 @@
 class Twitter < Feed
 
-  entries_become :tweets do |entry|
-    tweet = tweets.build :permalink => entry.urls.first, :content => entry.content.gsub(/\A\w*:?\s/, '')
+  entries_become :tweets do |tweet, entry|
+    tweet.content = entry.content.gsub(/\A\w*:?\s/, '')
+    tweet.permalink = entry.urls.first
     tweet.created_at = entry.try(:date_published)
     tweet.save ? tweet : tweet.destroy
   end