activejob 6.0.0.beta3 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66495d4239cd228e57d495037feecd031a097ca550ebd605d52b8d708c803bf
-  data.tar.gz: 745235d248315d2477a1428d5ad96ac93cd2dcd3ad2b7da4c42aa2ed1eb8fb55
+  metadata.gz: 7e59e7551edf579418f0d3e6d6e74ff4c1750e0114c6a59b4218df2ad7f18304
+  data.tar.gz: 2b7296a21d44985536e994f483159d466f98e779b9a135d44d4b5c7954fd71d3
 SHA512:
-  metadata.gz: e25e0b8defb7e0fefa2d45c6abccb641acb870cf60c3bd5a1d52a97168513578fc2ab2fbc9f6d0f22dba333f2793207f1be3e2bc27e407ba3d77f7bc76478fb0
-  data.tar.gz: 5eb6cdcdaf4bd4fffcff477546730aa64c8fb2ef6e8dd3fea346141c018c8c23e0c7ac4bc11a8de5300e2c1b4e0ad84f46ceb31c463ddc12bc40e792efb24d49
+  metadata.gz: 2aa71b2541105abd834b5f8b631de9c32f882142ad5758ea841b619fb83848f82e66bb297842de63a1ddea87478c0adac1218dc032d7db2c112e27779d3a192a
+  data.tar.gz: c3a736d86de568987f2bc404c290258a59c4b09975c38097c9796a24fb8ff1ed1ce3e8cb0ddebdcf421b31eee53fc626e52d3bf6b99064fd7ac99eaae4fc3f47

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   Use individual execution counters when calculating retry delay.
+
+    *Patrik Bóna*
+
+*   Make job argument assertions with `Time`, `ActiveSupport::TimeWithZone`, and `DateTime` work by dropping microseconds. Microsecond precision is lost during serialization.
+
+    *Gannon McGibbon*
+
+
 ## Rails 6.0.0.beta3 (March 11, 2019) ##
 
 *   No changes.
@@ -29,7 +40,7 @@
 
     *Edouard Chin*
 
-*   Restore HashWithIndifferentAccess support to ActiveJob::Arguments.deserialize.
+*   Restore `HashWithIndifferentAccess` support to `ActiveJob::Arguments.deserialize`.
 
     *Gannon McGibbon*
 

data/README.md

@@ -1,4 +1,4 @@
-# Active Job -- Make work happen later
+# Active Job – Make work happen later
 
 Active Job is a framework for declaring jobs and making them run on a variety
 of queuing backends. These jobs can be everything from regularly scheduled
@@ -17,12 +17,13 @@ about API differences between Delayed Job and Resque. Picking your queuing
 backend becomes more of an operational concern, then. And you'll be able to
 switch between them without having to rewrite your jobs.
 
