jsl-feedzirra 0.0.12.4 → 0.0.12.5

data/lib/feedzirra/http_multi.rb

@@ -77,7 +77,7 @@ module Feedzirra
         retrievable.update_from_feed(updated_feed) 
       else
         # all elements are "new", since we weren't dealing with a Feed element.
-        updated_feed.new_entries = updated_feed.entries
+        updated_feed.mark_all_entries_new!
       end    
     end
 
@@ -88,7 +88,7 @@ module Feedzirra
       begin      
         if curl.response_code == 304
           updated_feed = retrievable
-          updated_feed.new_entries = [ ]
+          updated_feed.mark_all_entries_old!
         else
           updated_feed = parser_for_xml(curl.body_str).run
           updated_feed.feed_url = curl.last_effective_url

data/lib/feedzirra/parser/feed_entry_utilities.rb

@@ -19,6 +19,18 @@ module Feedzirra
       @id || @url
     end
     
+    def new_entry?
+      @_new_entry.nil? ? true : @_new_entry
+    end
+    
+    def mark_old!
+      @_new_entry = false
+    end
+
+    def mark_new!
+      @_new_entry = true
+    end
+    
     ##
     # Writter for published. By default, we keep the "oldest" publish time found.
     def published=(val)
@@ -27,7 +39,7 @@ module Feedzirra
     end
     
     ##
-    # Writter for udapted. By default, we keep the most recenet update time found.
+    # Writter for updated. By default, we keep the most recent update time found.
     def updated=(val)
       parsed = parse_datetime(val)
       @updated = parsed if !@updated || parsed > @updated

data/lib/feedzirra/parser/feed_utilities.rb

@@ -2,9 +2,14 @@ module Feedzirra
   module FeedUtilities
     UPDATABLE_ATTRIBUTES = %w(title feed_url url last_modified)
     
-    attr_writer   :new_entries, :updated, :last_modified
+    attr_writer :updated, :last_modified, :entries
     attr_accessor :etag
 
+    def initialize
+      @entries = []
+      super
+    end
+
     def last_modified
       @last_modified ||= begin
         entry = entries.reject {|e| e.published.nil? }.sort_by { |entry| entry.published if entry.published }.last
@@ -12,12 +17,18 @@ module Feedzirra
       end
     end
     
+    [ :old, :new ].each do |flag| 
+      define_method("mark_all_entries_#{flag}!") do         # def mark_all_entries_new!
+        @entries.each{ |e| e.__send__(:"mark_#{flag}!") }   #   @entries.each {|e| e.mark_new! }
+      end                                                   # end
+    end
+        
     def updated?
       @updated
     end
     
     def new_entries
-      @new_entries ||= []
+      @entries.select{ |e| e.new_entry? }
     end
     
     def has_new_entries?
@@ -25,8 +36,13 @@ module Feedzirra
     end
     
     def update_from_feed(feed)
-      self.new_entries += find_new_entries_for(feed)
-      self.entries.unshift(*self.new_entries)
+      # Mark all existing entries as old, then add new entries, which are
+      # marked as new by default.
+      self.entries.each{|e| e.mark_old! }
+
+      find_new_entries_for(feed).each do |e|
+        self.entries << e
+      end
       
       updated! if UPDATABLE_ATTRIBUTES.any? { |name| update_attribute(feed, name) }
     end
@@ -50,18 +66,14 @@ module Feedzirra
     end
     
     def find_new_entries_for(feed)
-      # this implementation is a hack, which is why it's so ugly.
-      # it's to get around the fact that not all feeds have a published date.
-      # however, they're always ordered with the newest one first.
-      # So we go through the entries just parsed and insert each one as a new entry
-      # until we get to one that has the same url as the the newest for the feed
-      latest_entry = self.entries.first
-      found_new_entries = []
-      feed.entries.each do |entry|
-        break if entry.url == latest_entry.url
-        found_new_entries << entry
+      # This implementation is a hack to get around the fact that not all feeds 
+      # have a published date - we exploit the fact that feeds are always 
+      # ordered with newest element first to work backwards until we reach feed urls 
+      # that we've already seen.      
+      feed.entries.reverse.inject([]) do |res, entry| 
+        break res if entry.url == self.entries.first.url
+        res << entry
       end
-      found_new_entries
     end
     
     def existing_entry?(test_entry)

data/lib/feedzirra.rb

@@ -41,5 +41,5 @@ require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
   USER_AGENT = "feedzirra http://github.com/pauldix/feedzirra/tree/master"
-  VERSION = "0.0.12.4"
+  VERSION = "0.0.12.5"
 end

data/spec/feedzirra/feed_entry_utilities_spec.rb

@@ -1,12 +1,44 @@
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
 describe Feedzirra::FeedUtilities do
-  before(:each) do
+  before do
     @klass = Class.new do
       include Feedzirra::FeedEntryUtilities
     end
   end
   
