maintenance_tasks 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b984293788834b153823e857dad5020b8cca1902037c97fd158401c1da3cfee3
-  data.tar.gz: 0c079b820fbfd3d7e26e7c19585ac8b41199de92f7a71e671a63c7db46b60d06
+  metadata.gz: f05710c874610ef0698738773b70923d2e6a4ec4ae4b452ac768b6bf2e696d2c
+  data.tar.gz: 2ab31dae65aa383d5edbccee747199960f5167cd33833230c044fd00f0ad6cfc
 SHA512:
-  metadata.gz: f43e5c6535246bf7259bb21cfd1eb3f48f356a9f1f2e83fea19096cdff8610a601d4ea96b623d63bbecbaa593d1022a34fd16210896f83852f64c3e3bf003b41
-  data.tar.gz: a506d5e89ec233e60a59c428801d8e2e79a57f6604f8ab9cf97882b71bf69f4304f7d1fa53ac33ecd4ab5bb76f9de3774cbf9d1bfdd7cdff52af1849379b7e6d
+  metadata.gz: 8f0f7eee33cc6615f658f49ec9d74322f7952f2afa47b4b539dd0a49131cea10df15f072402d51d611bbfbf4d8d297ace54da1896ab457e54280bc17284641c9
+  data.tar.gz: af3992b2c6de8c8b70d840d8c06d6a8cb2646063a9b23222a1814bfc1cc7866a9745277aafe32ef8ee48627b7916e51c672c9321be87a49a5efd443f353722fc

data/README.md

@@ -485,6 +485,23 @@ to run. Since arguments are specified in the user interface via text area
 inputs, it’s important to check that they conform to the format your Task
 expects, and to sanitize any inputs if necessary.
 
+#### Validating Task Parameters
+
+Task attributes can be validated using Active Model Validations. Attributes are
+validated before a Task is enqueued.
+
+If an attribute uses an inclusion validator with a supported `in:` option, the
+set of values will be used to populate a dropdown in the user interface. The
+following types are supported:
+
+* Arrays
+* Procs and lambdas that optionally accept the Task instance, and return an Array.
+* Callable objects that receive one argument, the Task instance, and return an Array.
+* Methods that return an Array, called on the Task instance.
+
+For enumerables that don't match the supported types, a text field will be
+rendered instead.
+
 ### Custom cursor columns to improve performance
 
 The [job-iteration gem][job-iteration], on which this gem depends, adds an
@@ -541,8 +558,8 @@ your application.
 
 Usage example:
 
- ```ruby
- ActiveSupport::Notifications.subscribe("succeeded.maintenance_tasks") do |*, payload|
+```ruby
+ActiveSupport::Notifications.subscribe("succeeded.maintenance_tasks") do |*, payload|
   task_name = payload[:task_name]
   arguments = payload[:arguments]
   metadata = payload[:metadata]

data/app/helpers/maintenance_tasks/tasks_helper.rb

@@ -102,8 +102,13 @@ module MaintenanceTasks
     end
 
     # Resolves values covered by the inclusion validator for a task attribute.
-    # Only Arrays are supported, option types such as:
-    # Procs, lambdas, symbols, and Range are not supported and return nil.
+    # Supported option types:
+    # - Arrays
+    # - Procs and lambdas that optionally accept the Task instance, and return an Array.
+    # - Callable objects that receive one argument, the Task instance, and return an Array.
+    # - Methods that return an Array, called on the Task instance.
+    #
+    # Other types are not supported and will return nil.
     #
     # Returned values are used to populate a dropdown list of options.
     #
@@ -111,20 +116,39 @@ module MaintenanceTasks
     # @param parameter_name [String] The parameter name.
     #
     # @return [Array] value of the resolved inclusion option.
-    def resolve_inclusion_value(task_class, parameter_name)
+    def resolve_inclusion_value(task, parameter_name)
+      task_class = task.class
       inclusion_validator = task_class.validators_on(parameter_name).find do |validator|
         validator.kind == :inclusion
       end
       return unless inclusion_validator
 
       in_option = inclusion_validator.options[:in] || inclusion_validator.options[:within]
-      in_option if in_option.is_a?(Array)
+      resolved_in_option = case in_option
+      when Proc
+        if in_option.arity == 0
+          in_option.call
+        else
+          in_option.call(task)
+        end
+      when Symbol
+        method = task.method(in_option)
+        method.call if method.arity.zero?
+      else
+        if in_option.respond_to?(:call)
+          in_option.call(task)
+        else
+          in_option
+        end
+      end
+
+      resolved_in_option if resolved_in_option.is_a?(Array)
     end
 
     # Return the appropriate field tag for the parameter, based on its type.
     # If the parameter has a `validates_inclusion_of` validator, return a dropdown list of options instead.
     def parameter_field(form_builder, parameter_name)
