activejob 5.1.7 → 5.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d82e5ced745169984f4a1c14d38bf1d6cca30b232c0f237255607523674dc847
-  data.tar.gz: 8d1cd517a3f26399f38fa00cbb411af2818848529aec38fb63bfd101e890b090
+SHA1:
+  metadata.gz: 5d53b499b4d5918e049d3cbb124528babab29393
+  data.tar.gz: 7da6adb62eed0a991b0100e5ac2da18daed2ab4c
 SHA512:
-  metadata.gz: f89b12e696ecc88f7ea0b8755525246340b4dea66a168da5c8d1260896d25b259baeaccc4fb00c7c828aae50ce80f54519aadf0fc3440740772b74ccd8e98d5e
-  data.tar.gz: c1234db4b8e1dddfbf72361fc44be2ca93c003fb348f3c5a6322f32a3eed51bacc7cec9fab5dfbab54aae492a8bbafd63b016d10c9d319530f8ba7110d87bde4
+  metadata.gz: a0b644dce5447974552e389a71a18f8acf60cb44e54bd7803a8dc238fe471a812e6db1350122fbee7ad50b863ee35edc2fecd6e83d9e64b529fe10b739c6a1d2
+  data.tar.gz: 6c73d5d6fbdd842278f28653a52e40a3f12440e749d915a7c7ff7b60b739c24de1bab74de7a7900309b1e3b3c1bfa4cc996b78ef3d95325c5197c7d484131379

data/CHANGELOG.md

@@ -1,129 +1,7 @@
-## Rails 5.1.7 (March 27, 2019) ##
-
-*   No changes.
-
-
-## Rails 5.1.6.2 (March 11, 2019) ##
-
-*   No changes.
-
-
-## Rails 5.1.6.1 (November 27, 2018) ##
-
-*   Do not deserialize GlobalID objects that were not generated by Active Job.
-
-    Trusting any GlobaID object when deserializing jobs can allow attackers to access
-    information that should not be accessible to them.
-
-    Fix CVE-2018-16476.
-
-    *Rafael Mendonça França*
-
-
-## Rails 5.1.6 (March 29, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.1.5 (February 14, 2018) ##
+## Rails 5.2.0.beta1 (November 27, 2017) ##
 
 *   Support redis-rb 4.0.
 
     *Jeremy Daer*
 
-
-## Rails 5.1.4 (September 07, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.4.rc1 (August 24, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3 (August 03, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc3 (July 31, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc2 (July 25, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc1 (July 19, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.2 (June 26, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.1 (May 12, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.0 (April 27, 2017) ##
-
-*   Change logging instrumentation to log errors when a job raises an exception.
-
-    Fixes #26848.
-
-    *Steven Bull*
-
-*   Correctly set test adapter when configure the queue adapter on a per job.
-
-    Fixes #26360.
-
-    *Yuji Yaginuma*
-
-*   Removed deprecated support to passing the adapter class to `.queue_adapter`.
-
-    *Rafael Mendonça França*
-
-*   Removed deprecated `#original_exception` in `ActiveJob::DeserializationError`.
-
-    *Rafael Mendonça França*
-
-*   Added instance variable `@queue` to JobWrapper.
-
-    This will fix issues in [resque-scheduler](https://github.com/resque/resque-scheduler) `#job_to_hash` method,
-    so we can use `#enqueue_delayed_selection`, `#remove_delayed` method in resque-scheduler smoothly.
-
-    *mu29*
-
-*   Yield the job instance so you have access to things like `job.arguments` on the custom logic after retries fail.
-
-    *DHH*
-
-*   Added declarative exception handling via `ActiveJob::Base.retry_on` and `ActiveJob::Base.discard_on`.
-
-    Examples:
-
-        class RemoteServiceJob < ActiveJob::Base
-          retry_on CustomAppException # defaults to 3s wait, 5 attempts
-          retry_on AnotherCustomAppException, wait: ->(executions) { executions * 2 }
-          retry_on ActiveRecord::Deadlocked, wait: 5.seconds, attempts: 3
-          retry_on Net::OpenTimeout, wait: :exponentially_longer, attempts: 10
-          discard_on ActiveJob::DeserializationError
-
-          def perform(*args)
-            # Might raise CustomAppException or AnotherCustomAppException for something domain specific
-            # Might raise ActiveRecord::Deadlocked when a local db deadlock is detected
-            # Might raise Net::OpenTimeout when the remote service is down
-          end
-        end
-
-    *DHH*
-
-
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/activejob/CHANGELOG.md) for previous changes.
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activejob/CHANGELOG.md) for previous changes.

