feedjira 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c0d5191e078e304c8167c6a751183e9fc696180d46197cd27514412a1b19ee7
-  data.tar.gz: 7468bd2d9e312250a8d01410b0934877566ebd924ff50d369d25faa0f9c9c285
+  metadata.gz: cb65081b36daffe6b574820cdfba4b0e444854e8e72b3b6f6f82f2efc80befd2
+  data.tar.gz: 14d58fb668a54606e0b03e0f8f9a6748681a562902955120937f0cb6cd62c0b7
 SHA512:
-  metadata.gz: 6db87062df76ea36471ae9c39502e7be29ccdbd317aa7fa1f9dd914cab6294a23ff0d154ee3578b101fecf4d6908dc0e800e44a5b7ef986e4af8d4ff320ad941
-  data.tar.gz: 0351de63585571aaac4742d475ae32700f701158a35e6d3f768edf79629c4172d99ec3e30be194dc067d722437fdd9be7b089faf8e6f35b0965c748253ff9aee
+  metadata.gz: 39be37b94a2c07856bee078fa641015ce78c19336797dbf1403d731db27b6c2ab44ad834e2b691c63b9d473462e1794b228e949e7b87d7647a04c198ab514274
+  data.tar.gz: 0c9237598fd8d7cea5be2201169925d30983298b02612d2812fd1ab196337be4b5a5054eb5f58430b8a4f3bfe6465f4a8018064539bcb93779d12802d9371248

data/.rubocop.yml

@@ -60,3 +60,6 @@ RSpec/RepeatedExample:
   Enabled: false
 
 Style/Copyright: { Enabled: false }
