source_monitor 0.11.1 → 0.12.0

data/app/controllers/source_monitor/bulk_scrape_enablements_controller.rb

@@ -3,20 +3,14 @@
 module SourceMonitor
   class BulkScrapeEnablementsController < ApplicationController
     def create
-      source_ids = Array(params.dig(:bulk_scrape_enablement, :source_ids)).map(&:to_i).reject(&:zero?)
+      source_ids = enablement_params[:source_ids]
 
       if source_ids.empty?
         handle_empty_selection
         return
       end
 
-      sources = Source.where(id: source_ids, scraping_enabled: false)
-      updated_count = sources.update_all(
-        scraping_enabled: true,
-        auto_scrape: true,
-        scraper_adapter: default_adapter,
-        updated_at: Time.current
-      )
+      updated_count = Source.enable_scraping!(source_ids)
 
       respond_to do |format|
         format.turbo_stream do
@@ -37,8 +31,10 @@ module SourceMonitor
 
     private
 
-    def default_adapter
-      "readability"
+    def enablement_params
+      raw_ids = Array(params.dig(:bulk_scrape_enablement, :source_ids))
+      ids = raw_ids.map(&:to_i).reject(&:zero?)
+      { source_ids: ids }
     end
 
     def handle_empty_selection

data/app/controllers/source_monitor/dashboard_controller.rb

@@ -30,7 +30,11 @@ module SourceMonitor
     private
 
     def schedule_pages_params
-      params.fetch(:schedule_pages, {}).permit!.to_h
+      raw = params.fetch(:schedule_pages, {})
+      return {} unless raw.respond_to?(:permit)
+
+      permitted_keys = raw.keys.select { |k| k.to_s.match?(/\Apage_\d+\z/) }
+      raw.permit(*permitted_keys).to_h
     end
   end
 end

data/app/controllers/source_monitor/import_history_dismissals_controller.rb

@@ -3,7 +3,7 @@
 module SourceMonitor
   class ImportHistoryDismissalsController < ApplicationController
     def create
-      import_history = ImportHistory.find(params[:import_history_id])
+      import_history = ImportHistory.where(user_id: source_monitor_current_user&.id).find(params[:import_history_id])
       import_history.update!(dismissed_at: Time.current)
 
       respond_to do |format|

data/app/controllers/source_monitor/import_sessions_controller.rb

@@ -12,11 +12,30 @@ module SourceMonitor
     include SourceMonitor::ImportSessions::HealthCheckManagement
     include SourceMonitor::ImportSessions::BulkConfiguration
 
+    STEP_HANDLERS = {
+      "upload" => :handle_upload_step,
+      "preview" => :handle_preview_step,
+      "health_check" => :handle_health_check_step,
+      "configure" => :handle_configure_step,
+      "confirm" => :handle_confirm_step
+    }.freeze
+
+    STEP_CONTEXTS = {
+      "preview" => :prepare_preview_context,
+      "health_check" => :prepare_health_check_context,
+      "configure" => :prepare_configure_context,
+      "confirm" => :prepare_confirm_context
+    }.freeze
+
     before_action :ensure_current_user!
     before_action :set_import_session, only: %i[show update destroy]
     before_action :authorize_import_session!, only: %i[show update destroy]
     before_action :set_wizard_step, only: %i[show update]
 
+    # The OPML import wizard requires a persisted ImportSession record to track
+    # state across steps (file upload, preview, health check, configure, confirm).
+    # Visiting "new" immediately creates a session and redirects to the first step,
+    # so there is no separate form -- the wizard IS the form.
     def new
       create
     end
@@ -31,20 +50,15 @@ module SourceMonitor
     end
 
     def show
-      prepare_preview_context if @current_step == "preview"
-      prepare_health_check_context if @current_step == "health_check"
-      prepare_configure_context if @current_step == "configure"
-      prepare_confirm_context if @current_step == "confirm"
+      context_method = STEP_CONTEXTS[@current_step]
+      send(context_method) if context_method
       persist_step!
       render :show
     end
 
     def update
-      return handle_upload_step if @current_step == "upload"
-      return handle_preview_step if @current_step == "preview"
-      return handle_health_check_step if @current_step == "health_check"
-      return handle_configure_step if @current_step == "configure"
-      return handle_confirm_step if @current_step == "confirm"
+      handler = STEP_HANDLERS[@current_step]
+      return send(handler) if handler
 
       @import_session.update!(session_attributes)
       @current_step = target_step