data/README.md

@@ -108,7 +108,7 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 Active Job is released under the MIT license:
 
-* http://www.opensource.org/licenses/MIT
+* https://opensource.org/licenses/MIT
 
 
 ## Support

data/lib/active_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2014-2017 David Heinemeier Hansson
 #

data/lib/active_job/arguments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash"
 
 module ActiveJob
@@ -75,7 +77,7 @@ module ActiveJob
       def deserialize_argument(argument)
         case argument
         when String
-          argument
+          GlobalID::Locator.locate(argument) || argument
         when *TYPE_WHITELIST
           argument
         when Array

data/lib/active_job/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job/core"
 require "active_job/queue_adapter"
 require "active_job/queue_name"

data/lib/active_job/callbacks.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "active_support/callbacks"
 
 module ActiveJob
   # = Active Job Callbacks
   #
   # Active Job provides hooks during the life cycle of a job. Callbacks allow you
-  # to trigger logic during the life cycle of a job. Available callbacks are:
+  # to trigger logic during this cycle. Available callbacks are:
   #
   # * <tt>before_enqueue</tt>
   # * <tt>around_enqueue</tt>
@@ -13,6 +15,8 @@ module ActiveJob
   # * <tt>around_perform</tt>
   # * <tt>after_perform</tt>
   #
+  # NOTE: Calling the same callback multiple times will overwrite previous callback definitions.
+  #
   module Callbacks
     extend  ActiveSupport::Concern
     include ActiveSupport::Callbacks

data/lib/active_job/configured_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   class ConfiguredJob #:nodoc:
     def initialize(job_class, options = {})

data/lib/active_job/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   # Provides general behavior that will be included into every Active Job
   # object that inherits from ActiveJob::Base.

data/lib/active_job/enqueuing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job/arguments"
 
 module ActiveJob
@@ -8,7 +10,7 @@ module ActiveJob
     # Includes the +perform_later+ method for job initialization.
     module ClassMethods
       # Push a job onto the queue. The arguments must be legal JSON types
-      # (string, int, float, nil, true, false, hash or array) or
+      # (+string+, +int+, +float+, +nil+, +true+, +false+, +hash+ or +array+) or
       # GlobalID::Identification instances. Arbitrary Ruby objects
       # are not supported.
       #

data/lib/active_job/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/numeric/time"
 
 module ActiveJob
@@ -47,7 +49,7 @@ module ActiveJob
             retry_job wait: determine_delay(wait), queue: queue, priority: priority
           else
             if block_given?
-              yield self, exception
+              yield self, error
             else
               logger.error "Stopped retrying #{self.class} due to a #{exception}, which reoccurred on #{executions} attempts. The original exception was #{error.cause.inspect}."
               raise error

data/lib/active_job/execution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/rescuable"
 require "active_job/arguments"
 

data/lib/active_job/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   # Returns the version of the currently loaded Active Job as a <tt>Gem::Version</tt>
   def self.gem_version
@@ -6,9 +8,9 @@ module ActiveJob
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 7
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/transform_values"
 require "active_support/core_ext/string/filters"
 require "active_support/tagged_logging"
@@ -8,7 +10,7 @@ module ActiveJob
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
+      cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT))
 
       around_enqueue do |_, block, _|
         tag_logger do

data/lib/active_job/queue_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/string/inflections"
 
 module ActiveJob
@@ -7,6 +9,7 @@ module ActiveJob
     extend ActiveSupport::Concern
 
     included do
+      class_attribute :_queue_adapter_name, instance_accessor: false, instance_predicate: false
       class_attribute :_queue_adapter, instance_accessor: false, instance_predicate: false
       self.queue_adapter = :async
     end
@@ -19,11 +22,15 @@ module ActiveJob
         _queue_adapter
       end
 
+      def queue_adapter_name
+        _queue_adapter_name
+      end
+
       # Specify the backend queue provider. The default queue adapter
       # is the +:async+ queue. See QueueAdapters for more
       # information.
       def queue_adapter=(name_or_adapter_or_class)
-        self._queue_adapter = interpret_adapter(name_or_adapter_or_class)
+        interpret_adapter(name_or_adapter_or_class)
       end
 
       private
@@ -31,16 +38,24 @@ module ActiveJob
         def interpret_adapter(name_or_adapter_or_class)
           case name_or_adapter_or_class
           when Symbol, String
