Fix legacy feed lookup and cache TTL

Author: gildesmarais

README.md

@@ -5,29 +5,35 @@
 html2rss-web converts arbitrary websites into RSS 2.0 feeds with a slim Ruby backend and an Astro-powered frontend.
 
 ## Links
+
 - Docs & feed directory: https://html2rss.github.io
 - Discussions: https://github.com/orgs/html2rss/discussions
 - Sponsor: https://github.com/sponsors/gildesmarais
 
 ## Highlights
+
 - Responsive Astro interface with gallery and custom feed creation.
 - Automatic source discovery with token-scoped permissions.
 - Signed public feed URLs that work in standard RSS readers.
 - Built-in SSRF defences, input validation, and HMAC-protected tokens.
 
 ## Architecture
+
 - **Backend:** Ruby + Roda, backed by the `html2rss` gem for extraction.
 - **Frontend:** Astro static site with progressive enhancement.
 - **Distribution:** Docker Compose by default; other deployments require manual wiring.
 
 ## Documentation
+
 In-repo docs live under `frontend/src/content/docs/` and are published by Astro.
+
 - [Configuration Guide](frontend/src/content/docs/configuration.md)
 - [Security Guide](frontend/src/content/docs/security.md)
 - [REST API v1](frontend/src/content/docs/api/v1.md)
 - [Testing Overview](frontend/src/content/docs/testing.md)
 
 ## REST API Snapshot
+
 ```bash
 # List available strategies
 curl -H "Authorization: Bearer <token>" \
@@ -41,13 +47,15 @@ curl -X POST "https://your-domain.com/api/v1/feeds" \
 ```
 
 ## Deploy (Docker Compose)
+
 1. Generate a key: `openssl rand -hex 32`.
 2. Set `HTML2RSS_SECRET_KEY` in `docker-compose.yml`.
 3. Start: `docker-compose up`.
 
 UI + API run on `http://localhost:4000`. The app exits if the secret key is missing.
 
 ## Development (Dev Container)
+
 Use the repository's [Dev Container](.devcontainer/README.md) for all local development and tests.
 Running the app directly on the host is not supported.
 
@@ -82,12 +90,12 @@ Dev URLs: Ruby app at `http://localhost:4000`, Astro dev server at `http://local
 
 ## Frontend npm Scripts (inside Dev Container)
 
-| Command                 | Purpose                           |
-| ----------------------- | --------------------------------- |
+| Command                 | Purpose                                       |
+| ----------------------- | --------------------------------------------- |
 | `npm run dev`           | Astro dev server with hot reload (port 4001). |
-| `npm run build`         | Production build.                 |
-| `npm run test:run`      | Unit tests (Vitest).              |
-| `npm run test:contract` | Contract tests with MSW.          |
+| `npm run build`         | Production build.                             |
+| `npm run test:run`      | Unit tests (Vitest).                          |
+| `npm run test:contract` | Contract tests with MSW.                      |
 
 ## Testing Strategy
 
@@ -99,4 +107,5 @@ Dev URLs: Ruby app at `http://localhost:4000`, Astro dev server at `http://local
 | Docker smoke      | RSpec (`:docker`)        | Net::HTTP probes against the containerised service.  |
 
 ## Contributing
+
 See the [html2rss project guidelines](https://html2rss.github.io/get-involved/contributing).

app.rb

@@ -42,19 +42,15 @@ class App < Roda
           </body>
         </html>
       HTML
-
       def self.development? = EnvironmentValidator.development?
       def development? = self.class.development?
-
       EnvironmentValidator.validate_environment!
       EnvironmentValidator.validate_production_security!
 
-      # Inline Roda configuration
       Html2rss::RequestService.register_strategy(:ssrf_filter, SsrfFilterStrategy)
       Html2rss::RequestService.default_strategy_name = :ssrf_filter
       Html2rss::RequestService.unregister_strategy(:faraday)
-      opts[:check_dynamic_arity] = false
-      opts[:check_arity] = :warn
+      opts.merge!(check_dynamic_arity: false, check_arity: :warn)
       use Rack::Cache, metastore: 'file:./tmp/rack-cache-meta', entitystore: 'file:./tmp/rack-cache-body',
                        verbose: development?
 
@@ -132,9 +128,10 @@ def development? = self.class.development?
 
       def handle_feed_generation(router, feed_name)
         rss_content = Feeds.generate_feed(feed_name, router.params)
-        ttl = LocalConfig.find(feed_name)&.dig(:channel, :ttl) || 3600
+        ttl_minutes = LocalConfig.find(feed_name)&.dig(:channel, :ttl)
+        ttl_seconds = ttl_minutes ? ttl_minutes * 60 : 3600
         router.response['Content-Type'] = 'application/xml'
-        router.response['Cache-Control'] = "public, max-age=#{ttl}"
+        HttpCache.expires(router.response, ttl_seconds, cache_control: 'public')
         rss_content
       end
 

app/local_config.rb

@@ -18,7 +18,10 @@ class << self
         # @param name [String, Symbol, #to_sym]
         # @return [Hash<Symbol, Any>]
         def find(name)
-          config = feeds.fetch(name.to_sym) { raise NotFound, "Did not find local feed config at '#{name}'" }
+          normalized_name = normalize_name(name)
+          config = feeds.fetch(normalized_name.to_sym) do
+            raise NotFound, "Did not find local feed config at '#{normalized_name}'"
+          end
           config = deep_dup(config)
 
           apply_global_defaults(config)
@@ -55,6 +58,10 @@ def apply_global_defaults(config)
           config
         end
 
+        def normalize_name(name)
+          File.basename(name.to_s, '.*')
+        end
+
         def deep_dup(value)
           case value
           when Hash

spec/html2rss/web/app_spec.rb

@@ -29,7 +29,9 @@ def app = described_class
 
       expect(last_response.status).to eq(200)
       expect(last_response.headers['Content-Type']).to eq('application/xml')
-      expect(last_response.headers['Cache-Control']).to eq('public, max-age=180')
+      cache_control = last_response.headers['Cache-Control']
+      expect(cache_control).to include('public')
+      expect(cache_control).to include('max-age=10800')
       expect(last_response.body).to eq('<rss/>')
     end
 

spec/html2rss/web/local_config_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_relative '../../../app/local_config'
+
+RSpec.describe Html2rss::Web::LocalConfig do
+  describe '.find' do
+    it 'strips feed extensions before lookup', :aggregate_failures do
+      allow(described_class).to receive(:yaml).and_return(
+        { feeds: { example: { title: 'Example' } } }
+      )
+
+      expect(described_class.find('example.rss')[:title]).to eq('Example')
+      expect(described_class.find('example.xml')[:title]).to eq('Example')
+    end
+  end
+end