feedjira 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7c43633bb85f7aa16a1930ba863d404bee83de5365676c1df4600df5640d4d6
-  data.tar.gz: e910be45a7e47e55cec3d4d09e219d6d245834da7360d22338c6380e1bad42ac
+  metadata.gz: cb65081b36daffe6b574820cdfba4b0e444854e8e72b3b6f6f82f2efc80befd2
+  data.tar.gz: 14d58fb668a54606e0b03e0f8f9a6748681a562902955120937f0cb6cd62c0b7
 SHA512:
-  metadata.gz: a1fbf835d1ae58a7a542fc37362e7c8d1fa9ab5ec435075da34f7a386aac5d0a2acda1e8d24f4138b50ca410582e5fec48409ecf6bcdf93cc2a6f8f6dee55882
-  data.tar.gz: 0ec37861fc3fac82ce93a41df4b84a3800a3a74090f17b5b6322e35c1189e63d83671d0deeca6847bb25803118f9e406c067b1e1363f863edce788b9b985130d
+  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/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 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)

data/Gemfile

@@ -4,13 +4,13 @@ source "https://rubygems.org/"
 
 gemspec
 
-gem "faraday", "~> 2.13.4"
-gem "pry", "~> 0.15.0"
+gem "faraday", "~> 2.14.0"
+gem "pry", "~> 0.16.0"
 gem "rspec", "~> 3.13.0"
-gem "rubocop", "~> 1.80.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_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.1"
+  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/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.1
+  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: []