-            ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new
+            assign_adapter(name_or_adapter_or_class.to_s,
+                           ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new)
           else
             if queue_adapter?(name_or_adapter_or_class)
-              name_or_adapter_or_class
+              adapter_name = "#{name_or_adapter_or_class.class.name.demodulize.remove('Adapter').underscore}"
+              assign_adapter(adapter_name,
+                             name_or_adapter_or_class)
             else
               raise ArgumentError
             end
           end
         end
 
+        def assign_adapter(adapter_name, queue_adapter)
+          self._queue_adapter_name = adapter_name
+          self._queue_adapter = queue_adapter
+        end
+
         QUEUE_ADAPTER_METHODS = [:enqueue, :enqueue_at].freeze
 
         def queue_adapter?(object)

data/lib/active_job/queue_adapters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   # == Active Job adapters
   #

data/lib/active_job/queue_adapters/async_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 require "concurrent/scheduled_task"
 require "concurrent/executor/thread_pool_executor"
@@ -29,7 +31,7 @@ module ActiveJob
     # jobs. Since jobs share a single thread pool, long-running jobs will block
     # short-lived jobs. Fine for dev/test; bad for production.
     class AsyncAdapter
-      # See {Concurrent::ThreadPoolExecutor}[http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadPoolExecutor.html] for executor options.
+      # See {Concurrent::ThreadPoolExecutor}[https://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadPoolExecutor.html] for executor options.
       def initialize(**executor_options)
         @scheduler = Scheduler.new(**executor_options)
       end

data/lib/active_job/queue_adapters/backburner_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "backburner"
 
 module ActiveJob

data/lib/active_job/queue_adapters/delayed_job_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "delayed_job"
 
 module ActiveJob
@@ -32,6 +34,10 @@ module ActiveJob
           @job_data = job_data
         end
 
+        def display_name
+          "#{job_data['job_class']} [#{job_data['job_id']}] from DelayedJob(#{job_data['queue_name']}) with arguments: #{job_data['arguments']}"
+        end
+
         def perform
           Base.execute(job_data)
         end

data/lib/active_job/queue_adapters/inline_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module QueueAdapters
     # == Active Job Inline adapter

data/lib/active_job/queue_adapters/qu_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "qu"
 
 module ActiveJob

data/lib/active_job/queue_adapters/que_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "que"
 
 module ActiveJob

data/lib/active_job/queue_adapters/queue_classic_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "queue_classic"
 
 module ActiveJob

data/lib/active_job/queue_adapters/resque_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "resque"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/array/access"

data/lib/active_job/queue_adapters/sidekiq_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sidekiq"
 
 module ActiveJob

data/lib/active_job/queue_adapters/sneakers_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sneakers"
 require "monitor"
 

data/lib/active_job/queue_adapters/sucker_punch_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sucker_punch"
 
 module ActiveJob

data/lib/active_job/queue_adapters/test_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module QueueAdapters
     # == Test adapter for Active Job
@@ -10,7 +12,7 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :test
     class TestAdapter
-      attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter)
+      attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter, :reject)
       attr_writer(:enqueued_jobs, :performed_jobs)
 
       # Provides a store of all the enqueued jobs with the TestAdapter so you can check them.
@@ -52,7 +54,13 @@ module ActiveJob
         end
 
         def filtered?(job)
-          filter && !Array(filter).include?(job.class)
+          if filter
+            !Array(filter).include?(job.class)
+          elsif reject
+            Array(reject).include?(job.class)
+          else
+            false
+          end
         end
     end
   end

data/lib/active_job/queue_name.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module QueueName
     extend ActiveSupport::Concern
 
     # Includes the ability to override the default queue name and prefix.
     module ClassMethods
-      mattr_accessor(:queue_name_prefix)
-      mattr_accessor(:default_queue_name) { "default" }
+      mattr_accessor :queue_name_prefix
+      mattr_accessor :default_queue_name, default: "default"
 
       # Specifies the name of the queue to process the job on.
       #
@@ -32,11 +34,8 @@ module ActiveJob
     end
 
     included do
-      class_attribute :queue_name, instance_accessor: false
-      class_attribute :queue_name_delimiter, instance_accessor: false
-
-      self.queue_name = default_queue_name
-      self.queue_name_delimiter = "_" # set default delimiter to '_'
+      class_attribute :queue_name, instance_accessor: false, default: default_queue_name
+      class_attribute :queue_name_delimiter, instance_accessor: false, default: "_"
     end
 
     # Returns the name of the queue the job will be run on.

