feedjira 3.2.5 → 4.0.0

data/spec/feedjira/parser/rss_entry_spec.rb

@@ -42,7 +42,7 @@ describe Feedjira::Parser::RSSEntry do
   end
 
   it "parses the published date" do
-    published = Time.parse_safely "Thu Dec 04 17:17:49 UTC 2008"
+    published = Feedjira::Util::ParseTime.call "Thu Dec 04 17:17:49 UTC 2008"
     expect(@entry.published).to eq published
   end
 
@@ -122,4 +122,40 @@ describe Feedjira::Parser::RSSEntry do
     feed = Feedjira.parse(sample_rss_feed_with_comments)
     expect(feed.entries[0].comments).to eq "https://news.ycombinator.com/item?id=30937433"
   end
+
+  it "returns nil when no URL is available from link or guid" do
+    xml = <<~XML
+      <rss version="2.0">
+        <channel>
+          <item>
+            <title>Entry without URL</title>
+            <description>This entry has no link or guid</description>
+          </item>
+        </channel>
+      </rss>
+    XML
+
+    feed = Feedjira.parse(xml)
+    entry = feed.entries.first
+
+    expect(entry.url).to be_nil
+  end
+
+  it "returns nil when guid exists but is not a permalink" do
+    xml = <<~XML
+      <rss version="2.0">
+        <channel>
+          <item>
+            <title>Entry with non-permalink GUID</title>
+            <guid isPermaLink="false">some-guid-123</guid>
+          </item>
+        </channel>
+      </rss>
+    XML
+
+    feed = Feedjira.parse(xml)
+    entry = feed.entries.first
+
+    expect(entry.url).to be_nil
+  end
 end

data/spec/feedjira/parser/rss_feed_burner_entry_spec.rb

@@ -43,7 +43,7 @@ describe Feedjira::Parser::RSSFeedBurnerEntry do
   end
 
   it "parses the published date" do
-    published = Time.parse_safely "Wed Nov 02 17:25:27 UTC 2011"
+    published = Feedjira::Util::ParseTime.call "Wed Nov 02 17:25:27 UTC 2011"
     expect(@entry.published).to eq published
   end
 

data/spec/feedjira/{core_ext/time_spec.rb → util/parse_time_spec.rb}

@@ -2,44 +2,44 @@
 
 require "spec_helper"
 
-RSpec.describe Time do
-  describe "#parse_safely" do
+RSpec.describe Feedjira::Util::ParseTime do
+  describe ".call" do
     it "returns the datetime in utc when given a Time" do
-      time = described_class.now
+      time = Time.now
 
-      expect(described_class.parse_safely(time)).to eq(time.utc)
+      expect(described_class.call(time)).to eq(time.utc)
     end
 
     it "returns the datetime in utc when given a Date" do
       date = Date.today
 
-      expect(described_class.parse_safely(date)).to eq(date.to_time.utc)
+      expect(described_class.call(date)).to eq(date.to_time.utc)
     end
 
     it "returns the datetime in utc when given a String" do
       timestamp = "2016-01-01 00:00:00"
 
-      expect(described_class.parse_safely(timestamp)).to eq(described_class.parse(timestamp).utc)
+      expect(described_class.call(timestamp)).to eq(Time.parse(timestamp).utc)
     end
 
     it "returns nil when given an empty String" do
       timestamp = ""
 
-      expect(described_class.parse_safely(timestamp)).to be_nil
+      expect(described_class.call(timestamp)).to be_nil
     end
 
     it "returns the the datetime in utc given a 14-digit time" do
-      time = described_class.now.utc
+      time = Time.now.utc
       timestamp = time.strftime("%Y%m%d%H%M%S")
 
-      expect(described_class.parse_safely(timestamp)).to eq(time.floor)
+      expect(described_class.call(timestamp)).to eq(time.floor)
     end
 
     context "when given an invalid time string" do
       it "returns nil" do
         timestamp = "2016-51-51 00:00:00"
 
-        expect(described_class.parse_safely(timestamp)).to be_nil
+        expect(described_class.call(timestamp)).to be_nil
       end
 
       it "logs an error" do
@@ -50,7 +50,7 @@ RSpec.describe Time do
         expect(Feedjira.logger)
           .to receive(:debug).with(an_instance_of(ArgumentError))
 
-        described_class.parse_safely(timestamp)
+        described_class.call(timestamp)
       end
     end
   end

data/spec/feedjira_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Feedjira do
         feed = described_class.parse(sample_rss_feed, parser: parser)
 
         expect(feed.title).to eq "Tender Lovemaking"
