delayed_job 4.1.6.beta1 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f80efdc929cecb5ef874d86109e6858c1414c7c
-  data.tar.gz: 0c563d9994ff8f85f8ebd72b7f4e60e38e2d8b0a
+SHA256:
+  metadata.gz: b67418ad5fa9b6bb8f56f10ce7ef56bd350a9f6729932f891ef7153dfa77651b
+  data.tar.gz: 162d1df1447096b0f08ade405bccbfec41955b74e4abb54e5c338a08ecc4b7c1
 SHA512:
-  metadata.gz: 81cff020b70c213e91b86e7af8df01e57cd67aa0837675cce4aa5664d7a6109cf706cfba8cfb420443bcec2caf0092fae3bdb308b9bf95e88ad9357168c736e4
-  data.tar.gz: 98516a25aec89f676e945d2be722965566ba6a7be85dba600a272235e126f632e9918cbcbd43513196f7bd4bc5b4e4d2f651003801b0fe7e66df1681ba1cc3b9
+  metadata.gz: 132f728b6b4df3106a8fe49330aeecec2a96f905fe3af0b3c4749584b76f4bec657fe2b4510b41ef431a162b4eb4be4012f0124dc20e9c7a755f3442a15eae8e
+  data.tar.gz: c18a9b93033ab503923123a385d47c55c08270528fb6e5172b8fc6a8e723b7f01e32e0f1636b95750e6b2d5a3359a4331ab09c793e21fbf5b63b98d22e8d649d

data/CHANGELOG.md

@@ -1,7 +1,9 @@
-4.1.6 - In Progress
+4.1.6 - 2019-06-19
 =================