data/lib/active_job/queue_priority.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module QueuePriority
     extend ActiveSupport::Concern
 
     # Includes the ability to override the default queue priority.
     module ClassMethods
-      mattr_accessor(:default_priority)
+      mattr_accessor :default_priority
 
       # Specifies the priority of the queue to create the job with.
       #
@@ -27,9 +29,7 @@ module ActiveJob
     end
 
     included do
-      class_attribute :priority, instance_accessor: false
-
-      self.priority = default_priority
+      class_attribute :priority, instance_accessor: false, default: default_priority
     end
 
     # Returns the priority that the job will be created with

data/lib/active_job/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "global_id/railtie"
 require "active_job"
 

data/lib/active_job/test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/test_case"
 
 module ActiveJob

data/lib/active_job/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/class/subclasses"
 require "active_support/core_ext/hash/keys"
 
@@ -87,7 +89,7 @@ module ActiveJob
     #     end
     #   end
     #
-    # The number of times a specific job is enqueued can be asserted.
+    # The number of times a specific job was enqueued can be asserted.
     #
     #   def test_logging_job
     #     assert_enqueued_jobs 1, only: LoggingJob do
@@ -96,6 +98,15 @@ module ActiveJob
     #     end
     #   end
     #
+    # The number of times a job except specific class was enqueued can be asserted.
+    #
+    #   def test_logging_job
+    #     assert_enqueued_jobs 1, except: HelloJob do
+    #       LoggingJob.perform_later
+    #       HelloJob.perform_later('jeremy')
+    #     end
+    #   end
+    #
     # The number of times a job is enqueued to a specific queue can also be asserted.
     #
     #   def test_logging_job
@@ -104,14 +115,14 @@ module ActiveJob
     #       HelloJob.perform_later('elfassy')
     #     end
     #   end
-    def assert_enqueued_jobs(number, only: nil, queue: nil)
+    def assert_enqueued_jobs(number, only: nil, except: nil, queue: nil)
       if block_given?
-        original_count = enqueued_jobs_size(only: only, queue: queue)
+        original_count = enqueued_jobs_size(only: only, except: except, queue: queue)
         yield
-        new_count = enqueued_jobs_size(only: only, queue: queue)
+        new_count = enqueued_jobs_size(only: only, except: except, queue: queue)
         assert_equal number, new_count - original_count, "#{number} jobs expected, but #{new_count - original_count} were enqueued"
       else
-        actual_count = enqueued_jobs_size(only: only, queue: queue)
+        actual_count = enqueued_jobs_size(only: only, except: except, queue: queue)
         assert_equal number, actual_count, "#{number} jobs expected, but #{actual_count} were enqueued"
       end
     end
@@ -140,11 +151,19 @@ module ActiveJob
     #     end
     #   end
     #
+    # It can be asserted that no jobs except specific class are enqueued:
+    #
+    #   def test_no_logging
+    #     assert_no_enqueued_jobs except: HelloJob do
+    #       HelloJob.perform_later('jeremy')
+    #     end
+    #   end
+    #
     # Note: This assertion is simply a shortcut for:
     #
     #   assert_enqueued_jobs 0, &block
-    def assert_no_enqueued_jobs(only: nil, &block)
-      assert_enqueued_jobs 0, only: only, &block
+    def assert_no_enqueued_jobs(only: nil, except: nil, &block)
+      assert_enqueued_jobs 0, only: only, except: except, &block
     end
 
     # Asserts that the number of performed jobs matches the given number.
@@ -189,6 +208,16 @@ module ActiveJob
     #       end
     #     end
     #
+    # Also if the :except option is specified,
+    # then the job(s) except specific class will be performed.
+    #
+    #     def test_hello_job
+    #       assert_performed_jobs 1, except: LoggingJob do
+    #         HelloJob.perform_later('jeremy')
+    #         LoggingJob.perform_later
+    #       end
+    #     end
+    #
     # An array may also be specified, to support testing multiple jobs.
     #
     #     def test_hello_and_logging_jobs
@@ -200,10 +229,10 @@ module ActiveJob
     #         end
     #       end
     #     end
-    def assert_performed_jobs(number, only: nil)
+    def assert_performed_jobs(number, only: nil, except: nil)
       if block_given?
         original_count = performed_jobs.size