@@ -245,6 +259,13 @@ module SourceMonitor
         return @fallback_user_id
       end
 
+      # Only create guest users in development/test. An engine should never
+      # create records in host-app tables in production.
+      unless Rails.env.local?
+        @fallback_user_id = nil
+        return @fallback_user_id
+      end
+
       @fallback_user_id = create_guest_user&.id
     rescue StandardError
       @fallback_user_id = nil

data/app/controllers/source_monitor/item_scrapes_controller.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module SourceMonitor
+  class ItemScrapesController < ApplicationController
+    include ActionView::RecordIdentifier
+
+    before_action :set_item
+
+    def create
+      log_manual_scrape("controller:start", extra: { format: request.format })
+
+      enqueue_result = SourceMonitor::Scraping::Enqueuer.enqueue(item: @item, reason: :manual)
+      log_manual_scrape("controller:enqueue_result", extra: { status: enqueue_result.status, message: enqueue_result.message })
+      flash_key, flash_message = scrape_flash_payload(enqueue_result)
+      status = enqueue_result.failure? ? :unprocessable_entity : :ok
+
+      respond_to do |format|
+        format.turbo_stream do
+          responder = SourceMonitor::TurboStreams::StreamResponder.new
+
+          if enqueue_result.enqueued? || enqueue_result.already_enqueued?
+            @item.reload
+            responder.replace_details(
+              @item,
+              partial: "source_monitor/items/details_wrapper",
+              locals: { item: @item }
+            )
+          end
+
+          if flash_message
+            level = flash_key == :notice ? :info : :error
+            responder.toast(message: flash_message, level:, delay_ms: toast_delay_for(level))
+          end
+
+          render turbo_stream: responder.render(view_context), status: status
+        end
+
+        format.html do
+          if flash_key && flash_message
+            redirect_to source_monitor.item_path(@item), flash: { flash_key => flash_message }
+          else
+            redirect_to source_monitor.item_path(@item)
+          end
+        end
+      end
+    end
+
+    private
+
+    def set_item
+      @item = Item.active.includes(:source, :item_content).find(params[:item_id])
+    end
+
+    def scrape_flash_payload(result)
+      case result.status
+      when :enqueued
+        [ :notice, "Scrape has been enqueued and will run shortly." ]
+      when :already_enqueued
+        [ :notice, result.message ]
+      else
+        [ :alert, result.message || "Unable to enqueue scrape for this item." ]
+      end
+    end
+
+    def log_manual_scrape(stage, extra: {})
+      payload = { stage:, item_id: @item&.id }.merge(extra.compact)
+      Rails.logger.info("[SourceMonitor::ManualScrape] #{payload.to_json}")
+    end
+  end
+end

data/app/controllers/source_monitor/items_controller.rb

@@ -10,7 +10,7 @@ module SourceMonitor
     PER_PAGE = 25
     SEARCH_FIELD = :title_or_summary_or_url_or_source_name_cont
 
-    before_action :set_item, only: %i[show scrape]
+    before_action :set_item, only: :show
     before_action :load_scrape_context, only: :show
 
     def index
@@ -24,6 +24,7 @@ module SourceMonitor
         per_page: PER_PAGE
       ).paginate
 
+      @paginator = paginator
       @items = paginator.records
       @page = paginator.page
       @has_next_page = paginator.has_next_page
@@ -36,54 +37,6 @@ module SourceMonitor
     def show
     end
 
