source_monitor 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6bd1ceac36f485b9a9dffbd4c9665082496268093ff999b4d80ce21e973c904
-  data.tar.gz: 613a81d29bf56f6206a65299fc0784fc79e4137434dedbc6ae0d49dcde73d881
+  metadata.gz: c9f29bb075dfefc28a290e718ca9e983b489e7b62e5c8654778bb3c4c0c8df91
+  data.tar.gz: e404576eb8a66613e653257216039a4b67eef5b1d8614bc22742396b0b5014cb
 SHA512:
-  metadata.gz: bfa2c1455721d08030777b3aaf93db2440716d93102e5ae1464ed63d6f4da8d38024af56f76b2fb263c902d3a0ca7ce4e53955a97686baaa42539cd9e3be6dd7
-  data.tar.gz: 1540e2e2595f91e4aec25c6772cdc54dc6a1636dd5d605874b0afe05f2ca6773e1adfb4e06df25df9343d69a9b3c2d6501b66aa29525a7413e2d71de24ae9fbb
+  metadata.gz: b91d1d3f7d0b9f5f12612e8764b423b2be5a164aa3a52abe7c3ce48e587891b2f45b37ed281a5dd70e14ca3735c0abc2c89427c1f450900f9fa3650a052b08f1
+  data.tar.gz: cbe4936aa544c0a345b803ef8ffb11ff69b3237676f4ce34cdddf06259855c0150569cef5ca400f939044387466f36ba5bc0c41b18d712ebd4d7e54afd95cbd4

data/.claude/skills/sm-job/reference/job-conventions.md

@@ -58,13 +58,14 @@ The most complex job, demonstrating retry strategy integration:
 
 ```ruby
 class FetchFeedJob < ApplicationJob
-  FETCH_CONCURRENCY_RETRY_WAIT = 30.seconds
+  FETCH_CONCURRENCY_BASE_WAIT = 30.seconds
+  FETCH_CONCURRENCY_MAX_WAIT = 5.minutes
   EARLY_EXECUTION_LEEWAY = 30.seconds
 
   source_monitor_queue :fetch
 
   discard_on ActiveJob::DeserializationError
-  retry_on FetchRunner::ConcurrencyError, wait: 30.seconds, attempts: 5
+  # ConcurrencyError: exponential backoff (30s * 2^attempt) with 25% jitter, discards after 5 attempts
 
   def perform(source_id, force: false)
     source = Source.find_by(id: source_id)

data/.claude/skills/sm-upgrade/reference/version-history.md

@@ -2,6 +2,19 @@
 
 Version-specific migration notes for each major/minor version transition. Agents should reference this file when guiding users through multi-version upgrades.
 
+## 0.12.3 to 0.12.4
+
+**Key changes:**
+- Bug fix: ScrapeItemJob with_lock compatibility (assign_attributes → reload)
+- Bug fix: FetchFeedJob advisory lock exponential backoff + graceful discard
+- Bug fix: OPML import dismissal (all instead of latest only)
+- Bug fix: Dashboard pagination regex for group keys
+- Bug fix: Filter dropdown Stimulus controller declaration
+
+**Action items:**
+1. `bundle update source_monitor`
+2. No migrations, config changes, or breaking changes.
+
 ## 0.12.2 to 0.12.3
 
 **Key changes:**

data/CHANGELOG.md

@@ -15,6 +15,15 @@ All notable changes to this project are documented below. The format follows [Ke
 
 - No unreleased changes yet.
 
+## [0.12.4] - 2026-03-17
+
+### Fixed
+- ScrapeItemJob failing with "Locking a record with unpersisted changes" on Rails 8.1.2 — replaced `assign_attributes` with `reload` in scraping state machine
+- FetchFeedJob permanently failing on advisory lock contention — switched to exponential backoff with jitter and graceful discard on exhaustion
+- OPML import dismissal only hiding the latest notification — now dismisses all undismissed import histories for the user
+- Dashboard pagination not working — schedule group keys were silently dropped by overly restrictive param whitelist regex
+- Source filter dropdowns not auto-submitting — missing `filter-submit` Stimulus controller declaration on search forms (also fixed on logs index)
+
 ## [0.12.3] - 2026-03-16
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    source_monitor (0.12.3)
+    source_monitor (0.12.4)
       cssbundling-rails (~> 1.4)
       faraday (~> 2.9)
       faraday-follow_redirects (~> 0.4)

data/README.md

@@ -9,8 +9,8 @@ SourceMonitor is a production-ready Rails 8 mountable engine for ingesting, norm
 In your host Rails app:
 
 ```bash