-        perform_enqueued_jobs(only: only) { yield }
+        perform_enqueued_jobs(only: only, except: except) { yield }
         new_count = performed_jobs.size
         assert_equal number, new_count - original_count,
           "#{number} jobs expected, but #{new_count - original_count} were performed"
@@ -241,11 +270,20 @@ module ActiveJob
     #     end
     #   end
     #
+    # Also if the :except option is specified,
+    # then the job(s) except specific class will not be performed.
+    #
+    #   def test_no_logging
+    #     assert_no_performed_jobs except: HelloJob do
+    #       HelloJob.perform_later('jeremy')
+    #     end
+    #   end
+    #
     # Note: This assertion is simply a shortcut for:
     #
     #   assert_performed_jobs 0, &block
-    def assert_no_performed_jobs(only: nil, &block)
-      assert_performed_jobs 0, only: only, &block
+    def assert_no_performed_jobs(only: nil, except: nil, &block)
+      assert_performed_jobs 0, only: only, except: except, &block
     end
 
     # Asserts that the job passed in the block has been enqueued with the given arguments.
@@ -315,20 +353,36 @@ module ActiveJob
     #     end
     #     assert_performed_jobs 1
     #   end
-    def perform_enqueued_jobs(only: nil)
+    #
+    # Also if the +:except+ option is specified,
+    # then the job(s) except specific class will be performed.
+    #
+    #   def test_perform_enqueued_jobs_with_except
+    #     perform_enqueued_jobs(except: HelloJob) do
+    #       MyJob.perform_later(1, 2, 3) # will be performed
+    #       HelloJob.perform_later(1, 2, 3) # will not be performed
+    #     end
+    #     assert_performed_jobs 1
+    #   end
+    #
+    def perform_enqueued_jobs(only: nil, except: nil)
+      validate_option(only: only, except: except)
       old_perform_enqueued_jobs = queue_adapter.perform_enqueued_jobs
       old_perform_enqueued_at_jobs = queue_adapter.perform_enqueued_at_jobs
       old_filter = queue_adapter.filter
+      old_reject = queue_adapter.reject
 
       begin
         queue_adapter.perform_enqueued_jobs = true
         queue_adapter.perform_enqueued_at_jobs = true
         queue_adapter.filter = only
+        queue_adapter.reject = except
         yield
       ensure
         queue_adapter.perform_enqueued_jobs = old_perform_enqueued_jobs
         queue_adapter.perform_enqueued_at_jobs = old_perform_enqueued_at_jobs
         queue_adapter.filter = old_filter
+        queue_adapter.reject = old_reject
       end
     end
 
@@ -350,11 +404,14 @@ module ActiveJob
         performed_jobs.clear
       end
 
-      def enqueued_jobs_size(only: nil, queue: nil)
+      def enqueued_jobs_size(only: nil, except: nil, queue: nil)
+        validate_option(only: only, except: except)
         enqueued_jobs.count do |job|
           job_class = job.fetch(:job)
           if only
             next false unless Array(only).include?(job_class)
+          elsif except
+            next false if Array(except).include?(job_class)
           end
           if queue
             next false unless queue.to_s == job.fetch(:queue, job_class.queue_name)
@@ -383,5 +440,9 @@ module ActiveJob
           klass.singleton_class.public_instance_methods(false).include?(:_queue_adapter)
         end
       end
+
+      def validate_option(only: nil, except: nil)
+        raise ArgumentError, "Cannot specify both `:only` and `:except` options." if only && except
+      end
   end
 end

data/lib/active_job/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module Translation #:nodoc:
     extend ActiveSupport::Concern

data/lib/active_job/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "gem_version"
 
 module ActiveJob

data/lib/rails/generators/job/job_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/named_base"
 
 module Rails # :nodoc:
@@ -12,7 +14,7 @@ module Rails # :nodoc:
       hook_for :test_framework
 
       def self.default_generator_root
-        File.dirname(__FILE__)
+        __dir__
       end
 
       def create_job_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +80,14 @@ files:
 - lib/active_job/translation.rb
 - lib/active_job/version.rb
 - lib/rails/generators/job/job_generator.rb
-- lib/rails/generators/job/templates/application_job.rb
-- lib/rails/generators/job/templates/job.rb
+- lib/rails/generators/job/templates/application_job.rb.tt
+- lib/rails/generators/job/templates/job.rb.tt
 homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.1.7/activejob
-  changelog_uri: https://github.com/rails/rails/blob/v5.1.7/activejob/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.beta1/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.beta1/activejob/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,11 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Job framework with pluggable queues.