maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Increase redirects limit when fetching podcasts (#4479)

Browse source
This commit is contained in:
Anna Buianova 2019-10-17 18:24:29 +03:00 • committed by Mac Siri
parent 6cbad11b8f
commit 41ba46623c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/services/podcasts/feed.rb
View file

@ -8,7 +8,8 @@ module Podcasts
end
def get_episodes(limit: 100, force_update: false)
rss = HTTParty.get(podcast.feed_url).body
# increased the redirect limit from 5 (default) to 7 to be able to handle such urls
rss = HTTParty.get(podcast.feed_url, limit: 7).body
feed = RSS::Parser.parse(rss, false)
set_unreachable(:unparsable, force_update) && return unless feed

11
spec/services/podcasts/feed_spec.rb
View file

@ -8,6 +8,7 @@ vcr_option = {
RSpec.describe Podcasts::Feed, vcr: vcr_option do
let(:feed_url) { "http://softwareengineeringdaily.com/feed/podcast/" }
let(:podcast) { create(:podcast, feed_url: feed_url) }
let(:httparty_options) { { limit: 7 } }
before do
podcast
@ -26,7 +27,7 @@ RSpec.describe Podcasts::Feed, vcr: vcr_option do
end
it "sets reachable" do
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast").and_raise(Errno::ECONNREFUSED)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast", httparty_options).and_raise(Errno::ECONNREFUSED)
described_class.new(unpodcast).get_episodes(limit: 2)
unpodcast.reload
expect(unpodcast.reachable).to be false
@ -34,7 +35,7 @@ RSpec.describe Podcasts::Feed, vcr: vcr_option do
end
it "schedules the update url jobs when setting as unreachable" do
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast").and_raise(Errno::ECONNREFUSED)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast", httparty_options).and_raise(Errno::ECONNREFUSED)
create_list(:podcast_episode, 2, podcast: unpodcast)
expect do
described_class.new(unpodcast).get_episodes(limit: 2)
@ -42,7 +43,7 @@ RSpec.describe Podcasts::Feed, vcr: vcr_option do
end
it "re-checks episodes urls when setting as unreachable" do
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast").and_raise(Errno::ECONNREFUSED)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast", httparty_options).and_raise(Errno::ECONNREFUSED)
episode = create(:podcast_episode, podcast: unpodcast, reachable: true, media_url: "http://podcast.example.com/ep1.mp3")
allow(HTTParty).to receive(:head).with("http://podcast.example.com/ep1.mp3").and_raise(Errno::ECONNREFUSED)
allow(HTTParty).to receive(:head).with("https://podcast.example.com/ep1.mp3").and_raise(Errno::ECONNREFUSED)
@ -57,7 +58,7 @@ RSpec.describe Podcasts::Feed, vcr: vcr_option do
it "doesn't re-check episodes reachable if the podcast was unreachable" do
unpodcast.update_column(:reachable, false)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast").and_raise(Errno::ECONNREFUSED)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast", httparty_options).and_raise(Errno::ECONNREFUSED)
create_list(:podcast_episode, 2, podcast: unpodcast)
expect do
described_class.new(unpodcast).get_episodes(limit: 2)
@ -70,7 +71,7 @@ RSpec.describe Podcasts::Feed, vcr: vcr_option do
let(:unpodcast) { create(:podcast, feed_url: un_feed_url) }
it "sets ssl_failed" do
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast").and_raise(OpenSSL::SSL::SSLError)
allow(HTTParty).to receive(:get).with("http://podcast.example.com/podcast", httparty_options).and_raise(OpenSSL::SSL::SSLError)
described_class.new(unpodcast).get_episodes(limit: 2)
unpodcast.reload
expect(unpodcast.reachable).to be false