-    # TODO: Extract to ItemScrapesController (CRUD-only convention).
-    # Deferred to avoid view/route churn in a cleanup phase.
-    def scrape
-      log_manual_scrape("controller:start", item: @item, extra: { format: request.format })
-
-      enqueue_result = SourceMonitor::Scraping::Enqueuer.enqueue(item: @item, reason: :manual)
-      log_manual_scrape(
-        "controller:enqueue_result",
-        item: @item,
-        extra: { status: enqueue_result.status, message: enqueue_result.message }
-      )
-      flash_key, flash_message = scrape_flash_payload(enqueue_result)
-      status = enqueue_result.failure? ? :unprocessable_entity : :ok
-
-      respond_to do |format|
-        format.turbo_stream do
-          log_manual_scrape("controller:respond_turbo", item: @item, extra: { status: status })
-
-          responder = SourceMonitor::TurboStreams::StreamResponder.new
-
-          if enqueue_result.enqueued? || enqueue_result.already_enqueued?
-            @item.reload
-            responder.replace_details(
-              @item,
-              partial: "source_monitor/items/details_wrapper",
-              locals: { item: @item }
-            )
-          end
-
-          if flash_message
-            level = flash_key == :notice ? :info : :error
-            responder.toast(message: flash_message, level:, delay_ms: toast_delay_for(level))
-          end
-
-          render turbo_stream: responder.render(view_context), status: status
-        end
-
-        format.html do
-          log_manual_scrape("controller:respond_html", item: @item)
-          if flash_key && flash_message
-            redirect_to source_monitor.item_path(@item), flash: { flash_key => flash_message }
-          else
-            redirect_to source_monitor.item_path(@item)
-          end
-        end
-      end
-    end
-
     private
 
     def set_item
@@ -94,25 +47,5 @@ module SourceMonitor
       @recent_scrape_logs = @item.scrape_logs.order(started_at: :desc).limit(5)
       @latest_scrape_log = @recent_scrape_logs.first
     end
-
-    def scrape_flash_payload(result)
-      case result.status
-      when :enqueued
-        [ :notice, "Scrape has been enqueued and will run shortly." ]
-      when :already_enqueued
-        [ :notice, result.message ]
-      else
-        [ :alert, result.message || "Unable to enqueue scrape for this item." ]
-      end
-    end
-
-    def log_manual_scrape(stage, item:, extra: {})
-      return unless defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
-
-      payload = { stage:, item_id: item&.id }.merge(extra.compact)
-      Rails.logger.info("[SourceMonitor::ManualScrape] #{payload.to_json}")
-    rescue StandardError
-      nil
-    end
   end
 end

data/app/controllers/source_monitor/source_bulk_scrapes_controller.rb

@@ -3,6 +3,7 @@
 module SourceMonitor
   class SourceBulkScrapesController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
 
     ITEMS_PREVIEW_LIMIT = SourceMonitor::Scraping::BulkSourceScraper::DEFAULT_PREVIEW_LIMIT
 
@@ -24,10 +25,6 @@ module SourceMonitor
 
     private
 
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
-
     def bulk_scrape_params
       params.fetch(:bulk_scrape, {}).permit(:selection)
     end

data/app/controllers/source_monitor/source_favicon_fetches_controller.rb

@@ -3,6 +3,7 @@
 module SourceMonitor
   class SourceFaviconFetchesController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
 
     before_action :set_source
 
@@ -16,23 +17,12 @@ module SourceMonitor
       end
 
       # Clear cooldown so the job doesn't skip this attempt
-      clear_favicon_cooldown(@source)
+      @source.clear_favicon_cooldown!
 
       SourceMonitor::FaviconFetchJob.perform_later(@source.id)
       render_fetch_enqueue_response("Favicon fetch has been enqueued.")
     rescue StandardError => error
       handle_fetch_failure(error, prefix: "Favicon fetch")
     end
-
-    private
-
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
-
-    def clear_favicon_cooldown(source)
-      metadata = (source.metadata || {}).except("favicon_last_attempted_at")
-      source.update_column(:metadata, metadata)
-    end
   end
 end

data/app/controllers/source_monitor/source_fetches_controller.rb

@@ -3,6 +3,7 @@
 module SourceMonitor
   class SourceFetchesController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
 
     before_action :set_source
 
@@ -12,11 +13,5 @@ module SourceMonitor
     rescue StandardError => error
       handle_fetch_failure(error)
     end
-
-    private
-
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
   end
 end

data/app/controllers/source_monitor/source_health_checks_controller.rb

@@ -3,6 +3,14 @@
 module SourceMonitor
   class SourceHealthChecksController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
+
+    PROCESSING_BADGE = {
+      label: "Processing",
+      classes: "bg-blue-100 text-blue-700",
+      show_spinner: true,
+      status: "processing"
+    }.freeze
 
     before_action :set_source
 