+You can read more about Active Job in the [Active Job Basics](https://edgeguides.rubyonrails.org/active_job_basics.html) guide.
 
 ## Usage
 
 To learn how to use your preferred queuing backend see its adapter
 documentation at
-[ActiveJob::QueueAdapters](http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html).
+[ActiveJob::QueueAdapters](https://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html).
 
 Declare a job like so:
 
@@ -86,7 +87,7 @@ by default has been mixed into Active Record classes.
 
 Active Job has built-in adapters for multiple queuing backends (Sidekiq,
 Resque, Delayed Job and others). To get an up-to-date list of the adapters
-see the API Documentation for [ActiveJob::QueueAdapters](http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html).
+see the API Documentation for [ActiveJob::QueueAdapters](https://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html).
 
 **Please note:** We are not accepting pull requests for new adapters. We
 encourage library authors to provide an ActiveJob adapter as part of
@@ -121,7 +122,7 @@ Active Job is released under the MIT license:
 
 API documentation is at:
 
-* http://api.rubyonrails.org
+* https://api.rubyonrails.org
 
 Bug reports for the Ruby on Rails project can be filed here:
 

data/lib/active_job/enqueuing.rb

@@ -67,7 +67,7 @@ module ActiveJob
           false
         else
           ActiveSupport::Deprecation.warn(
-            "Rails 6.0 will return false when the enqueuing is aborted. Make sure your code doesn't depend on it" \
+            "Rails 6.1 will return false when the enqueuing is aborted. Make sure your code doesn't depend on it" \
             " returning the instance of the job and set `config.active_job.return_false_on_aborted_enqueue = true`" \
             " to remove the deprecations."
           )

data/lib/active_job/exceptions.rb

@@ -49,12 +49,10 @@ module ActiveJob
       #  end
       def retry_on(*exceptions, wait: 3.seconds, attempts: 5, queue: nil, priority: nil)
         rescue_from(*exceptions) do |error|
-          # Guard against jobs that were persisted before we started having individual executions counters per retry_on
-          self.exception_executions ||= {}
-          self.exception_executions[exceptions.to_s] = (exception_executions[exceptions.to_s] || 0) + 1
+          executions = executions_for(exceptions)
 
-          if exception_executions[exceptions.to_s] < attempts
-            retry_job wait: determine_delay(wait), queue: queue, priority: priority, error: error
+          if executions < attempts
+            retry_job wait: determine_delay(seconds_or_duration_or_algorithm: wait, executions: executions), queue: queue, priority: priority, error: error
           else
             if block_given?
               instrument :retry_stopped, error: error do
@@ -123,7 +121,7 @@ module ActiveJob
     end
 
     private
-      def determine_delay(seconds_or_duration_or_algorithm)
+      def determine_delay(seconds_or_duration_or_algorithm:, executions:)
         case seconds_or_duration_or_algorithm
         when :exponentially_longer
           (executions**4) + 2
@@ -146,5 +144,14 @@ module ActiveJob
 
         ActiveSupport::Notifications.instrument("#{name}.active_job", payload, &block)
       end
+
+      def executions_for(exceptions)
+        if exception_executions
+          exception_executions[exceptions.to_s] = (exception_executions[exceptions.to_s] || 0) + 1
+        else
+          # Guard against jobs that were persisted before we started having individual executions counters per retry_on
+          executions
+        end
+      end
   end
 end

data/lib/active_job/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveJob
     MAJOR = 6
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/queue_adapters.rb

@@ -10,11 +10,11 @@ module ActiveJob
   # * {Que}[https://github.com/chanks/que]
   # * {queue_classic}[https://github.com/QueueClassic/queue_classic]
   # * {Resque}[https://github.com/resque/resque]
-  # * {Sidekiq}[http://sidekiq.org]
+  # * {Sidekiq}[https://sidekiq.org]
   # * {Sneakers}[https://github.com/jondot/sneakers]
   # * {Sucker Punch}[https://github.com/brandonhilkert/sucker_punch]
-  # * {Active Job Async Job}[http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/AsyncAdapter.html]
-  # * {Active Job Inline}[http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/InlineAdapter.html]
+  # * {Active Job Async Job}[https://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/AsyncAdapter.html]
+  # * {Active Job Inline}[https://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/InlineAdapter.html]
   # * Please Note: We are not accepting pull requests for new adapters. See the {README}[link:files/activejob/README_md.html] for more details.
   #
   # === Backends Features

data/lib/active_job/test_helper.rb

@@ -353,7 +353,7 @@ module ActiveJob
     #
     #
     # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to returns a boolean value determining if
+    # job's arguments. Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -426,7 +426,7 @@ module ActiveJob
     #   end
     #
     # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to returns a boolean value determining if
+    # job's arguments. Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -631,6 +631,20 @@ module ActiveJob
       def prepare_args_for_assertion(args)
         args.dup.tap do |arguments|
           arguments[:at] = arguments[:at].to_f if arguments[:at]
+          arguments[:args] = round_time_arguments(arguments[:args]) if arguments[:args]
+        end
+      end
+
+      def round_time_arguments(argument)
+        case argument
+        when Time, ActiveSupport::TimeWithZone, DateTime
+          argument.change(usec: 0)
+        when Hash
+          argument.transform_values { |value| round_time_arguments(value) }
+        when Array
+          argument.map { |element| round_time_arguments(element) }
+        else
+          argument
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta3
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -90,12 +90,12 @@ files:
 - lib/rails/generators/job/job_generator.rb
 - lib/rails/generators/job/templates/application_job.rb.tt
 - lib/rails/generators/job/templates/job.rb.tt
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/activejob
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/activejob/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc1/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc1/activejob/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: