good_job 3.12.6 → 3.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c529a4f3811213bcf4d534c3fc5c096cac64b944db891eedadd5b553ea77aae3
-  data.tar.gz: fc88a86278de2dd445e463a84f8a1934bc281c976dc585c7db549e5c57ff97ba
+  metadata.gz: 92bd0503979e96fb9119be0be1afd74b7be8594a3c377026c06ea55dcb26a3ee
+  data.tar.gz: fedebf29ee5a4100414367687958e6c8cfcc1bce938618344466bf86e454aacc
 SHA512:
-  metadata.gz: d5b076dccfa450de8256870ba502c1f65f8c84fcdd9921772176afe04f1ccc57bd65fd215d46cb6a6c3be8c32570d9e271cbd45b73abdc247c64ef593edab64d
-  data.tar.gz: c243bf54c98d38fe92fa62f104074582968dc757e65f3df611877307b2068d0126d837450745da60a20a80901b52a27af64302694e117c763d268fa3535ed6e5
+  metadata.gz: 3eb60ccb026da7584b87968cd89bf1df4fc763c208271d4cde46c3c831ac8887cec7eb10f607ebfb57d1c790ec0529683fb578f6bf094809d0fc43ebaf8c3c06
+  data.tar.gz: 425dd0a42e51c79710589948c0b99e9a148e31d524265772c4e931c9b610a7fa2bc0de0123ca8038afab42abf85e22f9083f76a151837608f0e07327aef8796a

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [v3.12.8](https://github.com/bensheldon/good_job/tree/v3.12.8) (2023-03-06)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.7...v3.12.8)
+
+**Fixed bugs:**
+
+- Add `raise: false` to FrontendsController after action skip [\#881](https://github.com/bensheldon/good_job/pull/881) ([simi](https://github.com/simi))
+
+**Closed issues:**
+
+- GoodJob's JavaScript takes precedence over application's JavaScript in GoodJob 3.12.6, Rails 7 [\#873](https://github.com/bensheldon/good_job/issues/873)
+
+**Merged pull requests:**
+
+- Rewrite flaky tests: don't allow nil timeout for restart [\#872](https://github.com/bensheldon/good_job/pull/872) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.12.7](https://github.com/bensheldon/good_job/tree/v3.12.7) (2023-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.6...v3.12.7)
+
+**Fixed bugs:**
+
+- Rename "assets" to "frontends" to avoid Asset Pipeline collisions [\#874](https://github.com/bensheldon/good_job/pull/874) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.12.6](https://github.com/bensheldon/good_job/tree/v3.12.6) (2023-03-01)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.5...v3.12.6)
@@ -146,7 +170,7 @@
 
 **Closed issues:**
 
-- Support for Ruby 3.2 [\#785](https://github.com/bensheldon/good_job/issues/785)
+- Support for Rails 6.1 / Ruby 3.2 [\#785](https://github.com/bensheldon/good_job/issues/785)
 - Custom table names [\#748](https://github.com/bensheldon/good_job/issues/748)
 - Health check issue with cron scheduler job [\#741](https://github.com/bensheldon/good_job/issues/741)
 

data/app/controllers/good_job/frontends_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module GoodJob
+  class FrontendsController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    skip_after_action :verify_same_origin_request, raise: false
+
+    STATIC_ASSETS = {
+      css: {
+        bootstrap: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "bootstrap", "bootstrap.min.css"),
+        style: GoodJob::Engine.root.join("app", "frontend", "good_job", "style.css"),
+      },
+      js: {
+        bootstrap: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "bootstrap", "bootstrap.bundle.min.js"),
+        chartjs: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "chartjs", "chart.min.js"),
+        es_module_shims: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "es_module_shims.js"),
+        rails_ujs: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "rails_ujs.js"),
+      },
+    }.freeze
+
+    MODULE_OVERRIDES = {
+      application: GoodJob::Engine.root.join("app", "frontend", "good_job", "application.js"),
+      stimulus: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "stimulus.js"),
+    }.freeze
+
+    def self.js_modules
+      @_js_modules ||= GoodJob::Engine.root.join("app", "frontend", "good_job", "modules").children.select(&:file?).each_with_object({}) do |file, modules|
+        key = File.basename(file.basename.to_s, ".js").to_sym
+        modules[key] = file
+      end.merge(MODULE_OVERRIDES)
+    end
+
+    before_action do
+      expires_in 1.year, public: true
+    end
+
+    def static
+      render file: STATIC_ASSETS.dig(params[:format].to_sym, params[:name].to_sym) || raise(ActionController::RoutingError, 'Not Found')
+    end
+
+    def module
+      raise(ActionController::RoutingError, 'Not Found') if params[:format] != "js"
+
+      render file: self.class.js_modules[params[:name].to_sym] || raise(ActionController::RoutingError, 'Not Found')
+    end
+  end
+end

data/app/views/layouts/good_job/application.html.erb

@@ -8,15 +8,15 @@
   <%= csp_meta_tag %>
 
   <%# Do not use asset tag helpers to avoid paths being overriden by config.asset_host %>
-  <%= tag.link rel: "stylesheet", href: static_asset_path(:bootstrap, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.link rel: "stylesheet", href: static_asset_path(:style, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
 
-  <%= tag.script "", src: static_asset_path(:bootstrap, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.script "", src: static_asset_path(:chartjs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.script "", src: static_asset_path(:rails_ujs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: frontend_static_path(:bootstrap, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: frontend_static_path(:chartjs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: frontend_static_path(:rails_ujs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
 
-  <%= tag.script "", src: static_asset_path(:es_module_shims, format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
-  <% importmaps = GoodJob::AssetsController.js_modules.keys.index_with { |module_name| module_asset_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } %>
+  <%= tag.script "", src: frontend_static_path(:es_module_shims, format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
+  <% importmaps = GoodJob::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } %>
   <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
   <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>
 </head>

data/config/routes.rb

@@ -27,8 +27,8 @@ GoodJob::Engine.routes.draw do
 
   resources :processes, only: %i[index]
 
-  scope :assets, controller: :assets do
-    get "modules/:name", action: :module, as: :module_asset, constraints: { format: 'js' }
-    get "static/:name", action: :static, as: :static_asset, constraints: { format: %w[css js] }
+  scope :frontend, controller: :frontends do
+    get "modules/:name", action: :module, as: :frontend_module, constraints: { format: 'js' }
+    get "static/:name", action: :static, as: :frontend_static, constraints: { format: %w[css js] }
   end
 end

data/lib/good_job/capsule.rb

@@ -55,9 +55,11 @@ module GoodJob
     end
 
     # Shutdown and then start the capsule again.
-    # @param timeout [nil, Numeric, Symbol] Seconds to wait for active threads.
+    # @param timeout [Numeric, Symbol] Seconds to wait for active threads.
     # @return [void]
     def restart(timeout: :default)
+      raise ArgumentError, "Capsule#restart cannot be called with a timeout of nil" if timeout.nil?
+
       shutdown(timeout: timeout)
       start
     end

data/lib/good_job/scheduler.rb

@@ -132,11 +132,13 @@ module GoodJob # :nodoc:
 
     # Restart the Scheduler.
     # When shutdown, start; or shutdown and start.
-    # @param timeout [nil, Numeric] Seconds to wait for actively executing jobs to finish; shares same values as {#shutdown}.
+    # @param timeout [Numeric] Seconds to wait for actively executing jobs to finish; shares same values as {#shutdown}.
     # @return [void]
     def restart(timeout: -1)
+      raise ArgumentError, "Scheduler#restart cannot be called with a timeout of nil" if timeout.nil?
+
       instrument("scheduler_restart_pools") do
-        shutdown(timeout: timeout) if running?
+        shutdown(timeout: timeout)
         create_executor
         warm_cache
       end

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.12.6'
+  VERSION = '3.12.8'
 end

data/lib/good_job.rb

@@ -131,7 +131,7 @@ module GoodJob
   # When forking processes you should shut down these background threads before forking, and restart them after forking.
   # For example, you should use +shutdown+ and +restart+ when using async execution mode with Puma.
   # See the {file:README.md#executing-jobs-async--in-process} for more explanation and examples.
-  # @param timeout [Numeric, nil] Seconds to wait for active threads to finish.
+  # @param timeout [Numeric] Seconds to wait for active threads to finish.
   # @return [void]
   def self.restart(timeout: -1)
     _shutdown_all(Capsule.instances, :restart, timeout: timeout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.12.6
+  version: 3.12.8
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -318,30 +318,30 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- app/assets/good_job/application.js
-- app/assets/good_job/modules/charts.js
-- app/assets/good_job/modules/checkbox_toggle.js
-- app/assets/good_job/modules/document_ready.js
-- app/assets/good_job/modules/live_poll.js
-- app/assets/good_job/modules/popovers.js
-- app/assets/good_job/modules/toasts.js
-- app/assets/good_job/style.css
-- app/assets/good_job/vendor/bootstrap/bootstrap.bundle.min.js
-- app/assets/good_job/vendor/bootstrap/bootstrap.min.css
-- app/assets/good_job/vendor/chartjs/chart.min.js
-- app/assets/good_job/vendor/es_module_shims.js
-- app/assets/good_job/vendor/rails_ujs.js
-- app/assets/good_job/vendor/stimulus.js
 - app/charts/good_job/scheduled_by_queue_chart.rb
 - app/controllers/good_job/application_controller.rb
-- app/controllers/good_job/assets_controller.rb
 - app/controllers/good_job/batches_controller.rb
 - app/controllers/good_job/cron_entries_controller.rb
+- app/controllers/good_job/frontends_controller.rb
 - app/controllers/good_job/jobs_controller.rb
 - app/controllers/good_job/processes_controller.rb
 - app/filters/good_job/base_filter.rb
 - app/filters/good_job/batches_filter.rb
 - app/filters/good_job/jobs_filter.rb
+- app/frontend/good_job/application.js
+- app/frontend/good_job/modules/charts.js
+- app/frontend/good_job/modules/checkbox_toggle.js
+- app/frontend/good_job/modules/document_ready.js
+- app/frontend/good_job/modules/live_poll.js
+- app/frontend/good_job/modules/popovers.js
+- app/frontend/good_job/modules/toasts.js
+- app/frontend/good_job/style.css
+- app/frontend/good_job/vendor/bootstrap/bootstrap.bundle.min.js
+- app/frontend/good_job/vendor/bootstrap/bootstrap.min.css
+- app/frontend/good_job/vendor/chartjs/chart.min.js
+- app/frontend/good_job/vendor/es_module_shims.js
+- app/frontend/good_job/vendor/rails_ujs.js
+- app/frontend/good_job/vendor/stimulus.js
 - app/helpers/good_job/application_helper.rb
 - app/models/concerns/good_job/filterable.rb
 - app/models/concerns/good_job/reportable.rb

data/app/controllers/good_job/assets_controller.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-module GoodJob
-  class AssetsController < ActionController::Base # rubocop:disable Rails/ApplicationController
-    skip_after_action :verify_same_origin_request
-
-    STATIC_ASSETS = {
-      css: {
-        bootstrap: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "bootstrap", "bootstrap.min.css"),
-        style: GoodJob::Engine.root.join("app", "assets", "good_job", "style.css"),
-      },
-      js: {
-        bootstrap: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "bootstrap", "bootstrap.bundle.min.js"),
-        chartjs: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "chartjs", "chart.min.js"),
-        es_module_shims: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "es_module_shims.js"),
-        rails_ujs: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "rails_ujs.js"),
-      },
-    }.freeze
-
-    MODULE_OVERRIDES = {
-      application: GoodJob::Engine.root.join("app", "assets", "good_job", "application.js"),
-      stimulus: GoodJob::Engine.root.join("app", "assets", "good_job", "vendor", "stimulus.js"),
-    }.freeze
-
-    def self.js_modules
-      @_js_modules ||= GoodJob::Engine.root.join("app", "assets", "good_job", "modules").children.select(&:file?).each_with_object({}) do |file, modules|
-        key = File.basename(file.basename.to_s, ".js").to_sym
-        modules[key] = file
-      end.merge(MODULE_OVERRIDES)
-    end
-
-    before_action do
-      expires_in 1.year, public: true
-    end
-
-    def static
-      render file: STATIC_ASSETS.dig(params[:format].to_sym, params[:name].to_sym) || raise(ActionController::RoutingError, 'Not Found')
-    end
-
-    def module
-      raise(ActionController::RoutingError, 'Not Found') if params[:format] != "js"
-
-      render file: self.class.js_modules[params[:name].to_sym] || raise(ActionController::RoutingError, 'Not Found')
-    end
-  end
-end