@@ -10,25 +18,10 @@ module SourceMonitor
       SourceMonitor::SourceHealthCheckJob.perform_later(@source.id)
       render_fetch_enqueue_response(
         "Health check enqueued",
-        health_status_override: processing_badge
+        health_status_override: PROCESSING_BADGE
       )
     rescue StandardError => error
       handle_fetch_failure(error, prefix: "Health check")
     end
-
-    private
-
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
-
-    def processing_badge
-      {
-        label: "Processing",
-        classes: "bg-blue-100 text-blue-700",
-        show_spinner: true,
-        status: "processing"
-      }
-    end
   end
 end

data/app/controllers/source_monitor/source_health_resets_controller.rb

@@ -3,6 +3,7 @@
 module SourceMonitor
   class SourceHealthResetsController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
 
     before_action :set_source
 
@@ -17,11 +18,5 @@ module SourceMonitor
     rescue StandardError => error
       handle_fetch_failure(error, prefix: "Health reset")
     end
-
-    private
-
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
   end
 end

data/app/controllers/source_monitor/source_retries_controller.rb

@@ -3,6 +3,7 @@
 module SourceMonitor
   class SourceRetriesController < ApplicationController
     include SourceMonitor::SourceTurboResponses
+    include SourceMonitor::SetSource
 
     before_action :set_source
 
@@ -20,11 +21,5 @@ module SourceMonitor
     rescue StandardError => error
       handle_fetch_failure(error)
     end
-
-    private
-
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
   end
 end

data/app/controllers/source_monitor/source_scrape_tests_controller.rb

@@ -2,6 +2,8 @@
 
 module SourceMonitor
   class SourceScrapeTestsController < ApplicationController
+    include SourceMonitor::SetSource
+
     before_action :set_source
 
     def create
@@ -38,10 +40,6 @@ module SourceMonitor
 
     private
 
-    def set_source
-      @source = Source.find(params[:source_id])
-    end
-
     def pick_test_item
       @source.items
              .joins(:item_content)

data/app/controllers/source_monitor/source_turbo_responses.rb

@@ -107,9 +107,7 @@ module SourceMonitor
     end
 
     def bulk_scrape_flash_payload(result)
-      pluralizer = ->(count, word) { view_context.pluralize(count, word) }
-      presenter = SourceMonitor::Scraping::BulkResultPresenter.new(result:, pluralizer:)
-      presenter.to_flash_payload
+      SourceMonitor::Scraping::BulkResultPresenter.new(result:).to_flash_payload
     end
   end
 end

data/app/controllers/source_monitor/sources_controller.rb

@@ -48,20 +48,22 @@ module SourceMonitor
       @item_activity_rates = metrics.item_activity_rates
 
       source_ids = @sources.map(&:id)
-      if source_ids.any?
-        base = ItemContent.joins(:item).where(sourcemon_items: { source_id: source_ids })
-        @avg_feed_word_counts = base.where.not(feed_word_count: nil)
-                                    .group("sourcemon_items.source_id")
-                                    .average(:feed_word_count)
-        @avg_scraped_word_counts = base.where.not(scraped_word_count: nil)
-                                      .group("sourcemon_items.source_id")
-                                      .average(:scraped_word_count)
-      else
-        @avg_feed_word_counts = {}
-        @avg_scraped_word_counts = {}
-      end
+      word_counts = metrics.word_count_averages(source_ids)
+      @avg_feed_word_counts = word_counts[:feed]
+      @avg_scraped_word_counts = word_counts[:scraped]
 
       @scrape_candidate_ids = compute_scrape_candidate_ids
+
+      # Row partial preload requirements (V3): item_activity_rates,
+      # avg_feed_word_counts, avg_scraped_word_counts are pre-computed above
+      # and passed as locals to avoid N+1 queries in _row.html.erb.
+      adapter_options = Source.distinct.where.not(scraper_adapter: [ nil, "" ]).order(:scraper_adapter).pluck(:scraper_adapter)
+      @filter_presenter = SourceMonitor::SourcesFilterPresenter.new(
+        search_params: @search_params,
+        search_term: @search_term,
+        fetch_interval_filter: @fetch_interval_filter,
+        adapter_options: adapter_options
+      )
     end
 
     def show
@@ -131,7 +133,7 @@ module SourceMonitor
             search_params:
           )
 