-* Allow Rails 6.0
-* Update failed message to be more clear
+* Properly initialize ActionMailer outside railties (#1077)
+* Fix Psych load_tags support (#1093)
+* Replace REMOVED with FAILED in log message (#1048)
+* Misc doc updates (#1052, #1074, #1064, #1063)
 
 4.1.5 - 2018-04-13
 =================

data/README.md

@@ -1,7 +1,7 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.5).](https://github.com/collectiveidea/delayed_job/tree/v4.1.5)**
+(4.1.6).](https://github.com/collectiveidea/delayed_job/tree/v4.1.6)**
 
 Delayed::Job
 ============
@@ -375,6 +375,9 @@ Hooks
 =====
 You can define hooks on your job that will be called at different stages in the process:
 
+
+**NOTE:** If you are using ActiveJob these hooks are **not** available to your jobs. You will need to use ActiveJob's callbacks. You can find details here https://guides.rubyonrails.org/active_job_basics.html#callbacks
+
 ```ruby
 class ParanoidNewsletterJob < NewsletterJob
   def enqueue(job)

data/delayed_job.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'activesupport', ['>= 3.0', '< 6.1']
+  spec.add_dependency 'activesupport', ['>= 3.0', '< 5.3']
   spec.authors        = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke']
   spec.description    = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.'
   spec.email          = ['brian@collectiveidea.com']
@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '4.1.6.beta1'
+  spec.version        = '4.1.6'
 end

data/lib/delayed/backend/base.rb

@@ -133,8 +133,7 @@ module Delayed
       end
 
       def fail!
-        self.failed_at = self.class.db_time_now
-        save!
+        update_attributes(:failed_at => self.class.db_time_now)
       end
 
     protected

data/lib/delayed/backend/shared_spec.rb

@@ -523,8 +523,7 @@ shared_examples_for 'a delayed_job backend' do
       it 'reloads changed attributes' do
         story = Story.create(:text => 'hello')
         job = story.delay.tell
-        story.text = 'goodbye'
-        story.save!
+        story.update_attributes :text => 'goodbye'
         expect(job.reload.payload_object.object.text).to eq('goodbye')
       end
 

data/lib/delayed/psych_ext.rb

@@ -28,7 +28,13 @@ module Delayed
       end
 
       def visit_Psych_Nodes_Mapping(object) # rubocop:disable CyclomaticComplexity, MethodName, PerceivedComplexity
-        return revive(Psych.load_tags[object.tag], object) if Psych.load_tags[object.tag]
+        klass = Psych.load_tags[object.tag]
+        if klass
+          # Implementation changed here https://github.com/ruby/psych/commit/2c644e184192975b261a81f486a04defa3172b3f
+          # load_tags used to have class values, now the values are strings
+          klass = resolve_class(klass) if klass.is_a?(String)
+          return revive(klass, object)
+        end
 
         case object.tag
         when %r{^!ruby/object}

data/lib/delayed/railtie.rb

@@ -4,10 +4,6 @@ require 'rails'
 module Delayed
   class Railtie < Rails::Railtie
     initializer :after_initialize do
-      ActiveSupport.on_load(:action_mailer) do
-        ActionMailer::Base.extend(Delayed::DelayMail)
-      end
-
       Delayed::Worker.logger ||= if defined?(Rails)
         Rails.logger
       elsif defined?(RAILS_DEFAULT_LOGGER)

data/lib/delayed_job.rb

@@ -3,12 +3,6 @@ require 'delayed/compatibility'
 require 'delayed/exceptions'
 require 'delayed/message_sending'
 require 'delayed/performable_method'
-
-if defined?(ActionMailer)
-  require 'action_mailer/version'
-  require 'delayed/performable_mailer'
-end
-
 require 'delayed/yaml_ext'
 require 'delayed/lifecycle'
 require 'delayed/plugin'
@@ -19,5 +13,10 @@ require 'delayed/worker'
 require 'delayed/deserialization_error'
 require 'delayed/railtie' if defined?(Rails::Railtie)
 
+ActiveSupport.on_load(:action_mailer) do
+  require 'delayed/performable_mailer'
+  ActionMailer::Base.extend(Delayed::DelayMail)
+end
+
 Object.send(:include, Delayed::MessageSending)
 Module.send(:include, Delayed::MessageSendingClassMethods)

data/spec/delayed/backend/test.rb

@@ -87,6 +87,11 @@ module Delayed
           Time.current
         end
 
+        def update_attributes(attrs = {})
+          attrs.each { |k, v| send(:"#{k}=", v) }
+          save
+        end
+
         def destroy
           self.class.all.delete(self)
         end

data/spec/helper.rb

@@ -14,7 +14,6 @@ require 'logger'
 require 'rspec'
 
 require 'action_mailer'
-require 'active_support/dependencies'
 require 'active_record'
 
 require 'delayed_job'
@@ -45,9 +44,6 @@ Delayed::Worker.backend = :test
 # Add this directory so the ActiveSupport autoloading works
 ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
 
-# Add this to simulate Railtie initializer being executed
-ActionMailer::Base.extend(Delayed::DelayMail)
-
 # Used to test interactions between DJ and an ORM
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
 ActiveRecord::Base.logger = Delayed::Worker.logger

data/spec/performable_mailer_spec.rb

@@ -1,6 +1,5 @@
 require 'helper'
 
-require 'action_mailer'
 class MyMailer < ActionMailer::Base
   def signup(email)
     mail :to => email, :subject => 'Delaying Emails', :from => 'delayedjob@example.com', :body => 'Delaying Emails Body'

data/spec/psych_ext_spec.rb

@@ -3,10 +3,32 @@ require 'helper'
 describe 'Psych::Visitors::ToRuby', :if => defined?(Psych::Visitors::ToRuby) do
   context BigDecimal do
     it 'deserializes correctly' do
-      deserialized = YAML.load("--- !ruby/object:BigDecimal 18:0.1337E2\n...\n")
+      deserialized = YAML.load_dj("--- !ruby/object:BigDecimal 18:0.1337E2\n...\n")
 
       expect(deserialized).to be_an_instance_of(BigDecimal)
       expect(deserialized).to eq(BigDecimal('13.37'))
     end
   end
+
+  context 'load_tag handling' do
+    # This only broadly works in ruby 2.0 but will cleanly work through load_dj
+    # here because this class is so simple it only touches our extention
+    YAML.load_tags['!ruby/object:RenamedClass'] = SimpleJob
+    # This is how ruby 2.1 and newer works throughout the yaml handling
+    YAML.load_tags['!ruby/object:RenamedString'] = 'SimpleJob'
+
+    it 'deserializes class tag' do
+      deserialized = YAML.load_dj("--- !ruby/object:RenamedClass\ncheck: 12\n")
+
+      expect(deserialized).to be_an_instance_of(SimpleJob)
+      expect(deserialized.instance_variable_get(:@check)).to eq(12)
+    end
+
+    it 'deserializes string tag' do
+      deserialized = YAML.load_dj("--- !ruby/object:RenamedString\ncheck: 12\n")
+
+      expect(deserialized).to be_an_instance_of(SimpleJob)
+      expect(deserialized.instance_variable_get(:@check)).to eq(12)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.1.6.beta1
+  version: 4.1.6
 platform: ruby
 authors:
 - Brandon Keepers
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,7 +26,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.3'
 description: Delayed_job (or DJ) encapsulates the common pattern of asynchronously
   executing longer tasks in the background. It is a direct extraction from Shopify
   where the job table is responsible for a multitude of core tasks.
@@ -114,12 +114,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify