activejob 5.2.0.beta2 → 5.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 995765b592a9228e7c0640a8e0b863de678af001
-  data.tar.gz: 94de135e36f6b510a8d75623bb20e2c367ae1477
+SHA256:
+  metadata.gz: 22740a6da98359f759282d65708730726ce4ccee566733c2c73a5bbf4811808d
+  data.tar.gz: '08bd369e143aec6108fcc72a3a4ec5eabccf28769c0ce856a5421d073cd25ceb'
 SHA512:
-  metadata.gz: 69ffce8f05a0f846937f768b10ef982ca074c9f0f676946143f17d6f2d6fbdd6eb14c9665c097cfa327721207cd20f3741aaba0f2f522e067a6858836a7b924a
-  data.tar.gz: 2de48378695fecbbc48ae7ebb94efb5a42a71636184fc379e86f2d79e1f24140e986357a78b022467d609887970145c2f13b12aa88789bb9612a2abf27d2749e
+  metadata.gz: 1ae6dc0ae85e69b66c1bbc0b1815a79aefcb7a846d690322df90cacceb87303494eca3999836953cf650e932161ae406e5bc9d95f65aef599029a101f88434a4
+  data.tar.gz: bd30c867a68f1d51c3440f944e465e391729dd3a735eaf2c279e0f01b66c698f949c8b108b2d7c2fb37d16bd68cb38d0be4aea1d612cb49b7cfd1a51188c6797

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Rails 5.2.0.rc1 (January 30, 2018) ##
+
+*   Allow block to be passed to `ActiveJob::Base.discard_on` to allow custom handling of discard jobs.
+
+    Example:
+
+        class RemoteServiceJob < ActiveJob::Base
+          discard_on(CustomAppException) do |job, exception|
+            ExceptionNotifier.caught(exception)
+          end
+
+          def perform(*args)
+            # Might raise CustomAppException for something domain specific
+          end
+        end
+
+    *Aidan Haran*
+
+
 ## Rails 5.2.0.beta2 (November 28, 2017) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 David Heinemeier Hansson
+Copyright (c) 2014-2018 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -100,7 +100,7 @@ The latest version of Active Job can be installed with RubyGems:
   $ gem install activejob
 ```
 
-Source code can be downloaded as part of the Rails project on GitHub
+Source code can be downloaded as part of the Rails project on GitHub:
 
 * https://github.com/rails/rails/tree/master/activejob
 
@@ -117,7 +117,7 @@ API documentation is at:
 
 * http://api.rubyonrails.org
 
-Bug reports can be filed for the Ruby on Rails project here:
+Bug reports for the Ruby on Rails project can be filed here:
 
 * https://github.com/rails/rails/issues
 

data/lib/active_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2014-2017 David Heinemeier Hansson
+# Copyright (c) 2014-2018 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/active_job/core.rb

@@ -97,17 +97,23 @@ module ActiveJob
     # ==== Examples
     #
     #    class DeliverWebhookJob < ActiveJob::Base
+    #      attr_writer :attempt_number
+    #
+    #      def attempt_number
+    #        @attempt_number ||= 0
+    #      end
+    #
     #      def serialize
-    #        super.merge('attempt_number' => (@attempt_number || 0) + 1)
+    #        super.merge('attempt_number' => attempt_number + 1)
     #      end
     #
     #      def deserialize(job_data)
     #        super
-    #        @attempt_number = job_data['attempt_number']
+    #        self.attempt_number = job_data['attempt_number']
     #      end
     #
-    #      rescue_from(TimeoutError) do |exception|
-    #        raise exception if @attempt_number > 5
+    #      rescue_from(Timeout::Error) do |exception|
+    #        raise exception if attempt_number > 5
     #        retry_job(wait: 10)
     #      end
     #    end

data/lib/active_job/exceptions.rb

@@ -61,18 +61,28 @@ module ActiveJob
       # Discard the job with no attempts to retry, if the exception is raised. This is useful when the subject of the job,
       # like an Active Record, is no longer available, and the job is thus no longer relevant.
       #
+      # You can also pass a block that'll be invoked. This block is yielded with the job instance as the first and the error instance as the second parameter.
+      #
       # ==== Example
       #
       #  class SearchIndexingJob < ActiveJob::Base
       #    discard_on ActiveJob::DeserializationError
+      #    discard_on(CustomAppException) do |job, exception|
+      #      ExceptionNotifier.caught(exception)
+      #    end
       #
       #    def perform(record)
       #      # Will raise ActiveJob::DeserializationError if the record can't be deserialized
+      #      # Might raise CustomAppException for something domain specific
       #    end
       #  end
       def discard_on(exception)
         rescue_from exception do |error|
-          logger.error "Discarded #{self.class} due to a #{exception}. The original exception was #{error.cause.inspect}."
+          if block_given?
+            yield self, exception
+          else
+            logger.error "Discarded #{self.class} due to a #{exception}. The original exception was #{error.cause.inspect}."
+          end
         end
       end
     end

data/lib/active_job/gem_version.rb

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

data/lib/active_job/queue_adapter.rb

@@ -29,28 +29,22 @@ module ActiveJob
       # 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)
-        interpret_adapter(name_or_adapter_or_class)
-      end
-
-      private
-
-        def interpret_adapter(name_or_adapter_or_class)
-          case name_or_adapter_or_class
-          when Symbol, String
-            assign_adapter(name_or_adapter_or_class.to_s,
-                           ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new)
+      def queue_adapter=(name_or_adapter)
+        case name_or_adapter
+        when Symbol, String
+          queue_adapter = ActiveJob::QueueAdapters.lookup(name_or_adapter).new
+          assign_adapter(name_or_adapter.to_s, queue_adapter)
+        else
+          if queue_adapter?(name_or_adapter)
+            adapter_name = "#{name_or_adapter.class.name.demodulize.remove('Adapter').underscore}"
+            assign_adapter(adapter_name, name_or_adapter)
           else
-            if queue_adapter?(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
+            raise ArgumentError
           end
         end
+      end
 
+      private
         def assign_adapter(adapter_name, queue_adapter)
           self._queue_adapter_name = adapter_name
           self._queue_adapter = queue_adapter

data/lib/active_job/queue_adapters/sidekiq_adapter.rb

@@ -18,7 +18,7 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :sidekiq
     class SidekiqAdapter
       def enqueue(job) #:nodoc:
-        #Sidekiq::Client does not support symbols as keys
+        # Sidekiq::Client does not support symbols as keys
         job.provider_job_id = Sidekiq::Client.push \
           "class"   => JobWrapper,
           "wrapped" => job.class.to_s,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.2.0.beta2
+  version: 5.2.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-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.beta2
+        version: 5.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: 5.2.0.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.beta2/activejob
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.beta2/activejob/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc1/activejob
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc1/activejob/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Job framework with pluggable queues.