-          redirect_location = safe_redirect_path(params[:redirect_to])
+          redirect_location = SourceMonitor::Security::ParameterSanitizer.safe_redirect_path(params[:redirect_to])
 
           responder = SourceMonitor::TurboStreams::StreamResponder.new
           presenter = SourceMonitor::Sources::TurboStreamPresenter.new(source: @source, responder:)
@@ -168,13 +170,6 @@ module SourceMonitor
       SourceMonitor::Sources::Params.sanitize(params)
     end
 
-    def safe_redirect_path(raw_value)
-      return if raw_value.blank?
-
-      sanitized = SourceMonitor::Security::ParameterSanitizer.sanitize(raw_value.to_s)
-      sanitized.start_with?("/") ? sanitized : nil
-    end
-
     def handle_destroy_failure(search_params, error_message)
       respond_to do |format|
         format.turbo_stream do

data/app/helpers/source_monitor/application_helper.rb

@@ -35,6 +35,16 @@ module SourceMonitor
       end
     end
 
+    def compact_blank_hash(hash)
+      return {} if hash.blank?
+
+      if hash.respond_to?(:compact_blank)
+        hash.compact_blank
+      else
+        hash.reject { |_key, value| value.respond_to?(:blank?) ? value.blank? : value.nil? }
+      end
+    end
+
     def fetch_interval_bucket_path(bucket, search_params, selected: false)
       query = fetch_interval_bucket_query(bucket, search_params, selected: selected)
       route_helpers = SourceMonitor::Engine.routes.url_helpers
@@ -62,11 +72,7 @@ module SourceMonitor
         updated
       end
 
-      if query.respond_to?(:compact_blank)
-        query.compact_blank
-      else
-        query.reject { |_key, value| value.respond_to?(:blank?) ? value.blank? : value.nil? }
-      end
+      compact_blank_hash(query)
     end
 
     def fetch_interval_filter_label(bucket, filter)
@@ -181,18 +187,10 @@ module SourceMonitor
       async_status_badge(status)
     end
 
-    # Helper to render the loading spinner SVG
+    # Helper to render the loading spinner SVG via IconComponent.
+    # Accepts a custom css_class to override the default spinner styling.
     def loading_spinner_svg(css_class: "mr-1 h-4 w-4 animate-spin text-blue-500")
-      tag.svg(
-        class: css_class,
-        xmlns: "http://www.w3.org/2000/svg",
-        fill: "none",
-        viewBox: "0 0 24 24",
-        aria: { hidden: "true" }
-      ) do
-        concat tag.circle(class: "opacity-25", cx: "12", cy: "12", r: "10", stroke: "currentColor", stroke_width: "4")
-        concat tag.path(class: "opacity-75", fill: "currentColor", d: "M4 12a8 8 0 0 1 8-8v4a4 4 0 0 0-4 4H4z")
-      end
+      render SourceMonitor::IconComponent.new(:spinner, size: nil, css_class: css_class)
     end
 
     def formatted_setting_value(value)
@@ -276,21 +274,7 @@ module SourceMonitor
     private
 
     def external_link_icon
-      tag.svg(
-        class: "inline-block h-3 w-3 text-slate-400",
-        xmlns: "http://www.w3.org/2000/svg",
-        fill: "none",
-        viewBox: "0 0 24 24",
-        stroke_width: "2",
-        stroke: "currentColor",
-        aria: { hidden: "true" }
-      ) do
-        tag.path(
-          stroke_linecap: "round",
-          stroke_linejoin: "round",
-          d: "M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"
-        )
-      end
+      render SourceMonitor::IconComponent.new(:external_link, size: nil, css_class: "inline-block h-3 w-3 text-slate-400")
     end
 
     def derive_item_scrape_status(item:, source: nil)

data/app/helpers/source_monitor/health_badge_helper.rb

@@ -40,6 +40,14 @@ module SourceMonitor
             path: helpers.source_health_check_path(source),
             method: :post,
             data: { testid: "source-health-action-health_check" }
+          },
+          {
+            key: :reset,
+            label: "Reset to Active Status",
+            description: "Clears failure count, backoff timers, and auto-pause state so the source resumes normal fetching.",
+            path: helpers.source_health_reset_path(source),
+            method: :post,
+            data: { testid: "source-health-action-reset" }
           }
         ]
       else