-      inclusion_values = resolve_inclusion_value(form_builder.object.class, parameter_name)
+      inclusion_values = resolve_inclusion_value(form_builder.object, parameter_name)
       return form_builder.select(parameter_name, inclusion_values, prompt: "Select a value") if inclusion_values
 
       case form_builder.object.class.attribute_types[parameter_name]

data/app/models/maintenance_tasks/run.rb

@@ -386,40 +386,20 @@ module MaintenanceTasks
       nil
     end
 
-    # Support iterating over ActiveModel::Errors in Rails 6.0 and Rails 6.1+.
-    # To be removed when Rails 6.0 is no longer supported.
-    if Rails::VERSION::STRING.match?(/^6.0/)
-      # Performs validation on the arguments to use for the Task. If the Task is
-      # invalid, the errors are added to the Run.
-      def validate_task_arguments
-        arguments_match_task_attributes if arguments.present?
-        if task.invalid?
-          error_messages = task.errors
-            .map { |attribute, message| "#{attribute.inspect} #{message}" }
-          errors.add(
-            :arguments,
-            "are invalid: #{error_messages.join("; ")}",
-          )
-        end
-      rescue Task::NotFoundError
-        nil
-      end
-    else
-      # Performs validation on the arguments to use for the Task. If the Task is
-      # invalid, the errors are added to the Run.
-      def validate_task_arguments
-        arguments_match_task_attributes if arguments.present?
-        if task.invalid?
-          error_messages = task.errors
-            .map { |error| "#{error.attribute.inspect} #{error.message}" }
-          errors.add(
-            :arguments,
-            "are invalid: #{error_messages.join("; ")}",
-          )
-        end
-      rescue Task::NotFoundError
-        nil
+    # Performs validation on the arguments to use for the Task. If the Task is
+    # invalid, the errors are added to the Run.
+    def validate_task_arguments
+      arguments_match_task_attributes if arguments.present?
+      if task.invalid?
+        error_messages = task.errors
+          .map { |error| "#{error.attribute.inspect} #{error.message}" }
+        errors.add(
+          :arguments,
+          "are invalid: #{error_messages.join("; ")}",
+        )
       end
+    rescue Task::NotFoundError
+      nil
     end
 
     # Fetches the attached ActiveStorage CSV file for the run. Checks first

data/lib/patches/active_record_batch_enumerator.rb

@@ -1,23 +1,24 @@
 # frozen_string_literal: true
 
-# TODO: Remove this patch once all supported Rails versions include the changes
-# upstream - https://github.com/rails/rails/pull/42312/commits/a031a43d969c87542c4ee8d0d338d55fcbb53376
-module ActiveRecordBatchEnumerator
-  # The primary key value from which the BatchEnumerator starts,
-  #   inclusive of the value.
-  attr_reader :start
+if Rails.gem_version < Gem::Version.new("7.0")
+  # Add attribute readers.
+  module ActiveRecordBatchEnumerator
+    # The primary key value from which the BatchEnumerator starts,
+    #   inclusive of the value.
+    attr_reader :start
 
-  # The primary key value at which the BatchEnumerator ends,
-  #   inclusive of the value.
-  attr_reader :finish
+    # The primary key value at which the BatchEnumerator ends,
+    #   inclusive of the value.
+    attr_reader :finish
 
-  # The relation from which the BatchEnumerator yields batches.
-  attr_reader :relation
+    # The relation from which the BatchEnumerator yields batches.
+    attr_reader :relation
 
-  # The size of the batches yielded by the BatchEnumerator.
-  def batch_size
-    @of
+    # The size of the batches yielded by the BatchEnumerator.
+    def batch_size
+      @of
+    end
   end
-end
 
-ActiveRecord::Batches::BatchEnumerator.include(ActiveRecordBatchEnumerator)
+  ActiveRecord::Batches::BatchEnumerator.include(ActiveRecordBatchEnumerator)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maintenance_tasks
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Shopify Engineering
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ homepage: https://github.com/Shopify/maintenance_tasks
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v2.8.0
+  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v2.9.0
   allowed_push_host: https://rubygems.org
 post_install_message:
 rdoc_options: []
@@ -195,14 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: A Rails engine for queuing and managing maintenance tasks