+
+Style/HashLookupMethod:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,14 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 400`
-# on 2025-08-24 01:08:06 UTC using RuboCop version 1.79.1.
+# on 2025-09-02 06:40:19 UTC using RuboCop version 1.80.1.
 # 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: 12
-# Configuration parameters: Include, IgnoredGems, OnlyFor.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+# Configuration parameters: IgnoredGems, OnlyFor.
 Bundler/GemComment:
   Exclude:
     - 'Gemfile'
@@ -75,7 +74,7 @@ Layout/SingleLineBlockChain:
     - 'spec/feedjira/feed_utilities_spec.rb'
     - 'spec/feedjira/parser/atom_feed_burner_spec.rb'
 
-# Offense count: 355
+# Offense count: 364
 # Configuration parameters: Only, Ignore.
 Lint/ConstantResolution:
   Exclude:
@@ -154,6 +153,12 @@ Lint/NumberConversion:
   Exclude:
     - 'lib/feedjira/parser/podlove_chapter.rb'
 
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/feedjira/parser/atom_spec.rb'
+
 # Offense count: 1
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
@@ -285,7 +290,7 @@ Style/InlineComment:
     - 'spec/feedjira/feed_utilities_spec.rb'
     - 'spec/feedjira/preprocessor_spec.rb'
 
-# Offense count: 881
+# Offense count: 890
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
@@ -389,9 +394,3 @@ Style/StringHashKeys:
 Style/SuperArguments:
   Exclude:
     - 'lib/feedjira/feed_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,13 @@
 # Feedjira Changelog
 
+## 4.0.2
+
+* Fix ITunesRSS.able_to_parse? false positive on CDATA content (#570)
+
+## 4.0.1
+
+* Amend Atom parser able_to_parse regex to also match the HTTPS variant of the xmlns attribute value (#558)
+
 ## 4.0.0
 
 * Drop support for Ruby 2.7 and 3.0 (#555)

data/Gemfile

@@ -4,13 +4,13 @@ source "https://rubygems.org/"
 
 gemspec
 
-gem "faraday", "~> 2.8.1"
-gem "pry", "~> 0.15.0"
+gem "faraday", "~> 2.14.0"
+gem "pry", "~> 0.16.0"
 gem "rspec", "~> 3.13.0"
-gem "rubocop", "~> 1.79.0"
-gem "rubocop-performance", "~> 1.25.0"
+gem "rubocop", "~> 1.86.0"
+gem "rubocop-performance", "~> 1.26.0"
 gem "rubocop-rake", "~> 0.7.1"
-gem "rubocop-rspec", "~> 3.6.0"
+gem "rubocop-rspec", "~> 3.9.0"
 gem "simplecov", "~> 0.22.0"
 gem "yard", "~> 0.9.34"
 

data/lib/feedjira/parser/atom.rb

@@ -17,7 +17,7 @@ module Feedjira
       element :icon
 
       def self.able_to_parse?(xml)
-        %r{<feed[^>]+xmlns\s?=\s?["'](http://www\.w3\.org/2005/Atom|http://purl\.org/atom/ns\#)["'][^>]*>} =~ xml
+        %r{<feed[^>]+xmlns\s?=\s?["'](https?://www\.w3\.org/2005/Atom|http://purl\.org/atom/ns\#)["'][^>]*>} =~ xml
       end
 
       def url

data/lib/feedjira/parser/atom_google_alerts.rb

@@ -15,7 +15,7 @@ module Feedjira
       elements :entry, as: :entries, class: AtomGoogleAlertsEntry
 
       def self.able_to_parse?(xml)
-        Atom.able_to_parse?(xml) && (%r{<id>tag:google\.com,2005:[^<]+/com\.google/alerts/} === xml) # rubocop:disable Style/CaseEquality
+        Atom.able_to_parse?(xml) && (%r{<id>tag:google\.com,2005:[^<]+/com\.google/alerts/} === xml)
       end
 
       def self.preprocess(xml)

data/lib/feedjira/parser/itunes_rss.rb

@@ -63,7 +63,8 @@ module Feedjira
       elements :item, as: :entries, class: ITunesRSSItem
 
       def self.able_to_parse?(xml)
-        %r{xmlns:itunes\s?=\s?["']http://www\.itunes\.com/dtds/podcast-1\.0\.dtd["']}i =~ xml
+        xml_without_cdata = xml.gsub(/<!\[CDATA\[.*?\]\]>/m, "")
+        %r{xmlns:itunes\s?=\s?["']http://www\.itunes\.com/dtds/podcast-1\.0\.dtd["']}i =~ xml_without_cdata
       end
     end
   end

data/lib/feedjira/version.rb

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

data/lib/feedjira.rb

@@ -44,7 +44,8 @@ require_relative "feedjira/parser/json_feed_item"
 
 # Feedjira
 module Feedjira
-  NoParserAvailable = Class.new(StandardError)
+  class NoParserAvailable < StandardError
+  end
 
   extend Configuration
 

data/spec/feedjira/parser/atom_spec.rb

@@ -4,21 +4,72 @@ require "spec_helper"
 
 module Feedjira
   module Parser
-    describe "#will_parse?" do
-      it "returns true for an atom feed" do
-        expect(Atom).to be_able_to_parse(sample_atom_feed)
+    describe "#able_to_parse?" do
+      it "returns false if the xmlns value is not the expected value" do
+        xml = '<feed xmlns="http://www.example.org/"></feed>'
+        expect(Atom).not_to be_able_to_parse(xml)
       end
 
-      it "returns false for an rdf feed" do
-        expect(Atom).not_to be_able_to_parse(sample_rdf_feed)
+      it "returns false if there is no xmlns value" do
+        xml = "<feed></feed>"
+        expect(Atom).not_to be_able_to_parse(xml)
       end
 
-      it "returns false for an rss feedburner feed" do
-        expect(Atom).not_to be_able_to_parse(sample_rss_feed_burner_feed)
+      describe "with a w3.org URL present" do
+        it "returns true if contains the expected w3.org URL as xmlns value" do
+          xml = '<feed xmlns="http://www.w3.org/2005/Atom"></feed>'
+          expect(Atom).to be_able_to_parse(xml)
+        end
+
+        it "returns true if contains the HTTPS variant of the expected w3.org URL as xmlns value" do
+          xml = '<feed xmlns="https://www.w3.org/2005/Atom"></feed>'
+          expect(Atom).to be_able_to_parse(xml)
+        end
+
+        it "returns true if contains the expected xmlns value with single quotes" do
+          xml = "<feed xmlns='http://www.w3.org/2005/Atom'></feed>"
+          expect(Atom).to be_able_to_parse(xml)
+        end
+
+        it "returns true with whitespace around the equals sign" do
+          xml = '<feed xmlns = "http://www.w3.org/2005/Atom"></feed>'
+          expect(Atom).to be_able_to_parse(xml)
+        end
+      end
+
+      describe "with a purl.org URL present" do
+        it "returns true if contains the expected purl.org URL as xmlns value" do
+          xml = '<feed xmlns="http://purl.org/atom/ns#"></feed>'
+          expect(Atom).to be_able_to_parse(xml)
+        end
+
+        it "returns true if contains the expected xmlns value with single quotes" do
+          xml = "<feed xmlns='http://purl.org/atom/ns#'></feed>"
+          expect(Atom).to be_able_to_parse(xml)
+        end
+
+        it "returns true with whitespace around the equals sign" do
+          xml = '<feed xmlns = "http://purl.org/atom/ns#"></feed>'
+          expect(Atom).to be_able_to_parse(xml)
+        end
       end
 
-      it "returns true for an atom feed that has line breaks in between attributes in the <feed> node" do
-        expect(Atom).to be_able_to_parse(sample_atom_feed_line_breaks)
+      context "with full sample feeds" do
+        it "returns true for an atom feed" do
+          expect(Atom).to be_able_to_parse(sample_atom_feed)
+        end
+
+        it "returns false for an rdf feed" do
+          expect(Atom).not_to be_able_to_parse(sample_rdf_feed)
+        end
+
+        it "returns false for an rss feedburner feed" do
+          expect(Atom).not_to be_able_to_parse(sample_rss_feed_burner_feed)
+        end
+
+        it "returns true for an atom feed that has line breaks in between attributes in the <feed> node" do
+          expect(Atom).to be_able_to_parse(sample_atom_feed_line_breaks)
+        end
       end
     end
 

data/spec/feedjira/parser/itunes_rss_spec.rb

@@ -24,6 +24,10 @@ module Feedjira
       it "returns false for an rss feedburner feed" do
         expect(ITunesRSS).not_to be_able_to_parse(sample_rss_feed_burner_feed)
       end
+
+      it "returns false for an atom feed with xmlns:itunes inside CDATA" do
+        expect(ITunesRSS).not_to be_able_to_parse(sample_atom_with_itunes_in_cdata)
+      end
     end
 
     describe "parsing" do

data/spec/feedjira_spec.rb

@@ -155,6 +155,12 @@ RSpec.describe Feedjira do
       expect(actual_parser).to eq described_class::Parser::ITunesRSS
     end
 
+    it "with an atom feed containing xmlns:itunes in CDATA it returns the Atom parser" do
+      xml = sample_atom_with_itunes_in_cdata
+      actual_parser = described_class.parser_for_xml(xml)
+      expect(actual_parser).to eq described_class::Parser::Atom
+    end
+
     context "when parsers are configured" do
       it "does not use default parsers" do
         xml = "Atom asdf"

data/spec/sample_feeds/AtomWithITunesInCDATA.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>Test Blog</title>
+  <link rel="alternate" href="https://example.com/" />
+  <id>tag:example.com,2024:blog</id>
+  <updated>2024-01-01T00:00:00Z</updated>
+  <entry>
+    <title>How to set up a podcast RSS feed</title>
+    <link href="https://example.com/post/1" />
+    <id>tag:example.com,2024:post-1</id>
+    <published>2024-01-01T00:00:00Z</published>
+    <content type="html"><![CDATA[
+      <p>Here is an example RSS feed:</p>
+      <pre><code>&lt;rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"&gt;</code></pre>
+    ]]></content>
+  </entry>
+</feed>

data/spec/sample_feeds.rb

@@ -37,7 +37,8 @@ module SampleFeeds
     sample_invalid_date_format_feed: "InvalidDateFormat.xml",
     sample_rss_feed_permalinks: "Permalinks.xml",
     sample_rss_feed_with_a10_namespace: "a10.xml",
-    sample_rss_feed_with_comments: "RSSWithComments.xml"
+    sample_rss_feed_with_comments: "RSSWithComments.xml",
+    sample_atom_with_itunes_in_cdata: "AtomWithITunesInCDATA.xml"
   }.freeze
 
   FEEDS.each do |method, filename|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Adam Hess
@@ -164,6 +164,7 @@ files:
 - spec/sample_feeds/AmazonWebServicesBlogFirstEntryContent.xml
 - spec/sample_feeds/AtomEscapedHTMLInPreTag.xml
 - spec/sample_feeds/AtomFeedWithSpacesAroundEquals.xml
+- spec/sample_feeds/AtomWithITunesInCDATA.xml
 - spec/sample_feeds/CRE.xml
 - spec/sample_feeds/DuplicateContentAtomFeed.xml
 - spec/sample_feeds/FeedBurnerUrlNoAlternate.xml
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A feed parsing library
 test_files: []