activejob 5.2.0 → 5.2.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b37142bf858d333078045c61fce484cb2c897bf5703ba3e436554ad5c121b28
-  data.tar.gz: 80da58bdf3fe33c69449673111513ab5cfd60fb3808992e49377a6b5edad524e
+  metadata.gz: 56e0ed051fab0bb338aad0e7e2c711cc02e16735780453ac4c0c6667bef6cde0
+  data.tar.gz: 74eebf584043dcd44d16b79471c11d618e5a40fede93e0dc113f061a691dd4f1
 SHA512:
-  metadata.gz: '099ea73c1d6becd7452954296e14caf364e7377f64a4a1797f20f2e5fb74fdd0afccb2875df531a89fee57ee614477cb5ff6d68841c258e37b12cc2c27f30635'
-  data.tar.gz: 01545f591d0f2c112f3708430c0aa32f959db1e08278b196c17a085544ca76f2adec7e692d59fc9dca148e060e278422a91713e07be84b8d0eae23d5eb6d54a1
+  metadata.gz: 17f4cab310d256155278516934c1a8df1443757278620482bc5fb9b5d0947e4786cb73990c9865ced7b9b4b455f254d2983879671db71b9bf4affd7214c9efd7
+  data.tar.gz: aa25a9bd28a234095952cab17360a693f0593cdca5077705fa77899ae213c2526c65ec0576251979bc907479237b94ed3fa7c5a7bd889a80fd27df4b56d42ddb

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 5.2.1.rc1 (July 30, 2018) ##
+
+*   Pass the error instance as the second parameter of block executed by `discard_on`.
+
+    Fixes #32853.
+
+    *Yuji Yaginuma*
+
 ## Rails 5.2.0 (April 09, 2018) ##
 
 *   Allow block to be passed to `ActiveJob::Base.discard_on` to allow custom handling of discard jobs.

data/lib/active_job/core.rb

@@ -85,7 +85,7 @@ module ActiveJob
         "provider_job_id" => provider_job_id,
         "queue_name" => queue_name,
         "priority"   => priority,
-        "arguments"  => serialize_arguments(arguments),
+        "arguments"  => serialize_arguments_if_needed(arguments),
         "executions" => executions,
         "locale"     => I18n.locale.to_s
       }
@@ -128,19 +128,31 @@ module ActiveJob
     end
 
     private
+      def serialize_arguments_if_needed(arguments)
+        if arguments_serialized?
+          @serialized_arguments
+        else
+          serialize_arguments(arguments)
+        end
+      end
+
       def deserialize_arguments_if_needed
-        if defined?(@serialized_arguments) && @serialized_arguments.present?
+        if arguments_serialized?
           @arguments = deserialize_arguments(@serialized_arguments)
           @serialized_arguments = nil
         end
       end
 
-      def serialize_arguments(serialized_args)
-        Arguments.serialize(serialized_args)
+      def serialize_arguments(arguments)
+        Arguments.serialize(arguments)
       end
 
       def deserialize_arguments(serialized_args)
         Arguments.deserialize(serialized_args)
       end
+
+      def arguments_serialized?
+        defined?(@serialized_arguments) && @serialized_arguments
+      end
   end
 end

data/lib/active_job/exceptions.rb

@@ -30,8 +30,8 @@ module ActiveJob
       #  class RemoteServiceJob < ActiveJob::Base
       #    retry_on CustomAppException # defaults to 3s wait, 5 attempts
       #    retry_on AnotherCustomAppException, wait: ->(executions) { executions * 2 }
-      #    retry_on(YetAnotherCustomAppException) do |job, exception|
-      #      ExceptionNotifier.caught(exception)
+      #    retry_on(YetAnotherCustomAppException) do |job, error|
+      #      ExceptionNotifier.caught(error)
       #    end
       #    retry_on ActiveRecord::Deadlocked, wait: 5.seconds, attempts: 3
       #    retry_on Net::OpenTimeout, wait: :exponentially_longer, attempts: 10
@@ -67,8 +67,8 @@ module ActiveJob
       #
       #  class SearchIndexingJob < ActiveJob::Base
       #    discard_on ActiveJob::DeserializationError
-      #    discard_on(CustomAppException) do |job, exception|
-      #      ExceptionNotifier.caught(exception)
+      #    discard_on(CustomAppException) do |job, error|
+      #      ExceptionNotifier.caught(error)
       #    end
       #
       #    def perform(record)
@@ -79,7 +79,7 @@ module ActiveJob
       def discard_on(exception)
         rescue_from exception do |error|
           if block_given?
-            yield self, exception
+            yield self, error
           else
             logger.error "Discarded #{self.class} due to a #{exception}. The original exception was #{error.cause.inspect}."
           end

data/lib/active_job/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveJob
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 0
-    PRE   = nil
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -86,8 +86,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.0/activejob
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0/activejob/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.1.rc1/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.1.rc1/activejob/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,12 +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: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Job framework with pluggable queues.