feedjira 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5169a51338551c1253b148e944e9b63cff818f85ba5eeafd2c3239ea007b5012
-  data.tar.gz: c9966b308d0f57873c56b474cdbdc7a1a96ee6dd64d5a0ca56f30c333ada9298
+  metadata.gz: 12ef7af9ab5efeab944facbebb844c347458d7cc422927f0971f74606a0a57a3
+  data.tar.gz: 1d3c99b6799f173aaeea41b8e91f1e28c68cebfe59af92da0c32320c90d8ff20
 SHA512:
-  metadata.gz: ad3fc7290af22ec75dbba64b2397ad3e8e6f283f73c3c793eaf9b33d28410dcaa6439618c47d741858a732df7478cbcb21f987314880ef5acd108224cc6fa7a2
-  data.tar.gz: 20422cf9fdf53491356726c29b118ce6e1b3b37c0ef7294f1c01bcaf00df72097ae6afd1a88191ca765217fe7a159996247de4837a14a1716d33ad8024f7f784
+  metadata.gz: 5c8527d5cfdc791d27cc970223575cdd4a75831d1665f63b7f650b733f4c9f7dadbd071ea3403c97a107d8cfbb930abc631a9428acadd3316f22e46802b7f2a2
+  data.tar.gz: b2710b27a649c0544e7f4f71a05117e96bc63c4fff9c3be0a7273ea4a173063b963e59dae9ed1c59aace5ca6319cb56f7012e994c9cecd8b2158f8931299bfbe

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    assignees:
+      - "mockdeep"
+    groups:
+      all:
+        patterns:
+          - "*"

data/.github/workflows/ruby.yml

@@ -3,7 +3,7 @@ name: Ruby
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        ruby: [2.7, 3.0, 3.1]
+        ruby: [2.7, 3.0, 3.1, 3.2, 3.3]
         handler: [nokogiri, ox, oga]
         exclude:
           - { ruby: jruby, handler: ox }

data/.gitignore

@@ -7,3 +7,4 @@ doc/
 .yardoc/
 pkg/
 rdoc/
+coverage/

data/.rubocop.yml

@@ -29,9 +29,6 @@ Layout/LineLength:
   Exclude:
     - 'spec/**/*.rb'
 
-Style/AsciiComments:
-  Enabled: false
-
 Style/IfUnlessModifier:
   Enabled: false
 
@@ -59,8 +56,5 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/BeforeAfterAll:
   Enabled: false
 
