feat(deps): use html2rss in latest development status (#728)

* feat(deps): use html2rss in latest development status

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

* refactor: remove facade

Refactored RSS feed handling in app.rb to eliminate the Html2rssFacade.
Merged configuration directly into request handlers, simplifying the feed generation process.
This change enhances performance by reducing method calls and improves readability by consolidating logic.
Removed unused helper files related to the facade, cleaning up the codebase.

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

* test(auto_source): update cache-control header expectation in response test

Adjusted the expected value of the cache-control header in the response test to include 'no-cache' and 'no-store'. This change ensures that the test accurately reflects the intended caching behavior for responses, improving reliability and correctness.

* chore(request_path): remove unused RequestPath class and related specs

This commit deletes the RequestPath class and its corresponding tests, as they are no longer needed in the application. This helps reduce code complexity and maintenance overhead.

* 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]>

* feat(docker): add directories for rack-cache body and meta

Created /app/tmp/rack-cache-body and /app/tmp/rack-cache-meta directories in the Dockerfile to support caching functionality.

* fix: references removed error class

---------

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

Author: gildesmarais

Dockerfile

@@ -57,6 +57,8 @@ RUN apk add --no-cache \
   --no-create-home \
   --uid "$UID" "$USER" \
   && mkdir -p /app \
+  && mkdir -p /app/tmp/rack-cache-body \
+  && mkdir -p /app/tmp/rack-cache-meta \
   && chown "$USER":"$USER" -R /app
 
 WORKDIR /app

Gemfile

@@ -4,7 +4,9 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'html2rss', '~> 0.14'
+# gem 'html2rss', '~> 0.14'
+gem 'html2rss', github: 'html2rss/html2rss'
+
 gem 'html2rss-configs', github: 'html2rss/html2rss-configs'
 
 # Use these instead of the two above (uncomment them) when developing locally:

Gemfile.lock

@@ -84,11 +84,38 @@ def self.development? = ENV['RACK_ENV'] == 'development'
         end
 
         r.on String, String do |folder_name, config_name_with_ext|
-          handle_html2rss_configs(request, folder_name, config_name_with_ext)
+          response['Content-Type'] = CONTENT_TYPE_RSS
+
+          name = "#{folder_name}/#{File.basename(config_name_with_ext, '.*')}"
+          config = Html2rss::Configs.find_by_name(name)
+
+          if (params = request.params).any?
+            config[:params] ||= {}
+            config[:params].merge!(params)
+          end
+
+          feed = Html2rss.feed(config)
+
+          HttpCache.expires(response, feed.channel.ttl.to_i * 60, cache_control: 'public')
+
+          feed.to_s
         end
 
         r.on String do |config_name_with_ext|
-          handle_local_config_feeds(request, config_name_with_ext)
+          response['Content-Type'] = CONTENT_TYPE_RSS
+
+          config = LocalConfig.find(File.basename(config_name_with_ext, '.*'))
+
+          if (params = request.params).any?
+            config[:params] ||= {}
+            config[:params].merge!(params)
+          end
+
+          feed = Html2rss.feed(config)
+
+          HttpCache.expires(response, feed.channel.ttl.to_i * 60, cache_control: 'public')
+
+          feed.to_s
         end
       end
 

app.rb

@@ -15,6 +15,8 @@ module HttpCache
       # @param seconds [Integer]
       # @param cache_control [String, nil]
       def expires(response, seconds, cache_control: nil)
+        expires_now(response) and return if seconds <= 0
+
         response['Expires'] = (Time.now + seconds).httpdate
 
         cache_value = "max-age=#{seconds}"

app/html2rss_facade.rb

@@ -16,6 +16,7 @@ def execute
         response = SsrfFilter.get(ctx.url, headers:)
 
         Html2rss::RequestService::Response.new(body: response.body,
+                                               url: ctx.url,
                                                headers: response.to_hash.transform_values(&:first))
       end
     end

app/http_cache.rb

@@ -16,6 +16,6 @@ feeds:
         selector: "li > div"
       title:
         selector: "h4"
-      link:
+      url:
         selector: "a"
         extractor: "href"

app/request_path.rb

@@ -8,12 +8,10 @@ module Web
     class App
       def handle_error(error) # rubocop:disable Metrics/MethodLength
         case error
-        when Html2rss::Config::ParamsMissing,
+        when Html2rss::Config::DynamicParams::ParamsMissing,
              Roda::RodaPlugins::TypecastParams::Error
           set_error_response('Parameters missing or invalid', 422)
-        when Html2rss::AttributePostProcessors::UnknownPostProcessorName,
-             Html2rss::ItemExtractors::UnknownExtractorName,
-             Html2rss::Config::ChannelMissing
+        when Html2rss::Selectors::PostProcessors::UnknownPostProcessorName
           set_error_response('Invalid feed config', 422)
         when LocalConfig::NotFound,
              Html2rss::Configs::ConfigNotFound