+  describe "new_entry?" do
+    it "should default to being a new entry" do
+      @klass.new.new_entry?.should be_true
+    end
+  end
+
+  describe "#mark_old!" do
+    before do
+      @entry = @klass.new
+    end
+    
+    it "should make new_entry? return false" do
+      @entry.new_entry?.should be_true
+      @entry.mark_old!
+      @entry.new_entry?.should be_false
+    end
+  end
+  
+  describe "#mark_new!" do
+    before do
+      @entry = @klass.new
+    end
+    
+    it "should make new_entry? return true" do
+      @entry.new_entry?.should be_true
+      @entry.mark_old!
+      @entry.new_entry?.should be_false
+      @entry.mark_new!
+      @entry.new_entry?.should be_true
+    end    
+  end
+  
   describe "handling dates" do
     it "should parse an ISO 8601 formatted datetime into Time" do
       time = @klass.new.parse_datetime("2008-02-20T8:05:00-010:00")
@@ -16,7 +48,7 @@ describe Feedzirra::FeedUtilities do
   end
   
   describe "sanitizing" do
-    before(:each) do
+    before do
       @feed = Feedzirra::FeedParser.new(sample_atom_feed).run
       @entry = @feed.entries.first
     end

data/spec/feedzirra/feed_utilities_spec.rb

@@ -1,44 +1,37 @@
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
 describe Feedzirra::FeedUtilities do
-  before(:each) do
+  before do
     @klass = Class.new do
       include Feedzirra::FeedUtilities
     end
+    @feed = @klass.new
   end
 
   describe "instance methods" do
     it "should provide an updated? accessor" do
-      feed = @klass.new
-      feed.should_not be_updated
-      feed.updated = true
-      feed.should be_updated
-    end
-    
-    it "should provide a new_entries accessor" do
-      feed = @klass.new
-      feed.new_entries.should == []
-      feed.new_entries = [:foo]
-      feed.new_entries.should == [:foo]
+      @feed.should_not be_updated
+      @feed.updated = true
+      @feed.should be_updated
     end
     
     it "should provide an etag accessor" do
-      feed = @klass.new
-      feed.etag = "foo"
-      feed.etag.should == "foo"
+      @feed.etag = "foo"
+      @feed.etag.should == "foo"
     end
     
     it "should provide a last_modified accessor" do
-      feed = @klass.new
+      @feed = @klass.new
       time = Time.now
-      feed.last_modified = time
-      feed.last_modified.should == time
+      @feed.last_modified = time
+      @feed.last_modified.should == time
     end
-    
+
     it "should return new_entries? as true when entries are put into new_entries" do
-      feed = @klass.new
-      feed.new_entries << :foo
-      feed.should have_new_entries
+      @feed = @klass.new
+      feed_entry = Feedzirra::Parser::AtomEntry.new
+      @feed.instance_variable_set(:@entries, [ feed_entry ])
+      @feed.should have_new_entries
     end
     
     it "should return a last_modified value from the entry with the most recent published date if the last_modified date hasn't been set" do
@@ -59,9 +52,33 @@ describe Feedzirra::FeedUtilities do
     end
   end
   
+  describe "#mark_all_entries_old!" do
+    before do
+      @mock_entry = mock('entry')
+      @feed.entries = [ @mock_entry ]
+    end
+    
+    it "should call #mark_old! on all entries" do
+      @mock_entry.expects(:mark_old!)
+      @feed.mark_all_entries_old!
+    end
+  end
+
+  describe "#mark_all_entries_new!" do
+    before do
+      @mock_entry = mock('entry')
+      @feed.entries = [ @mock_entry ]
+    end
+    
+    it "should call #mark_new! on all entries" do
+      @mock_entry.expects(:mark_new!)
+      @feed.mark_all_entries_new!
+    end
+  end
+  
   describe "#update_from_feed" do
     describe "updating feed attributes" do
-      before(:each) do
+      before do
         # I'm using the Atom class when I know I should be using a different one. However, this update_from_feed
         # method would only be called against a feed item.
         @feed = Feedzirra::Parser::Atom.new
@@ -109,7 +126,7 @@ describe Feedzirra::FeedUtilities do
     end
     
     describe "updating entries" do
-      before(:each) do
+      before do
         # I'm using the Atom class when I know I should be using a different one. However, this update_from_feed
         # method would only be called against a feed item.
         @feed = Feedzirra::Parser::Atom.new
@@ -117,16 +134,24 @@ describe Feedzirra::FeedUtilities do
         @feed.url      = "http://pauldix.net"
         @feed.feed_url = "http://feeds.feedburner.com/PaulDixExplainsNothing"
         @feed.updated  = false
-        @updated_feed = @feed.dup
+
+        # Using a clone or dup would only copy references to instance variables in the
+        # object, so we serialize and deserialize it here to avoid problems caused by 
+        # variable references being passed around.
+        @updated_feed = Marshal.load(Marshal.dump(@feed))
+        
         @old_entry = Feedzirra::Parser::AtomEntry.new
         @old_entry.url = "http://pauldix.net/old.html"
         @old_entry.published = Time.now.to_s
+        
         @new_entry = Feedzirra::Parser::AtomEntry.new
         @new_entry.url = "http://pauldix.net/new.html"
         @new_entry.published = (Time.now + 10).to_s  
+        
         @feed.entries << @old_entry
-        @updated_feed.entries << @new_entry
+        
         @updated_feed.entries << @old_entry
+        @updated_feed.entries << @new_entry
       end
       
       it "should update last-modified from the latest entry date" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsl-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.12.4
+  version: 0.0.12.5
 platform: ruby
 authors: 
 - Paul Dix