feedjira 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84112aa57b8bc969b03dd280d4ab4ce70d241bfc
-  data.tar.gz: 06ad42dd1c162c7505ece722e04a542522eb5e56
+SHA256:
+  metadata.gz: 573606467835d2066d0548ce3c3ddaf52cb2d9ed873e37f5b87f689cd3bbed20
+  data.tar.gz: ab95795c457c2d82636a7b92a16352b6cd97a2cae20658ac9c6d15b138e7225d
 SHA512:
-  metadata.gz: 9a241ef87f499b3210f27e8ee73b459585045d0b8593eb8455091987b0aeb75fc1e05d9bb015b2176bbdb699ff765936d7f436425ecd1fcdbb9677fec35c462d
-  data.tar.gz: da03f4b6c0fe93ff567d1d09b67b2e69fde711ce2c5468717ab694bfda457193a22a5349b48c4ccb0b3b335bb90d372ceef4a2945eb77fddf253a67adc0aaf9c
+  metadata.gz: 51fd592d656f870880f60fa610f19e041d74dd839e3b4096dbfbf164c4a2bf9a25d89fbb5d714cdaa8a1379683ddab438d6a8b9fc4b8ca464f1369075aa78342
+  data.tar.gz: c528819390fc917d18ff8eae6c126064e1097b3ddbc27b7e1f6357854e57fb3ecdc558c002700137096fc471975f8e99ec1b717cc5725955439d60f31123035f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Feedjira Changelog
 
+## 2.1.4
+
+* Bug fixes
+  * Prevent errors when a feed has multiple dates and some are unparseable
+
 ## 2.1.3
 
 * Enhancements

data/lib/feedjira/feed_entry_utilities.rb

@@ -28,14 +28,14 @@ module Feedjira
     # Writer for published. By default, we keep the "oldest" publish time found.
     def published=(val)
       parsed = parse_datetime(val)
-      @published = parsed if !@published || parsed < @published
+      @published = parsed if parsed && (!@published || parsed < @published)
     end
 
     ##
     # Writer 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
+      @updated = parsed if parsed && (!@updated || parsed > @updated)
     end
 
     def sanitize!

data/lib/feedjira/version.rb

@@ -1,3 +1,3 @@
 module Feedjira
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

data/spec/feedjira/feed_spec.rb

@@ -144,6 +144,16 @@ describe Feedjira::Feed do
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 3
       end
+
+      it 'does not fail if multiple published dates exist and some are unparseable' do
+        expect(Feedjira.logger).to receive(:warn).once
+
+        feed = Feedjira::Feed.parse(sample_invalid_date_format_feed)
+        expect(feed.title).to eq 'Invalid date format feed'
+        published = Time.parse_safely 'Mon, 16 Oct 2017 15:10:00 GMT'
+        expect(feed.entries.first.published).to eq published
+        expect(feed.entries.size).to eq 2
+      end
     end
 
     context "when there's no available parser" do

data/spec/sample_feeds.rb

@@ -26,7 +26,8 @@ module SampleFeeds
     sample_feed_burner_atom_xhtml_feed: 'FeedBurnerXHTML.xml',
     sample_duplicate_content_atom_feed: 'DuplicateContentAtomFeed.xml',
     sample_youtube_atom_feed: 'youtube_atom.xml',
-    sample_atom_xhtml_with_escpaed_html_in_pre_tag_feed: 'AtomEscapedHTMLInPreTag.xml'
+    sample_atom_xhtml_with_escpaed_html_in_pre_tag_feed: 'AtomEscapedHTMLInPreTag.xml',
+    sample_invalid_date_format_feed: 'InvalidDateFormat.xml'
   }.freeze
 
   FEEDS.each do |method, filename|

data/spec/sample_feeds/InvalidDateFormat.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
+  xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+<channel>
+  <title>Invalid date format feed</title>
+  <link>http://example.com/feed</link>
+  <language>en-US</language>
+  <item>
+    <title>Item 0 with an invalid date</title>
+    <link>http://example.com/item0</link>
+    <pubDate>Mon, 16 Oct 2017 15:10:00 +0000</pubDate>
+    <dc:date>1518478934</dc:date>
+  </item>
+  <item>
+    <title>Item 1 with all valid dates</title>
+    <link>http://example.com/item1</link>
+    <pubDate>Tue, 17 Oct 2017 12:17:00 +0000</pubDate>
+    <dc:date>Tue, 17 Oct 2017 22:17:00 +0000</dc:date>
+  </item>
+</channel>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Paul Dix
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -245,6 +245,7 @@ files:
 - spec/sample_feeds/HREFConsideredHarmfulFirstEntry.xml
 - spec/sample_feeds/ITunesWithSingleQuotedAttributes.xml
 - spec/sample_feeds/ITunesWithSpacesInAttributes.xml