-bundle add source_monitor --version "~> 0.12.3"
-# or add `gem "source_monitor", "~> 0.12.3"` manually, then run:
+bundle add source_monitor --version "~> 0.12.4"
+# or add `gem "source_monitor", "~> 0.12.4"` manually, then run:
 bundle install
 ```
 
@@ -46,7 +46,7 @@ This exposes `bin/source_monitor` (via Bundler binstubs) so you can run the guid
 Before running any SourceMonitor commands inside your host app, add the gem and install dependencies:
 
 ```bash
-bundle add source_monitor --version "~> 0.12.3"
+bundle add source_monitor --version "~> 0.12.4"
 # or edit your Gemfile, then run
 bundle install
 ```

data/VERSION

@@ -1 +1 @@
-0.12.3
+0.12.4

data/app/controllers/source_monitor/dashboard_controller.rb

@@ -33,7 +33,7 @@ module SourceMonitor
       raw = params.fetch(:schedule_pages, {})
       return {} unless raw.respond_to?(:permit)
 
-      permitted_keys = raw.keys.select { |k| k.to_s.match?(/\Apage_\d+\z/) }
+      permitted_keys = raw.keys.select { |k| k.to_s.match?(/\A[\d+\-]+\z/) }
       raw.permit(*permitted_keys).to_h
     end
   end

data/app/controllers/source_monitor/import_history_dismissals_controller.rb

@@ -3,8 +3,11 @@
 module SourceMonitor
   class ImportHistoryDismissalsController < ApplicationController
     def create
-      import_history = ImportHistory.where(user_id: source_monitor_current_user&.id).find(params[:import_history_id])
-      import_history.update!(dismissed_at: Time.current)
+      user_id = source_monitor_current_user&.id
+      # Verify the specified import history belongs to this user (authorization check)
+      ImportHistory.where(user_id: user_id).find(params[:import_history_id])
+      # Dismiss all undismissed import histories for this user so older ones don't resurface
+      ImportHistory.where(user_id: user_id).not_dismissed.update_all(dismissed_at: Time.current)
 
       respond_to do |format|
         format.turbo_stream do

data/app/jobs/source_monitor/fetch_feed_job.rb

@@ -2,7 +2,8 @@
 
 module SourceMonitor
   class FetchFeedJob < ApplicationJob
-    FETCH_CONCURRENCY_RETRY_WAIT = 30.seconds
+    FETCH_CONCURRENCY_BASE_WAIT = 30.seconds
+    FETCH_CONCURRENCY_MAX_WAIT = 5.minutes
     EARLY_EXECUTION_LEEWAY = 30.seconds
 
     source_monitor_queue :fetch
@@ -39,13 +40,33 @@ module SourceMonitor
       else
         attempt = executions
         if attempt < SCHEDULED_CONCURRENCY_MAX_ATTEMPTS
-          retry_job wait: FETCH_CONCURRENCY_RETRY_WAIT
+          retry_job wait: concurrency_backoff_wait(attempt)
         else
-          raise error
+          log_concurrency_exhausted
+          @source&.update_columns(fetch_status: "idle") if @source&.fetch_status == "queued"
         end
       end
     end
 
+    def concurrency_backoff_wait(attempt)
+      base = FETCH_CONCURRENCY_BASE_WAIT.to_i
+      exponential = base * (2**attempt)
+      capped = [ exponential, FETCH_CONCURRENCY_MAX_WAIT.to_i ].min
+      jitter = rand(0..(capped * 0.25).to_i)
+      (capped + jitter).seconds
+    end
+
+    def log_concurrency_exhausted
+      return unless defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+
+      Rails.logger.info(
+        "[SourceMonitor::FetchFeedJob] Concurrency retries exhausted for source #{@source_id}, " \
+        "discarding (another worker is fetching this source)"
+      )
+    rescue StandardError
+      nil
+    end
+
     def log_force_fetch_skipped
       return unless defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
 

data/app/views/source_monitor/logs/index.html.erb

@@ -52,7 +52,7 @@
     </div>
   </div>
 
-  <%= form_with url: source_monitor.logs_path, method: :get, html: { class: "rounded-lg border border-slate-200 bg-white p-4 shadow-sm", data: { turbo_frame: "source_monitor_logs" } } do |form| %>
+  <%= form_with url: source_monitor.logs_path, method: :get, html: { class: "rounded-lg border border-slate-200 bg-white p-4 shadow-sm", data: { turbo_frame: "source_monitor_logs", controller: "filter-submit" } } do |form| %>
     <%= form.hidden_field :status, value: @filter_set.status %>
     <%= form.hidden_field :log_type, value: @filter_set.log_type %>
 

data/app/views/source_monitor/sources/index.html.erb

@@ -19,7 +19,7 @@
         selected_bucket: @selected_fetch_interval_bucket,
         search_params: @search_params %>
 
-  <%= search_form_for @q, url: source_monitor.sources_path, method: :get, html: { class: "flex flex-wrap items-end gap-3", data: { turbo_frame: "source_monitor_sources_table" } } do |form| %>
+  <%= search_form_for @q, url: source_monitor.sources_path, method: :get, html: { class: "flex flex-wrap items-end gap-3", data: { turbo_frame: "source_monitor_sources_table", controller: "filter-submit" } } do |form| %>
     <div class="flex-1 min-w-[12rem]">
       <%= form.label @search_field, "Search sources", class: "sr-only" %>
       <div class="flex rounded-md shadow-sm">

data/docs/setup.md

@@ -18,8 +18,8 @@ This guide consolidates the new guided installer, verification commands, and rol
 Run these commands inside your host Rails application before invoking the guided workflow:
 
 ```bash