-        published = Time.parse_safely "Thu Dec 04 17:17:49 UTC 2008"
+        published = Feedjira::Util::ParseTime.call "Thu Dec 04 17:17:49 UTC 2008"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 10
       end
@@ -20,7 +20,7 @@ RSpec.describe Feedjira do
       it "parses an rdf feed" do
         feed = described_class.parse(sample_rdf_feed)
         expect(feed.title).to eq "HREF Considered Harmful"
-        published = Time.parse_safely("Tue Sep 02 19:50:07 UTC 2008")
+        published = Feedjira::Util::ParseTime.call("Tue Sep 02 19:50:07 UTC 2008")
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 10
       end
@@ -28,7 +28,7 @@ RSpec.describe Feedjira do
       it "parses an rss feed" do
         feed = described_class.parse(sample_rss_feed)
         expect(feed.title).to eq "Tender Lovemaking"
-        published = Time.parse_safely "Thu Dec 04 17:17:49 UTC 2008"
+        published = Feedjira::Util::ParseTime.call "Thu Dec 04 17:17:49 UTC 2008"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 10
       end
@@ -36,7 +36,7 @@ RSpec.describe Feedjira do
       it "parses an atom feed" do
         feed = described_class.parse(sample_atom_feed)
         expect(feed.title).to eq "Amazon Web Services Blog"
-        published = Time.parse_safely "Fri Jan 16 18:21:00 UTC 2009"
+        published = Feedjira::Util::ParseTime.call "Fri Jan 16 18:21:00 UTC 2009"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 10
       end
@@ -44,7 +44,7 @@ RSpec.describe Feedjira do
       it "parses an feedburner atom feed" do
         feed = described_class.parse(sample_feedburner_atom_feed)
         expect(feed.title).to eq "Paul Dix Explains Nothing"
-        published = Time.parse_safely "Thu Jan 22 15:50:22 UTC 2009"
+        published = Feedjira::Util::ParseTime.call "Thu Jan 22 15:50:22 UTC 2009"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 5
       end
@@ -52,7 +52,7 @@ RSpec.describe Feedjira do
       it "parses an itunes feed" do
         feed = described_class.parse(sample_itunes_feed)
         expect(feed.title).to eq "All About Everything"
-        published = Time.parse_safely "Wed, 15 Jun 2005 19:00:00 GMT"
+        published = Feedjira::Util::ParseTime.call "Wed, 15 Jun 2005 19:00:00 GMT"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 3
       end
@@ -60,7 +60,7 @@ RSpec.describe Feedjira do
       it "parses an itunes feedburner feed" do
         feed = described_class.parse(sample_itunes_feedburner_feed)
         expect(feed.title).to eq "Welcome to Night Vale"
-        published = Time.parse_safely "2023-09-22 16:30:15 UTC"
+        published = Feedjira::Util::ParseTime.call "2023-09-22 16:30:15 UTC"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 3
         url = "https://www.podtrac.com/pts/redirect.mp3/dovetail.prxu.org/_/126/e3dafc45-a202-42d0-a55b-216e733a2d7a/2023_09_17_BTS_Episode_EXCERPT_v2.mp3"
@@ -80,7 +80,7 @@ RSpec.describe Feedjira do
 
         feed = described_class.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"
+        published = Feedjira::Util::ParseTime.call "Mon, 16 Oct 2017 15:10:00 GMT"
         expect(feed.entries.first.published).to eq published
         expect(feed.entries.size).to eq 2
       end
@@ -97,7 +97,7 @@ RSpec.describe Feedjira do
     it "parses an feedburner rss feed" do
       feed = described_class.parse(sample_rss_feed_burner_feed)
       expect(feed.title).to eq "TechCrunch"
-      published = Time.parse_safely "Wed Nov 02 17:25:27 UTC 2011"
+      published = Feedjira::Util::ParseTime.call "Wed Nov 02 17:25:27 UTC 2011"
       expect(feed.entries.first.published).to eq published
       expect(feed.entries.size).to eq 20
     end
@@ -106,7 +106,7 @@ RSpec.describe Feedjira do
       feed = described_class.parse(sample_rss_feed_with_a10_namespace)
       expect(feed.url).to eq "http://www.example.com/"
       expect(feed.entries.first.url).to eq "http://www.example.com/5"
-      expect(feed.entries.first.updated).to eq Time.parse_safely("2020-05-14T10:00:18Z")
+      expect(feed.entries.first.updated).to eq Feedjira::Util::ParseTime.call("2020-05-14T10:00:18Z")
       expect(feed.entries.first.author).to eq "John Doe"
       expect(feed.entries.size).to eq 5
     end

data/spec/support/coverage.rb

