feedzirra 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6547ea21e91fd542899dbb76260595526c269d70
-  data.tar.gz: 4b34a18d37afb06519846075bedaac411770e084
+  metadata.gz: 2b9482eade1fb00eec35c6cf8b71b6ce1b0b8199
+  data.tar.gz: 18bf9c94569d01f234df54eb32d86eea088e2c00
 SHA512:
-  metadata.gz: 7d45bc2899f40f6e3bbe1ac2173deca01e403522b08e8fd2c468df8ea96624f72c948b2d10f266de08f9dee61a27bec9af8294dac83a4aeac6a142cf42c1533f
-  data.tar.gz: 1813e66fa65f47b612befc1be51aefca816e9cf6a2553790abdd31a515ce5e98d2fc8acdba37e71a656fee8bd090ae3a4afa853b228c42882667176bfd1857fd
+  metadata.gz: 6689203d7096ab57b71a720006247e5157bc813f7ba474936083d261e9d3bf22034c1d6c62fa64ba08a0190d5fb538cee7a1c0a9dabfc6c76671067b54d25b4e
+  data.tar.gz: 5ebe8cb8ee64a3f95ef50327e456f2c8127d63d9d976abe60a2107d3610fc064d80559dbda7e351b4b188922c4a5d2d8c4547104a80cce3bac8502c66d1c3d43

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Feedzirra Changelog
 
+## 0.7.1
+
+* Bugfix
+  * Don't use entry id for updating when feed doesn't provide it [[#205][]]
+
+[#205]: https://github.com/pauldix/feedzirra/pull/205
+
 ## 0.7.0
 
 * General

data/lib/feedzirra/feed_utilities.rb

@@ -86,7 +86,11 @@ module Feedzirra
       latest_entry = self.entries.first
       found_new_entries = []
       feed.entries.each do |entry|
-        break if entry.entry_id == latest_entry.entry_id || entry.url == latest_entry.url
+        if entry.entry_id.nil? && latest_entry.entry_id.nil?
+          break if entry.url == latest_entry.url
+        else
+          break if entry.entry_id == latest_entry.entry_id || entry.url == latest_entry.url
+        end
         found_new_entries << entry
       end
       found_new_entries

data/lib/feedzirra/version.rb

@@ -1,3 +1,3 @@
 module Feedzirra
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/feedzirra/feed_utilities_spec.rb

@@ -169,7 +169,10 @@ describe Feedzirra::FeedUtilities do
       end
     end
 
-    describe "changing the url of an existing entry" do
+    describe "#update_from_feed" do
+      let(:recent_entry_id) { 'entry_id' }
+      let(:old_entry_id) { nil }
+
       before(:each) 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.
@@ -182,11 +185,12 @@ describe Feedzirra::FeedUtilities do
 
         @old_entry = Feedzirra::Parser::AtomEntry.new
         @old_entry.url = "http://pauldix.net/old.html"
+        @old_entry.entry_id = old_entry_id
         @old_entry.published = (Time.now - 10).to_s
 
         @entry = Feedzirra::Parser::AtomEntry.new
         @entry.published = (Time.now + 10).to_s
-        @entry.entry_id = "entry_id"
+        @entry.entry_id = recent_entry_id
         @entry.url = "http://pauldix.net/entry.html"
 
         # only difference is a changed url
@@ -200,15 +204,27 @@ describe Feedzirra::FeedUtilities do
         @updated_feed.entries << @old_entry
       end
 
-      it "should not put the complete feed into new_entries" do
-        @feed.update_from_feed(@updated_feed)
+      context "changing the url of an existing entry" do
+        it "should not put the complete feed into new_entries" do
+          @feed.update_from_feed(@updated_feed)
+          @feed.new_entries.should_not include(@entry_changed_url)
+          @feed.new_entries.should_not include(@old_entry)
+          @feed.new_entries.size.should == 0
+          @feed.new_entries.size.should_not == 2
+        end
+      end
 
-        @feed.new_entries.should_not include(@entry_changed_url)
-        @feed.new_entries.should_not include(@old_entry)
+      context "feed not have entry id and only difference is a url" do
+        let(:recent_entry_id) { nil }
+        let(:old_entry_id) { nil }
 
-        # don't return complete feed
-        @feed.new_entries.size.should == 0
-        @feed.new_entries.size.should_not == 2
+        it "should put the complete feed into new_entries" do
+          @feed.update_from_feed(@updated_feed)
+          @feed.new_entries.should include(@entry_changed_url)
+          @feed.new_entries.should include(@old_entry)
+          @feed.new_entries.size.should == 2
+          @feed.new_entries.size.should_not == 0
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedzirra
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Paul Dix
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sax-machine