-bundle add source_monitor --version "~> 0.12.3"
-# or add gem "source_monitor", "~> 0.12.3" to Gemfile manually
+bundle add source_monitor --version "~> 0.12.4"
+# or add gem "source_monitor", "~> 0.12.4" to Gemfile manually
 bundle install
 ```
 

data/docs/upgrade.md

@@ -69,6 +69,24 @@ bin/rails db:migrate
 - New ViewComponents and presenters are available for custom view integration but are not required by default templates.
 - `Item#restore!` is the symmetric counterpart to `soft_delete!` — it clears `deleted_at` and increments the source `items_count` counter cache.
 
+### Upgrading to 0.12.4
+
+**What changed:**
+- Bug fix: ScrapeItemJob Rails 8.1.2 with_lock compatibility (assign_attributes → reload)
+- Bug fix: FetchFeedJob exponential backoff for advisory lock contention
+- Bug fix: OPML import dismissal now dismisses all undismissed histories
+- Bug fix: Dashboard pagination regex for schedule group keys
+- Bug fix: Source/logs filter dropdowns auto-submit via Stimulus controller
+
+**Upgrade steps:**
+```bash
+bundle update source_monitor
+```
+
+**Notes:**
+- No breaking changes, migrations, or configuration changes required.
+- Patch fix release.
+
 ### Upgrading to 0.12.3
 
 **What changed:**

data/lib/source_monitor/scraping/state.rb

@@ -32,7 +32,7 @@ module SourceMonitor
           next unless in_flight?(record.scrape_status)
 
           record.update_columns(scrape_status: nil)
-          record.assign_attributes(scrape_status: nil)
+          record.reload
         end
 
         broadcast_item(item) if broadcast
@@ -48,7 +48,7 @@ module SourceMonitor
         with_item(item, lock:) do |record|
           attributes = { scrape_status: status }.merge(extra.compact)
           record.update_columns(attributes)
-          record.assign_attributes(attributes)
+          record.reload
         end
 
         broadcast_item(item) if broadcast

data/lib/source_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SourceMonitor
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: source_monitor
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - dchuk