fix: align defaults and utility links

Author: gildesmarais

app/web/config/local_config.rb

@@ -22,6 +22,7 @@ class NotFound < RuntimeError; end
       # raised when the local config shape is invalid
       class InvalidConfig < RuntimeError; end
       FEED_EXTENSION_PATTERN = /\.(json|rss|xml)\z/
+      EMBEDDED_FEED_NAME_PATTERN = %r{\A[^/]+/.+\z}
 
       # Path to local feed configuration file.
       CONFIG_FILE = 'config/feeds.yml'
@@ -92,15 +93,11 @@ def local_feed_config(normalized_name)
         # @return [Hash{Symbol=>Object}, nil]
         def embedded_feed_config(normalized_name)
           return nil unless defined?(Html2rss::Configs)
-          return nil unless normalized_name.include?('/')
+          return nil unless normalized_name.match?(EMBEDDED_FEED_NAME_PATTERN)
 
           deep_dup(Html2rss::Configs.find_by_name(normalized_name))
         rescue Html2rss::Configs::ConfigNotFound
           nil
-        rescue RuntimeError => error
-          return nil if error.message == 'name must be in folder/file format'
-
-          raise
         end
 
         # Applies global defaults only when feed-level keys are absent.

app/web/domain/auto_source.rb

@@ -21,7 +21,7 @@ def enabled?
         # @param token_data [Hash{Symbol=>Object}] authenticated account data.
         # @param strategy [String]
         # @return [Html2rss::Web::Api::V1::FeedMetadata::Metadata, nil]
-        def create_stable_feed(name, url, token_data, strategy = 'faraday')
+        def create_stable_feed(name, url, token_data, strategy = Html2rss::RequestService.default_strategy_name.to_s)
           return nil unless token_data && FeedAccess.url_allowed_for_username?(token_data[:username], url)
 
           feed_token = Auth.generate_feed_token(token_data[:username], url, strategy: strategy)

app/web/feeds/source_resolver.rb

@@ -71,7 +71,7 @@ def static_cache_identity(feed_name, params)
           def static_generator_input(config, params)
             generator_input = config.dup
             generator_input[:params] = merged_static_params(config, params)
-            generator_input[:strategy] ||= :faraday
+            generator_input[:strategy] ||= Html2rss::RequestService.default_strategy_name.to_sym
             generator_input
           end
 

frontend/src/__tests__/App.test.tsx

@@ -368,4 +368,19 @@ describe('App', () => {
     expect(bookmarklet.getAttribute('href')).toContain('/?url=');
     expect(bookmarklet.getAttribute('href')).not.toContain('%27+encodeURIComponent');
   });
+
+  it('shows the OpenAPI spec and included-config links in the more menu', () => {
+    render(<App />);
+
+    fireEvent.click(screen.getByRole('button', { name: 'More' }));
+
+    expect(screen.getByRole('link', { name: 'OpenAPI spec' })).toHaveAttribute(
+      'href',
+      'http://example.test/openapi.yaml'
+    );
+    expect(screen.getByRole('link', { name: 'Included configs' })).toHaveAttribute(
+      'href',
+      'https://html2rss.github.io/web-application/how-to/use-included-configs/'
+    );
+  });
 });

frontend/src/components/App.tsx

@@ -259,6 +259,7 @@ export function App() {
           <UtilityStrip
             hidden={showTokenPrompt}
             hasAccessToken={hasToken}
+            openapiUrl={metadata?.api.openapi_url ?? null}
             onClearToken={() => {
               clearToken();
               setShowTokenPrompt(false);

frontend/src/components/AppPanels.tsx

@@ -244,10 +244,16 @@ export function CreateFeedPanel({
 interface UtilityStripProps {
   hidden?: boolean;
   hasAccessToken: boolean;
+  openapiUrl: string | null;
   onClearToken: () => void;
 }
 
-export function UtilityStrip({ hidden = false, hasAccessToken, onClearToken }: UtilityStripProps) {
+export function UtilityStrip({
+  hidden = false,
+  hasAccessToken,
+  openapiUrl,
+  onClearToken,
+}: UtilityStripProps) {
   const [isOpen, setIsOpen] = useState(false);
 
   if (hidden) return null;
@@ -265,6 +271,19 @@ export function UtilityStrip({ hidden = false, hasAccessToken, onClearToken }: U
       {isOpen && (
         <div class="utility-strip__items">
           <Bookmarklet />
+          {openapiUrl && (
+            <a href={openapiUrl} target="_blank" rel="noopener noreferrer" class="utility-link">
+              OpenAPI spec
+            </a>
+          )}
+          <a
+            href="https://html2rss.github.io/web-application/how-to/use-included-configs/"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="utility-link"
+          >
+            Included configs
+          </a>
           <a
             href="https://github.com/html2rss/html2rss-web"
             target="_blank"

spec/html2rss/web/boot/setup_spec.rb

@@ -2,7 +2,10 @@
 
 require 'spec_helper'
 
-require_relative '../../../../app'
+require_relative '../../../../app/web/boot'
+
+Html2rss::Web::Boot.setup!
+require_relative '../../../../app/web/boot/setup'
 
 RSpec.describe Html2rss::Web::Boot::Setup do
   describe '.call!' do

spec/html2rss/web/feeds/source_resolver_spec.rb

@@ -29,6 +29,7 @@ def resolved_tuple(resolved)
 
       before do
         allow(Html2rss::Web::LocalConfig).to receive(:find).with('legacy').and_return(config)
+        allow(Html2rss::RequestService).to receive(:default_strategy_name).and_return(:browserless)
       end
 
       it 'normalizes the static source into shared generator input', :aggregate_failures do
@@ -39,7 +40,7 @@ def resolved_tuple(resolved)
             :static,
             start_with('static:legacy:'),
             900,
-            include(params: { 'existing' => '1', 'page' => '3' }, strategy: :faraday)
+            include(params: { 'existing' => '1', 'page' => '3' }, strategy: :browserless)
           ]
         )
       end

spec/html2rss/web/local_config_spec.rb

@@ -38,6 +38,20 @@ def self.find_by_name(_name); end
 
       expect(config).to include(channel: { title: 'Apple security releases' })
     end
+
+    it 'returns not found for malformed embedded config paths instead of depending on gem error messages' do
+      stub_const('Html2rss::Configs', Module.new do
+        def self.find_by_name(_name); end
+      end)
+      stub_const('Html2rss::Configs::ConfigNotFound', Class.new(StandardError))
+      allow(Html2rss::Configs).to receive(:find_by_name)
+      allow(described_class).to receive(:snapshot)
+        .and_return(Html2rss::Web::ConfigSnapshot::Snapshot.new(global: {}, feeds: {}, accounts: []))
+
+      expect { described_class.find('/broken-name.rss') }
+        .to raise_error(described_class::NotFound, "Did not find local feed config at 'broken-name'")
+      expect(Html2rss::Configs).not_to have_received(:find_by_name)
+    end
   end
 
   describe '.snapshot' do