+- spec/sample_feeds/InvalidDateFormat.xml
 - spec/sample_feeds/PaulDixExplainsNothing.xml
 - spec/sample_feeds/PaulDixExplainsNothingAlternate.xml
 - spec/sample_feeds/PaulDixExplainsNothingFirstEntryContent.xml
@@ -282,63 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A feed fetching and parsing library
-test_files:
-- spec/feedjira/configuration_spec.rb
-- spec/feedjira/date_time_utilities_spec.rb
-- spec/feedjira/feed_entry_utilities_spec.rb
-- spec/feedjira/feed_spec.rb
-- spec/feedjira/feed_utilities_spec.rb
-- spec/feedjira/parser/atom_entry_spec.rb
-- spec/feedjira/parser/atom_feed_burner_entry_spec.rb
-- spec/feedjira/parser/atom_feed_burner_spec.rb
-- spec/feedjira/parser/atom_spec.rb
-- spec/feedjira/parser/atom_youtube_entry_spec.rb
-- spec/feedjira/parser/atom_youtube_spec.rb
-- spec/feedjira/parser/google_docs_atom_entry_spec.rb
-- spec/feedjira/parser/google_docs_atom_spec.rb
-- spec/feedjira/parser/itunes_rss_item_spec.rb
-- spec/feedjira/parser/itunes_rss_owner_spec.rb
-- spec/feedjira/parser/itunes_rss_spec.rb
-- spec/feedjira/parser/podlove_chapter_spec.rb
-- spec/feedjira/parser/rss_entry_spec.rb
-- spec/feedjira/parser/rss_feed_burner_entry_spec.rb
-- spec/feedjira/parser/rss_feed_burner_spec.rb
-- spec/feedjira/parser/rss_spec.rb
-- spec/feedjira/preprocessor_spec.rb
-- spec/sample_feeds.rb
-- spec/sample_feeds/AmazonWebServicesBlog.xml
-- spec/sample_feeds/AmazonWebServicesBlogFirstEntryContent.xml
-- spec/sample_feeds/AtomEscapedHTMLInPreTag.xml
-- spec/sample_feeds/AtomFeedWithSpacesAroundEquals.xml
-- spec/sample_feeds/CRE.xml
-- spec/sample_feeds/DuplicateContentAtomFeed.xml
-- spec/sample_feeds/FeedBurnerUrlNoAlternate.xml
-- spec/sample_feeds/FeedBurnerXHTML.xml
-- spec/sample_feeds/FeedjiraBlog.xml
-- spec/sample_feeds/GiantRobotsSmashingIntoOtherGiantRobots.xml
-- spec/sample_feeds/GoogleDocsList.xml
-- spec/sample_feeds/HREFConsideredHarmful.xml
-- spec/sample_feeds/HREFConsideredHarmfulFirstEntry.xml
-- spec/sample_feeds/ITunesWithSingleQuotedAttributes.xml
-- spec/sample_feeds/ITunesWithSpacesInAttributes.xml
-- spec/sample_feeds/PaulDixExplainsNothing.xml
-- spec/sample_feeds/PaulDixExplainsNothingAlternate.xml
-- spec/sample_feeds/PaulDixExplainsNothingFirstEntryContent.xml
-- spec/sample_feeds/PaulDixExplainsNothingWFW.xml
-- spec/sample_feeds/SamRuby.xml
-- spec/sample_feeds/TechCrunch.xml
-- spec/sample_feeds/TechCrunchFirstEntry.xml
-- spec/sample_feeds/TechCrunchFirstEntryDescription.xml
-- spec/sample_feeds/TenderLovemaking.xml
-- spec/sample_feeds/TenderLovemakingFirstEntry.xml
-- spec/sample_feeds/TrotterCashionHome.xml
-- spec/sample_feeds/TypePadNews.xml
-- spec/sample_feeds/atom_with_link_tag_for_url_unmarked.xml
-- spec/sample_feeds/itunes.xml
-- spec/sample_feeds/pet_atom.xml
-- spec/sample_feeds/youtube_atom.xml
-- spec/spec_helper.rb
+test_files: []