@@ -7,4 +7,4 @@ SimpleCov.start do
   add_filter "_spec.rb"
 end
 
-SimpleCov.minimum_coverage(line: 98, branch: 75)
+SimpleCov.minimum_coverage(line: 100, branch: 100)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Adam Hess
@@ -13,8 +13,28 @@ authors:
 - Paul Dix
 bindir: bin
 cert_chain: []
-date: 2025-04-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +81,7 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/feed-parsing.md"
 - ".github/ISSUE_TEMPLATE/general-issue.md"
+- ".github/copilot-instructions.md"
 - ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -77,10 +98,6 @@ files:
 - lib/feedjira.rb
 - lib/feedjira/atom_entry_utilities.rb
 - lib/feedjira/configuration.rb
-- lib/feedjira/core_ext.rb
-- lib/feedjira/core_ext/date.rb
-- lib/feedjira/core_ext/string.rb
-- lib/feedjira/core_ext/time.rb
 - lib/feedjira/feed.rb
 - lib/feedjira/feed_entry_utilities.rb
 - lib/feedjira/feed_utilities.rb
@@ -110,9 +127,11 @@ files:
 - lib/feedjira/parser/rss_image.rb
 - lib/feedjira/preprocessor.rb
 - lib/feedjira/rss_entry_utilities.rb
+- lib/feedjira/util.rb
+- lib/feedjira/util/parse_time.rb
 - lib/feedjira/version.rb
+- spec/feedjira/atom_entry_utilities_spec.rb
 - spec/feedjira/configuration_spec.rb
-- spec/feedjira/core_ext/time_spec.rb
 - spec/feedjira/feed_spec.rb
 - spec/feedjira/feed_utilities_entry_spec.rb
 - spec/feedjira/feed_utilities_spec.rb
@@ -126,6 +145,7 @@ files:
 - 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/i_tunes_rss_category_spec.rb
 - spec/feedjira/parser/i_tunes_rss_item_spec.rb
 - spec/feedjira/parser/i_tunes_rss_owner_spec.rb
 - spec/feedjira/parser/itunes_rss_spec.rb
@@ -137,6 +157,7 @@ files:
 - spec/feedjira/parser/rss_feed_burner_spec.rb
 - spec/feedjira/parser/rss_spec.rb
 - spec/feedjira/preprocessor_spec.rb
+- spec/feedjira/util/parse_time_spec.rb
 - spec/feedjira_spec.rb
 - spec/sample_feeds.rb
 - spec/sample_feeds/AmazonWebServicesBlog.xml
@@ -198,14 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A feed parsing library
 test_files: []

data/lib/feedjira/core_ext/date.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-# Date code pulled and adapted from:
-# Ruby Cookbook by Lucas Carlson and Leonard Richardson
-# Published by O'Reilly
-# ISBN: 0-596-52369-6
-class Date
-  def feed_utils_to_gm_time
-    feed_utils_to_time(new_offset, :gm)
-  end
-
-  private
-
-  def feed_utils_to_time(dest, method)
-    # Convert a fraction of a day to a number of microseconds
-    usec = (dest.sec_fraction * (10**6)).to_i
-    Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min, dest.sec, usec)
-  end
-end

data/lib/feedjira/core_ext/string.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class String
-  def sanitize!
-    replace(sanitize)
-  end
-
-  def sanitize
-    Loofah.scrub_fragment(self, :prune).to_s
-  end
-end

data/lib/feedjira/core_ext/time.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "time"
-require "date"
-
-class Time
-  # Parse a time string and convert it to UTC without raising errors.
-  # Parses a flattened 14-digit time (YYYYmmddHHMMMSS) as UTC.
-  #
-  # === Parameters
-  # [dt<String or Time>] Time definition to be parsed.
-  #
-  # === Returns
-  # A Time instance in UTC or nil if there were errors while parsing.
-  def self.parse_safely(datetime)
-    if datetime.is_a?(Time)
-      datetime.utc
-    elsif datetime.respond_to?(:to_datetime)
-      datetime.to_time.utc
-    else
-      parse_string_safely datetime.to_s
-    end
-  rescue StandardError => e
-    Feedjira.logger.debug("Failed to parse time #{datetime}")
-    Feedjira.logger.debug(e)
-    nil
-  end
-
-  def self.parse_string_safely(string)
-    return nil if string.empty?
-
-    if /\A\d{14}\z/.match?(string)
-      parse("#{string}Z", true)
-    else
-      parse(string).utc
-    end
-  end
-end

data/lib/feedjira/core_ext.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "core_ext/time"
-require_relative "core_ext/date"
-require_relative "core_ext/string"