Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

gem 'html2rss', '~> 0.20'
gem 'html2rss', '~> 0.23'
# gem 'html2rss', github: 'html2rss/html2rss', branch: 'master'
gem 'html2rss-configs', github: 'html2rss/html2rss-configs'

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ PLATFORMS
DEPENDENCIES
climate_control
concurrent-ruby
html2rss (~> 0.20)
html2rss (~> 0.23)
html2rss-configs!
irb
parallel
Expand Down
6 changes: 3 additions & 3 deletions app/web/feeds/renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,10 @@ def parse_date(item)
def build_rss(title:, description:, link: nil, items: [], timestamp: nil)
::RSS::Maker.make('2.0') do |maker|
# Apply stylesheets
stylesheets = Html2rss.configuration.stylesheets.map do |s|
Html2rss::RssBuilder::Stylesheet.new(**s)
stylesheets = Html2rss.defaults.stylesheets.map do |s|
Html2rss::FeedBuilder::Rss::Stylesheet.new(**s)
end
Html2rss::RssBuilder::Stylesheet.add(maker, stylesheets)
Html2rss::FeedBuilder::Rss::Stylesheet.add(maker, stylesheets)

# Channel details
now = timestamp || Time.now
Expand Down
6 changes: 1 addition & 5 deletions app/web/feeds/source_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ module Feeds
##
# Resolves static and token-backed requests into shared generator inputs.
module SourceResolver
# Request budget for token-backed auto-source feeds
AUTO_SOURCE_MAX_REQUESTS = 4

class << self
# @param feed_request [Html2rss::Web::Feeds::Contracts::Request]
# @return [Html2rss::Web::Feeds::Contracts::ResolvedSource]
Expand Down Expand Up @@ -134,8 +131,7 @@ def token_generator_input(url, strategy)
base_input.merge(
channel: { url: url },
auto_source: {},
strategy: strategy.to_sym,
request: { max_requests: AUTO_SOURCE_MAX_REQUESTS }
strategy: strategy.to_sym
)
end

Expand Down
2 changes: 1 addition & 1 deletion public/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
openapi: 3.0.3
openapi: 3.2.0

Check failure on line 2 in public/openapi.yaml

View workflow job for this annotation

GitHub Actions / openapi

oas3-schema "openapi" property must match pattern "^3\.0\.\d(-.+)?$".
info:
title: html2rss-web API
version: 1.5.3
Expand Down
4 changes: 2 additions & 2 deletions spec/html2rss/web/feeds/renderer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
end

before do
config_double = instance_double(Html2rss::Config)
allow(Html2rss).to receive(:configuration).and_return(config_double)
config_double = instance_double(Html2rss::Defaults)
allow(Html2rss).to receive(:defaults).and_return(config_double)
allow(config_double).to receive(:stylesheets).and_return([{ href: '/custom.xsl', type: 'text/xsl' }])
end

Expand Down
Loading