-RSpec/VerifiedDoubles:
-  Enabled: false
-
 RSpec/RepeatedExample:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,11 +1,35 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-09-02 20:02:06 UTC using RuboCop version 0.90.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 400`
+# on 2023-12-16 21:24:13 UTC using RuboCop version 1.59.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 20
+# Offense count: 16
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/feedjira/atom_entry_utilities.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'
+    - 'lib/feedjira/parser.rb'
+    - 'lib/feedjira/parser/atom_youtube_entry.rb'
+    - 'lib/feedjira/parser/globally_unique_identifier.rb'
+    - 'lib/feedjira/parser/google_docs_atom.rb'
+    - 'lib/feedjira/parser/google_docs_atom_entry.rb'
+    - 'lib/feedjira/parser/itunes_rss_owner.rb'
+    - 'lib/feedjira/parser/podlove_chapter.rb'
+    - 'lib/feedjira/preprocessor.rb'
+    - 'lib/feedjira/rss_entry_utilities.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperWithArgsParentheses:
+  Exclude:
+    - 'lib/feedjira/feed_utilities.rb'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Feedjira Changelog
 
+## 3.2.3
+
+* Switch date parse error to debug (#492)
+
 ## 3.2.2
 
 * Fix time handling again usec is not a timezone

data/Gemfile

@@ -4,8 +4,18 @@ source "https://rubygems.org/"
 
 gemspec
 
+gem "faraday", "~> 2.8.1"
+gem "pry", "~> 0.14.2"
+gem "rspec", "~> 3.13.0"
+gem "rubocop", "~> 1.60.1"
+gem "rubocop-performance", "~> 1.20.0"
+gem "rubocop-rake", "~> 0.6.0"
+gem "rubocop-rspec", "~> 2.26.1"
+gem "simplecov", "~> 0.22.0"
+gem "yard", "~> 0.9.34"
+
 group :test do
-  gem "oga"
-  gem "ox", platforms: %i[mri rbx]
-  gem "rake"
+  gem "oga", "~> 3.4"
+  gem "ox", "~> 2.14.17", platforms: %i[mri rbx]
+  gem "rake", "~> 13.1.0"
 end

data/README.md

@@ -1,9 +1,9 @@
 # Feedjira
 
-[![Build Status][travis-badge]][travis] [![Code Climate][code-climate-badge]][code-climate]
+[![Build Status][actions-badge]][actions] [![Code Climate][code-climate-badge]][code-climate]
 
-[travis-badge]: https://travis-ci.org/feedjira/feedjira.svg?branch=master
-[travis]: http://travis-ci.org/feedjira/feedjira
+[actions-badge]: https://github.com/feedjira/feedjira/actions/workflows/ruby.yml/badge.svg?branch=main
+[actions]: https://github.com/feedjira/feedjira/actions?query=branch%3Amain
 [code-climate-badge]: https://codeclimate.com/github/feedjira/feedjira/badges/gpa.svg
 [code-climate]: https://codeclimate.com/github/feedjira/feedjira
 [gitter-badge]: https://badges.gitter.im/feedjira/feedjira.svg

data/feedjira.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "homepage_uri" => "https://github.com/feedjira/feedjira",
     "source_code_uri" => "https://github.com/feedjira/feedjira",
-    "changelog_uri" => "https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md",
+    "changelog_uri" => "https://github.com/feedjira/feedjira/blob/main/CHANGELOG.md",
     "rubygems_mfa_required" => "true"
   }
 
@@ -31,15 +31,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">=2.7"
 
-  s.add_dependency "loofah",             ">= 2.3.1"
-  s.add_dependency "sax-machine",        ">= 1.0"
-
-  s.add_development_dependency "faraday"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rubocop"
-  s.add_development_dependency "rubocop-performance"
-  s.add_development_dependency "rubocop-rake"
-  s.add_development_dependency "rubocop-rspec"
-  s.add_development_dependency "yard"
+  s.add_runtime_dependency "loofah", ">= 2.3.1", "< 3"
+  s.add_runtime_dependency "sax-machine", ">= 1.0", "< 2"
 end

data/lib/feedjira/configuration.rb

@@ -59,13 +59,13 @@ module Feedjira
     # @private
     def default_parsers
       [
+        Feedjira::Parser::ITunesRSS,
         Feedjira::Parser::RSSFeedBurner,
         Feedjira::Parser::GoogleDocsAtom,
         Feedjira::Parser::AtomYoutube,
         Feedjira::Parser::AtomFeedBurner,
         Feedjira::Parser::AtomGoogleAlerts,
         Feedjira::Parser::Atom,
-        Feedjira::Parser::ITunesRSS,
         Feedjira::Parser::RSS,
         Feedjira::Parser::JSONFeed
       ]

data/lib/feedjira/core_ext/date.rb

@@ -9,10 +9,6 @@ class Date
     feed_utils_to_time(new_offset, :gm)
   end
 
-  def feed_utils_to_local_time
-    feed_utils_to_time(new_offset(DateTime.now.offset - offset), :local)
-  end
-
   private
 
   def feed_utils_to_time(dest, method)

data/lib/feedjira/core_ext/time.rb

@@ -16,12 +16,12 @@ class Time
     if datetime.is_a?(Time)
       datetime.utc
     elsif datetime.respond_to?(:to_datetime)
-      datetime.to_datetime.utc
-    elsif datetime.respond_to? :to_s
+      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("Failed to parse time #{datetime}")
     Feedjira.logger.debug(e)
     nil
   end

data/lib/feedjira/feed_entry_utilities.rb

@@ -3,7 +3,6 @@
 module Feedjira
   module FeedEntryUtilities
     include Enumerable
-    include DateTimeUtilities
 
     def published
       @published ||= @updated
@@ -12,8 +11,8 @@ module Feedjira
     def parse_datetime(string)
       DateTime.parse(string).feed_utils_to_gm_time
     rescue StandardError => e
-      Feedjira.logger.warn { "Failed to parse date #{string.inspect}" }
-      Feedjira.logger.warn(e)
+      Feedjira.logger.debug("Failed to parse date #{string.inspect}")
+      Feedjira.logger.debug(e)
       nil
     end
 
@@ -64,11 +63,11 @@ module Feedjira
     end
 
     def [](field)
-      instance_variable_get("@#{field}")
+      instance_variable_get(:"@#{field}")
     end
 
     def []=(field, value)
-      instance_variable_set("@#{field}", value)
+      instance_variable_set(:"@#{field}", value)
     end
   end
 end

data/lib/feedjira/feed_utilities.rb

@@ -41,11 +41,7 @@ module Feedjira
     end
 
     def last_modified
-      @last_modified ||= begin
-        published = entries.reject { |e| e.published.nil? }
-        entry = published.max_by(&:published)
-        entry ? entry.published : nil
-      end
+      @last_modified ||= entries.reject { |e| e.published.nil? }.max_by(&:published)&.published
     end
 
     def updated?
@@ -78,7 +74,7 @@ module Feedjira
       if old_value == new_value
         false
       else
-        send("#{name}=", new_value)
+        send(:"#{name}=", new_value)
         true
       end
     end
@@ -95,7 +91,7 @@ module Feedjira
     # entries just parsed and insert each one as a new entry until we get to
     # one that has the same id as the the newest for the feed.
     def find_new_entries_for(feed)
-      return feed.entries if entries.length.zero?
+      return feed.entries if entries.empty?
 
       latest_entry = entries.first
       found_new_entries = []

data/lib/feedjira/parser/json_feed.rb

@@ -15,8 +15,8 @@ module Feedjira
         new(JSON.parse(json))
       end
 
-      attr_reader :json, :version, :title, :url, :feed_url, :description,
-                  :expired, :entries
+      attr_reader :json, :version, :title, :description, :url, :feed_url, :icon, :favicon,
+                  :language, :expired, :entries
 
       def initialize(json)
         @json = json
@@ -24,7 +24,10 @@ module Feedjira
         @title = json.fetch("title")
         @url = json.fetch("home_page_url", nil)
         @feed_url = json.fetch("feed_url", nil)
+        @icon = json.fetch("icon", nil)
+        @favicon = json.fetch("favicon", nil)
         @description = json.fetch("description", nil)
+        @language = json.fetch("language", nil)
         @expired = json.fetch("expired", nil)
         @entries = parse_items(json["items"])
       end

data/lib/feedjira/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Feedjira
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

data/lib/feedjira.rb

@@ -8,10 +8,6 @@ require "json"
 
 require "feedjira/core_ext"
 require "feedjira/configuration"
-require "feedjira/date_time_utilities/date_time_epoch_parser"
-require "feedjira/date_time_utilities/date_time_language_parser"
-require "feedjira/date_time_utilities/date_time_pattern_parser"
-require "feedjira/date_time_utilities"
 require "feedjira/feed_entry_utilities"
 require "feedjira/feed_utilities"
 require "feedjira/feed"

data/spec/feedjira/core_ext/time_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Time do
+  describe "#parse_safely" do
+    it "returns the datetime in utc when given a Time" do
+      time = described_class.now
+
+      expect(described_class.parse_safely(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)
+    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)
+    end
+
+    it "returns nil when given an empty String" do
+      timestamp = ""
+
+      expect(described_class.parse_safely(timestamp)).to be_nil
+    end
+
+    it "returns the the datetime in utc given a 14-digit time" do
+      time = described_class.now.utc
+      timestamp = time.strftime("%Y%m%d%H%M%S")
+
+      expect(described_class.parse_safely(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
+      end
+
+      it "logs an error" do
+        timestamp = "2016-51-51 00:00:00"
+
+        expect(Feedjira.logger)
+          .to receive(:debug).with("Failed to parse time #{timestamp}")
+        expect(Feedjira.logger)
+          .to receive(:debug).with(an_instance_of(ArgumentError))
+
+        described_class.parse_safely(timestamp)
+      end
+    end
+  end
+end

data/spec/feedjira/feed_spec.rb

@@ -2,17 +2,8 @@
 
 require "spec_helper"
 
-class Hell < StandardError; end
-
-class FailParser
-  def self.parse(_xml)
-    yield "this parser always fails."
-    # on_failure.call
-  end
-end
-
 describe Feedjira::Feed do
-  describe "#add_common_feed_element" do
+  describe ".add_common_feed_element" do
     before(:all) do
       described_class.add_common_feed_element("generator")
     end
@@ -30,7 +21,25 @@ describe Feedjira::Feed do
     end
   end
 
-  describe "#add_common_feed_entry_element" do
+  describe ".add_common_feed_elements" do
+    before do
+      described_class.add_common_feed_elements(:foos)
+    end
+
+    it "parses the added element out of Atom feeds" do
+      expect(Feedjira.parse(sample_wfw_feed).foos).to eq []
+    end
+
+    it "parses the added element out of Atom Feedburner feeds" do
+      expect(Feedjira::Parser::Atom.new).to respond_to(:foos)
+    end
+
+    it "parses the added element out of RSS feeds" do
+      expect(Feedjira::Parser::RSS.new).to respond_to(:foos)
+    end
+  end
+
+  describe ".add_common_feed_entry_element" do
     before(:all) do
       tag = "wfw:commentRss"
       described_class.add_common_feed_entry_element tag, as: :comment_rss
@@ -49,4 +58,23 @@ describe Feedjira::Feed do
       expect(Feedjira::Parser::RSSEntry.new).to respond_to(:comment_rss)
     end
   end
+
+  describe ".add_common_feed_entry_elements" do
+    before do
+      described_class.add_common_feed_entry_elements(:things)
+    end
+
+    it "parses the added element out of Atom feeds entries" do
+      entry = Feedjira.parse(sample_wfw_feed).entries.first
+      expect(entry.things).to eq []
+    end
+
+    it "parses the added element out of Atom Feedburner feeds entries" do
+      expect(Feedjira::Parser::AtomEntry.new).to respond_to(:things)
+    end
+
+    it "parses the added element out of RSS feeds entries" do
+      expect(Feedjira::Parser::RSSEntry.new).to respond_to(:things)
+    end
+  end
 end

data/spec/feedjira/feed_utilities_spec.rb

@@ -116,6 +116,7 @@ describe Feedjira::FeedUtilities do
       it "updates the title if changed" do
         @updated_feed.title = "new title"
         @feed.update_from_feed(@updated_feed)
+
         expect(@feed.title).to eq @updated_feed.title
         expect(@feed).to be_updated
       end
@@ -252,11 +253,12 @@ describe Feedjira::FeedUtilities do
       let(:url_one) { "http://example.com/post_one.html" }
       let(:url_two) { "http://example.com/post_two.html" }
 
-      let(:entry_one) { double "Entry One", entry_id: id_one, url: url_one }
-      let(:entry_two) { double "Entry Two", entry_id: id_two, url: url_two }
+      let(:entry_one) { object_double(Feedjira::Parser::AtomEntry.new, entry_id: id_one, url: url_one) }
+
+      let(:entry_two) { object_double(Feedjira::Parser::AtomEntry.new, entry_id: id_two, url: url_two) }
 
       let(:feed_one) { Feedjira::Parser::Atom.new }
-      let(:feed_two) { double "Feed Two", entries: [entry_two] }
+      let(:feed_two) { object_double(Feedjira::Parser::Atom.new, entries: [entry_two]) }
 
       before do
         stub_const("Feedjira::FeedUtilities::UPDATABLE_ATTRIBUTES", [])

data/spec/feedjira/parser/json_feed_spec.rb

@@ -43,6 +43,18 @@ module Feedjira
         expect(@feed.description).to eq "Brent Simmons’s weblog."
       end
 
+      it "parses the favicon" do
+        expect(@feed.favicon).to eq "http://inessential.com/favicon.ico"
+      end
+
+      it "parses the icon" do
+        expect(@feed.icon).to eq "http://inessential.com/icon.png"
+      end
+
+      it "parses the language" do
+        expect(@feed.language).to eq "en-US"
+      end
+
       it "parses expired and return default (nil)" do
         expect(@feed.expired).to be_nil
       end

data/spec/feedjira_spec.rb

@@ -57,6 +57,16 @@ RSpec.describe Feedjira do
         expect(feed.entries.size).to eq 3
       end
 
+      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"
+        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"
+        expect(feed.entries.first.enclosure_url).to eq url
+      end
+
       it "with nested dc:identifier it does not overwrite entry_id" do
         feed = described_class.parse(sample_rss_feed_huffpost_ca)
         expect(feed.title.strip).to eq "HuffPost Canada - Athena2 - All Posts"
@@ -66,7 +76,7 @@ RSpec.describe Feedjira do
       end
 
       it "does not fail if multiple published dates exist and some are unparseable" do
-        expect(described_class.logger).to receive(:warn).twice
+        expect(described_class.logger).to receive(:debug).twice
 
         feed = described_class.parse(sample_invalid_date_format_feed)
         expect(feed.title).to eq "Invalid date format feed"

data/spec/sample_feeds/itunes_feedburner.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:media="http://search.yahoo.com/mrss/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:podcast="https://podcastindex.org/namespace/1.0" version="2.0">
+  <channel>
+    <title>Welcome to Night Vale</title>
+    <link>http://welcometonightvale.com</link>
+    <pubDate>Fri, 22 Sep 2023 16:30:15 -0000</pubDate>
+    <lastBuildDate>Fri, 29 Sep 2023 15:05:26 -0000</lastBuildDate>
+    <ttl>60</ttl>
+    <language>en</language>
+    <copyright>2016, Night Vale Presents</copyright>
+    <webMaster>help@prx.org (PRX)</webMaster>
+    <description>
+      <![CDATA[<p>Twice-monthly community updates for the small desert town of Night Vale...</p>]]>
+    </description>
+    <managingEditor>info@welcometonightvale.com (info@welcometonightvale.com)</managingEditor>
+    <generator>PRX Feeder v1.0.0</generator>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <image>
+      <url>https://f.prxu.org/126/images/bc7d203a-c0dd-46ec-956b-03bad13ba85e/nightvalelogo-web4.jpg</url>
+      <title>Welcome to Night Vale</title>
+      <link>http://welcometonightvale.com</link>
+      <width>1400</width>
+      <height>1400</height>
+      <description>Twice-monthly community updates for the small desert town of Night Vale, where every conspiracy theory is true.</description>
+    </image>
+    <atom:link href="https://feeds.feedburner.com/welcometonightvalepodcast" rel="self" type="application/rss+xml"/>
+    <itunes:author>Night Vale Presents</itunes:author>
+    <itunes:type>episodic</itunes:type>
+    <itunes:category text="Fiction">
+      <itunes:category text="Science Fiction"/>
+    </itunes:category>
+    <itunes:image href="https://f.prxu.org/126/images/1f749c5d-c83a-4db9-8112-a3245da49c54/nightvalelogo-web4.jpg"/>
+    <itunes:explicit>false</itunes:explicit>
+    <itunes:owner>
+      <itunes:email>info@welcometonightvale.com</itunes:email>
+      <itunes:name>Welcome to Night Vale</itunes:name>
+    </itunes:owner>
+    <itunes:subtitle>Twice-monthly community updates for the small desert town of Night Vale, where every conspiracy theory is true.</itunes:subtitle>
+    <itunes:summary>
+      <![CDATA[Twice-monthly community updates for the small desert town of Night Vale...]]>
+    </itunes:summary>
+    <itunes:keywords>cecil,commonplace,cranor,fink,lovecraft,neofuturists,night,nightvale,nightvaleradio,radio,vale,welcome</itunes:keywords>
+    <media:copyright>2016, Night Vale Presents</media:copyright>
+    <media:thumbnail url="https://f.prxu.org/126/images/bc7d203a-c0dd-46ec-956b-03bad13ba85e/nightvalelogo-web4.jpg"/>
+    <media:keywords>cecil,commonplace,cranor,fink,lovecraft,neofuturists,night,nightvale,nightvaleradio,radio,vale,welcome</media:keywords>
+    <media:category scheme="http://www.itunes.com/dtds/podcast-1.0.dtd">Fiction</media:category>
+    <item>
+      <guid isPermaLink="false">prx_126_e3dafc45-a202-42d0-a55b-216e733a2d7a</guid>
+      <title>Patreon Preview: Behind the Scenes (September 2023)</title>
+      <pubDate>Fri, 22 Sep 2023 16:30:15 -0000</pubDate>
+      <link>https://play.prx.org/listen?ge=prx_126_e3dafc45-a202-42d0-a55b-216e733a2d7a&amp;uf=https%3A%2F%2Ffeeds.feedburner.com%2Fwelcometonightvalepodcast</link>
+      <description>
+        <![CDATA[<p>An excerpt from our most recent patreon Behind the Scenes episode...</p>]]>
+      </description>
+      <enclosure 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" type="audio/mpeg" length="7133938"/>
+      <itunes:subtitle>An excerpt from our most recent patreon Behind the Scenes episode</itunes:subtitle>
+      <itunes:episodeType>full</itunes:episodeType>
+      <itunes:duration>04:57</itunes:duration>
+      <category>
+        <![CDATA[adfree]]>
+      </category>
+      <itunes:author>Night Vale Presents</itunes:author>
+      <itunes:summary>
+        <![CDATA[An excerpt from our most recent patreon Behind the Scenes episode...]]>
+      </itunes:summary>
+      <itunes:image href="https://f.prxu.org/126/e3dafc45-a202-42d0-a55b-216e733a2d7a/images/6e990c53-0f6d-4806-8716-18cba0fedc8a/nightvalelogo_web4.jpg"/>
+      <media:content fileSize="7133938" type="audio/mpeg" 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"/>
+      <content:encoded>
+        <![CDATA[<p>An excerpt from our most recent patreon Behind the Scenes episode...]]>
+      </content:encoded>
+    </item>
+    <item>
+      <guid isPermaLink="false">prx_126_e650b67a-a572-4302-81f4-6223331fa429</guid>
+      <title>234 - The Boy</title>
+      <pubDate>Fri, 15 Sep 2023 04:00:00 -0000</pubDate>
+      <link>https://play.prx.org/listen?ge=prx_126_e650b67a-a572-4302-81f4-6223331fa429&amp;uf=https%3A%2F%2Ffeeds.feedburner.com%2Fwelcometonightvalepodcast</link>
+      <description>
+        <![CDATA[<p>This morning we found a boy. He has no name, and no one knows who he is...</p>]]>
+      </description>
+      <enclosure url="https://www.podtrac.com/pts/redirect.mp3/dovetail.prxu.org/_/126/e650b67a-a572-4302-81f4-6223331fa429/nv234_intro.mp3" type="audio/mpeg" length="33024824"/>
+      <itunes:subtitle>This morning we found a boy. He has no name, and no one knows who he is.</itunes:subtitle>
+      <itunes:episodeType>full</itunes:episodeType>
+      <itunes:duration>22:55</itunes:duration>
+      <itunes:author>Night Vale Presents</itunes:author>
+      <itunes:summary>
+        <![CDATA[This morning we found a boy. He has no name, and no one knows who he is...]]>
+      </itunes:summary>
+      <itunes:image href="https://f.prxu.org/126/e650b67a-a572-4302-81f4-6223331fa429/images/9b91ed0e-9e8c-4e4c-93f1-d4fbe8014ad0/episodes60.jpg"/>
+      <media:content fileSize="33024824" type="audio/mpeg" url="https://www.podtrac.com/pts/redirect.mp3/dovetail.prxu.org/_/126/e650b67a-a572-4302-81f4-6223331fa429/nv234_intro.mp3"/>
+      <content:encoded>
+        <![CDATA[<p>This morning we found a boy. He has no name, and no one knows who he is.</p>]]>
+      </content:encoded>
+    </item>
+    <item>
+      <guid isPermaLink="false">prx_126_ee85d62d-87cb-4abc-8f08-b66ccdd2c103</guid>
+      <title>233 - Citizen Spotlight: The Vampire of Lombardi Street</title>
+      <pubDate>Fri, 01 Sep 2023 04:00:00 -0000</pubDate>
+      <link>https://play.prx.org/listen?ge=prx_126_ee85d62d-87cb-4abc-8f08-b66ccdd2c103&amp;uf=https%3A%2F%2Ffeeds.feedburner.com%2Fwelcometonightvalepodcast</link>
+      <description>
+        <![CDATA[<p>Luca Albescu lives at 831 Lombardi Street, in a dilapidated Victorian mansion at the top of the hill.</p>]]>
+      </description>
+      <enclosure url="https://www.podtrac.com/pts/redirect.mp3/dovetail.prxu.org/_/126/ee85d62d-87cb-4abc-8f08-b66ccdd2c103/nv233_intro.mp3" type="audio/mpeg" length="41761016"/>
+      <itunes:subtitle>Luca Albescu lives at 831 Lombardi Street, in a dilapidated Victorian mansion at the top of the hill.</itunes:subtitle>
+      <itunes:episodeType>full</itunes:episodeType>
+      <itunes:duration>28:59</itunes:duration>
+      <itunes:author>Night Vale Presents</itunes:author>
+      <itunes:summary>
+        <![CDATA[Luca Albescu lives at 831 Lombardi Street, in a dilapidated Victorian mansion at the top of the hill.]]>
+      </itunes:summary>
+      <itunes:image href="https://f.prxu.org/126/ee85d62d-87cb-4abc-8f08-b66ccdd2c103/images/ad5453f1-3ccc-4384-be03-9a4a7558370b/episodes58.jpg"/>
+      <media:content fileSize="41761016" type="audio/mpeg" url="https://www.podtrac.com/pts/redirect.mp3/dovetail.prxu.org/_/126/ee85d62d-87cb-4abc-8f08-b66ccdd2c103/nv233_intro.mp3"/>
+      <content:encoded>
+        <![CDATA[<p>Luca Albescu lives at 831 Lombardi Street, in a dilapidated Victorian mansion at the top of the hill.</p>]]>
+      </content:encoded>
+    </item>
+  </channel>
+</rss>

data/spec/sample_feeds/json_feed.json

@@ -6,6 +6,8 @@
   "feed_url": "http://inessential.com/feed.json",
   "user_comment": "This feed allows you to read the posts from this site in any feed reader that supports the JSON Feed format. To add this feed to your reader, copy the following URL — http://inessential.com/feed.json — and add it your reader.",
   "favicon": "http://inessential.com/favicon.ico",
+  "icon": "http://inessential.com/icon.png",
+  "language": "en-US",
   "author": {
     "name": "Brent Simmons",
     "url": "http://inessential.com/",

data/spec/sample_feeds.rb

@@ -10,6 +10,7 @@ module SampleFeeds
     sample_atom_feed_line_breaks: "AtomFeedWithSpacesAroundEquals.xml",
     sample_atom_entry_content: "AmazonWebServicesBlogFirstEntryContent.xml",
     sample_itunes_feed: "itunes.xml",
+    sample_itunes_feedburner_feed: "itunes_feedburner.xml",
     sample_itunes_feed_with_single_quotes: "ITunesWithSingleQuotedAttributes.xml",
     sample_itunes_feed_with_spaces: "ITunesWithSpacesInAttributes.xml",
     sample_podlove_feed: "CRE.xml",

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# coverage setup must come before loading lib/ code
+require "support/coverage"
+
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/feedjira")
 require "sample_feeds"
 

data/spec/support/coverage.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "simplecov"
+
+SimpleCov.start do
+  enable_coverage :branch
+  add_filter "_spec.rb"
+end
+
+SimpleCov.minimum_coverage(line: 98, branch: 75)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Adam Hess
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2024-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loofah
@@ -23,6 +23,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,6 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +43,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,118 +53,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description:
 email:
 executables: []
@@ -164,6 +64,7 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/feed-parsing.md"
 - ".github/ISSUE_TEMPLATE/general-issue.md"
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -183,10 +84,6 @@ files:
 - lib/feedjira/core_ext/date.rb
 - lib/feedjira/core_ext/string.rb
 - lib/feedjira/core_ext/time.rb
-- lib/feedjira/date_time_utilities.rb
-- lib/feedjira/date_time_utilities/date_time_epoch_parser.rb
-- lib/feedjira/date_time_utilities/date_time_language_parser.rb
-- lib/feedjira/date_time_utilities/date_time_pattern_parser.rb
 - lib/feedjira/feed.rb
 - lib/feedjira/feed_entry_utilities.rb
 - lib/feedjira/feed_utilities.rb
@@ -218,8 +115,8 @@ files:
 - lib/feedjira/rss_entry_utilities.rb
 - lib/feedjira/version.rb
 - spec/feedjira/configuration_spec.rb
+- spec/feedjira/core_ext/time_spec.rb
 - spec/feedjira/feed_spec.rb
-- spec/feedjira/feed_utilities_date_time_spec.rb
 - spec/feedjira/feed_utilities_entry_spec.rb
 - spec/feedjira/feed_utilities_spec.rb
 - spec/feedjira/parser/atom_entry_spec.rb
@@ -282,17 +179,19 @@ files:
 - spec/sample_feeds/atom_with_link_tag_for_url_unmarked.xml
 - spec/sample_feeds/google_alerts_atom.xml
 - spec/sample_feeds/itunes.xml
+- spec/sample_feeds/itunes_feedburner.xml
 - spec/sample_feeds/json_feed.json
 - spec/sample_feeds/pet_atom.xml
 - spec/sample_feeds/youtube_atom.xml
 - spec/spec_helper.rb
+- spec/support/coverage.rb
 homepage: https://github.com/feedjira/feedjira
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/feedjira/feedjira
   source_code_uri: https://github.com/feedjira/feedjira
-  changelog_uri: https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/feedjira/feedjira/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -309,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A feed parsing library

data/lib/feedjira/date_time_utilities/date_time_epoch_parser.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Feedjira
-  module DateTimeUtilities
-    class DateTimeEpochParser
-      def self.parse(string)
-        epoch_time = string.to_i
-        return Time.at(epoch_time).to_datetime if epoch_time.to_s == string
-
-        raise "#{string} is not a valid epoch time"
-      end
-    end
-  end
-end

data/lib/feedjira/date_time_utilities/date_time_language_parser.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Feedjira
-  module DateTimeUtilities
-    class DateTimeLanguageParser
-      MONTHS_ENGLISH =
-        %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec].freeze
-      MONTHS_SPANISH =
-        %w[Ene Feb Mar Abr May Jun Jul Ago Sep Oct Nov Dic].freeze
-
-      def self.parse(string)
-        DateTime.parse(translate(string))
-      end
-
-      def self.translate(string)
-        MONTHS_SPANISH.each_with_index do |m, i|
-          rgx = Regexp.new("\s#{m}\s", Regexp::IGNORECASE)
-          return string.gsub(rgx, MONTHS_ENGLISH[i]) if string&.match?(rgx)
-        end
-        raise "No translation found for #{string}"
-      end
-    end
-  end
-end

data/lib/feedjira/date_time_utilities/date_time_pattern_parser.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Feedjira
-  module DateTimeUtilities
-    class DateTimePatternParser
-      # Japanese Symbols are required for strange Date Strings like
-      # '水, 31 8 2016 07:37:00 PDT'
-      JAPANESE_SYMBOLS = %w[日 月 火 水 木 金 土].freeze
-      PATTERNS = ["%m/%d/%Y %T %p", "%d %m %Y %T %Z"].freeze
-
-      def self.parse(string)
-        PATTERNS.each do |p|
-          datetime = DateTime.strptime(prepare(string), p)
-          return datetime
-        rescue StandardError => e
-          Feedjira.logger.debug("Failed to parse date #{string}")
-          Feedjira.logger.debug(e)
-          nil
-        end
-        raise "No pattern matched #{string}"
-      end
-
-      def self.prepare(string)
-        rgx = Regexp.new("^(#{JAPANESE_SYMBOLS.join('|')}),\s")
-        string.gsub(rgx, "")
-      end
-      private_class_method :prepare
-    end
-  end
-end

data/lib/feedjira/date_time_utilities.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Feedjira
-  module DateTimeUtilities
-    # This is our date parsing heuristic.
-    # Date Parsers are attempted in order.
-    DATE_PARSERS = [
-      DateTimePatternParser,
-      DateTimeLanguageParser,
-      DateTimeEpochParser,
-      DateTime
-    ].freeze
-
-    # Parse the given string starting with the most common parser (default ruby)
-    # and going over all other available parsers
-    def parse_datetime(string)
-      res = DATE_PARSERS.detect do |parser|
-        return parser.parse(string).feed_utils_to_gm_time
-      rescue StandardError => e
-        Feedjira.logger.debug { "Failed to parse date #{string}" }
-        Feedjira.logger.debug(e)
-        nil
-      end
-
-      Feedjira.logger.warn { "Failed to parse date #{string}" } if res.nil?
-
-      res
-    end
-  end
-end

data/spec/feedjira/feed_utilities_date_time_spec.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe Feedjira::FeedUtilities do
-  before do
-    @klass = Class.new do
-      include Feedjira::DateTimeUtilities
-    end
-  end
-
-  describe "handling dates" do
-    it "parses an ISO 8601 formatted datetime into Time" do
-      time = @klass.new.parse_datetime("2008-02-20T8:05:00-010:00")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.parse_safely("Wed Feb 20 18:05:00 UTC 2008")
-    end
-
-    it "parses a ISO 8601 with milliseconds into Time" do
-      time = @klass.new.parse_datetime("2013-09-17T08:20:13.931-04:00")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.strptime("Tue Sep 17 12:20:13.931 UTC 2013", "%a %b %d %H:%M:%S.%N %Z %Y")
-    end
-
-    it "parses a US Format into Time" do
-      time = @klass.new.parse_datetime("8/23/2016 12:29:58 PM")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.parse_safely("Wed Aug 23 12:29:58 UTC 2016")
-    end
-
-    it "parses a Spanish Format into Time" do
-      time = @klass.new.parse_datetime("Wed, 31 Ago 2016 11:08:22 GMT")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.parse_safely("Wed Aug 31 11:08:22 UTC 2016")
-    end
-
-    it "parses Format with japanese symbols into Time" do
-      time = @klass.new.parse_datetime("水, 31 8 2016 07:37:00 PDT")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.parse_safely("Wed Aug 31 14:37:00 UTC 2016")
-    end
-
-    it "parses epoch into Time" do
-      time = @klass.new.parse_datetime("1472654220")
-      expect(time.class).to eq Time
-      expect(time).to eq Time.parse_safely("Wed Aug 31 14:37:00 UTC 2016")
-    end
-  end
-end