feat(auto_source): replace stylesheet workaround

Replaced the previous RSS construction with a new feed builder to simplify code and improve maintainability. Updated caching logic to align with the new structure, enhancing response handling for auto-source features.

Signed-off-by: Gil Desmarais <[email protected]>

Author: gildesmarais

routes/auto_source.rb

@@ -21,28 +21,19 @@ class App
 
             r.on String, method: :get do |encoded_url|
               strategy = (request.params['strategy'] || :ssrf_filter).to_sym
-              unless Html2rss::RequestService.strategy_registered?(strategy)
-                raise Html2rss::RequestService::UnknownStrategy
-              end
 
-              response['Content-Type'] = CONTENT_TYPE_RSS
-
-              url = Addressable::URI.parse(Base64.urlsafe_decode64(encoded_url)).to_s
-              rss = Html2rss.auto_source(url, strategy:)
+              url = Addressable::URI.parse(Base64.urlsafe_decode64(encoded_url))
 
-              # Unfortunately, Ruby's rss gem does not provide a direct method to
-              # add an XML stylesheet to the RSS::RSS object itself.
-              stylesheet = Html2rss::RssBuilder::Stylesheet.new(href: '/rss.xsl', type: 'text/xsl').to_xml
+              feed = Html2rss.feed(stylesheets: [{ href: '/rss.xsl', type: 'text/xsl' }],
+                                   strategy:,
+                                   channel: { url: url.to_s },
+                                   auto_source: {})
 
-              xml_content = rss.to_xml
-              xml_content.sub!(/^<\?xml version="1.0" encoding="UTF-8"\?>/,
-                               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n#{stylesheet}")
+              HttpCache.expires(response, AutoSource.ttl_in_seconds(feed), cache_control: 'private, must-revalidate')
 
-              HttpCache.expires response,
-                                AutoSource.ttl_in_seconds(rss),
-                                cache_control: 'private, must-revalidate'
-
-              xml_content
+              response['Content-Type'] = CONTENT_TYPE_RSS
+              response.status = 200
+              feed.to_xml
             end
           else
             # auto_source feature is disabled

spec/routes/auto_source_spec.rb

@@ -76,6 +76,7 @@ def app = described_class
 
       it 'responds successfully', :aggregate_failures do
         expect(response).to be_ok
+        expect(response.status).to eq 200
         expect(response.body).to start_with '<?xml version="1.0" encoding="UTF-8"?>'
         expect(response.get_header('cache-control')).to eq 'must-revalidate, no-cache, no-store, private, max-age=0'
         expect(response.get_header('content-type')).to eq described_class::CONTENT_TYPE_RSS
@@ -93,7 +94,7 @@ def app = described_class
 
       it 'responds with Error', :aggregate_failures do
         expect(response.status).to eq 422
-        expect(response.body).to match(/UnknownStrategy/)
+        expect(response.body).to match(/Invalid configuration: {:strategy/)
       end
     end
   end