delayed_job 4.1.6 → 4.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67418ad5fa9b6bb8f56f10ce7ef56bd350a9f6729932f891ef7153dfa77651b
-  data.tar.gz: 162d1df1447096b0f08ade405bccbfec41955b74e4abb54e5c338a08ecc4b7c1
+  metadata.gz: 2c2e880a669ae56ceb7d75aa435f7a24540f3ff1669d5f0513eb82d7418cbcb5
+  data.tar.gz: aa5972d6556772c30eae6bff54bfa6fe02216d532af37d780f4da58c3beff702
 SHA512:
-  metadata.gz: 132f728b6b4df3106a8fe49330aeecec2a96f905fe3af0b3c4749584b76f4bec657fe2b4510b41ef431a162b4eb4be4012f0124dc20e9c7a755f3442a15eae8e
-  data.tar.gz: c18a9b93033ab503923123a385d47c55c08270528fb6e5172b8fc6a8e723b7f01e32e0f1636b95750e6b2d5a3359a4331ab09c793e21fbf5b63b98d22e8d649d
+  metadata.gz: edc7f370dc4f2783ada28648641be2274fee0adc260d2f4f230a999884850c5cff6aa5086b5df56c0be288ac23dd9edc997b48dc24b378ab8b8c99bf9e74107f
+  data.tar.gz: 3e5162db607ddf2d9b35c4a931deea4dfd494a683730652b14d067b911717c4bb8484205cec85190c7a695dba01ef68d405e6070ec961471fd9c32630c0e352c

data/CHANGELOG.md

@@ -1,21 +1,34 @@
+4.1.9 - 2020-12-09
+==================
+* Support for Rails 6.1
+* Add support for parameterized mailers via delay call (#1121)
+
+4.1.8 - 2019-08-16
+==================
+* Support for Rails 6.0.0
+
+4.1.7 - 2019-06-20
+==================
+* Fix loading Delayed::PerformableMailer when ActionMailer isn't loaded yet
+
 4.1.6 - 2019-06-19
-=================
+==================
 * 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
-=================
+==================
 * Allow Rails 5.2
 
 4.1.4 - 2017-12-29
-=================
+==================
 * Use `yaml_tag` instead of deprecated `yaml_as` (#996)
 * Support ruby 2.5.0
 
 4.1.3 - 2017-05-26
-=================
+==================
 * Don't mutate the options hash (#877)
 * Log an error message when a deserialization error occurs (#894)
 * Adding the queue name to the log output (#917)

data/README.md

@@ -1,17 +1,16 @@
 **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.6).](https://github.com/collectiveidea/delayed_job/tree/v4.1.6)**
+(4.1.9).](https://github.com/collectiveidea/delayed_job/tree/v4.1.9)**
 
 Delayed::Job
 ============
 [![Gem Version](https://badge.fury.io/rb/delayed_job.svg)][gem]
-[![Build Status](https://travis-ci.org/collectiveidea/delayed_job.svg?branch=master)][travis]
+![CI](https://github.com/collectiveidea/delayed_job/workflows/CI/badge.svg)
 [![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job.svg)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/collectiveidea/delayed_job/badge.svg?branch=master)][coveralls]
 
 [gem]: https://rubygems.org/gems/delayed_job
-[travis]: https://travis-ci.org/collectiveidea/delayed_job
 [codeclimate]: https://codeclimate.com/github/collectiveidea/delayed_job
 [coveralls]: https://coveralls.io/r/collectiveidea/delayed_job
 
@@ -168,9 +167,10 @@ end
 
 If you ever want to call a `handle_asynchronously`'d method without Delayed Job, for instance while debugging something at the console, just add `_without_delay` to the method name. For instance, if your original method was `foo`, then call `foo_without_delay`.
 
-Rails 3 Mailers
-===============
-Due to how mailers are implemented in Rails 3, we had to do a little work around to get delayed_job to work.
+Rails Mailers
+=============
+Delayed Job uses special syntax for Rails Mailers.
+Do not call the `.deliver` method when using `.delay`.
 
 ```ruby
 # without delayed_job
@@ -179,12 +179,16 @@ Notifier.signup(@user).deliver
 # with delayed_job
 Notifier.delay.signup(@user)
 
-# with delayed_job running at a specific time
+# delayed_job running at a specific time
 Notifier.delay(run_at: 5.minutes.from_now).signup(@user)
+
+# when using parameters, the .with method must be called before the .delay method
+Notifier.with(foo: 1, bar: 2).delay.signup(@user)
 ```
 
-Remove the `.deliver` method to make it work. It's not ideal, but it's the best
-we could do for now.
+You may also wish to consider using
+[Active Job with Action Mailer](https://edgeguides.rubyonrails.org/active_job_basics.html#action-mailer)
+which provides convenient `.deliver_later` syntax that forwards to Delayed Job under-the-hood.
 
 Named Queues
 ============

data/delayed_job.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'activesupport', ['>= 3.0', '< 5.3']
+  spec.add_dependency 'activesupport', ['>= 3.0', '< 6.2']
   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,10 @@ 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'
+  spec.version        = '4.1.9'
+  spec.metadata       = {
+    'changelog_uri'   => 'https://github.com/collectiveidea/delayed_job/blob/master/CHANGELOG.md',
+    'bug_tracker_uri' => 'https://github.com/collectiveidea/delayed_job/issues',
+    'source_code_uri' => 'https://github.com/collectiveidea/delayed_job'
+  }
 end

data/lib/delayed/backend/base.rb

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

data/lib/delayed/backend/shared_spec.rb

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

data/lib/delayed_job.rb

@@ -16,6 +16,11 @@ require 'delayed/railtie' if defined?(Rails::Railtie)
 ActiveSupport.on_load(:action_mailer) do
   require 'delayed/performable_mailer'
   ActionMailer::Base.extend(Delayed::DelayMail)
+  ActionMailer::Parameterized::Mailer.include(Delayed::DelayMail) if defined?(ActionMailer::Parameterized::Mailer)
+end
+
+module Delayed
+  autoload :PerformableMailer, 'delayed/performable_mailer'
 end
 
 Object.send(:include, Delayed::MessageSending)

data/spec/delayed/backend/test.rb

@@ -87,11 +87,6 @@ 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

@@ -1,13 +1,19 @@
 require 'simplecov'
-require 'coveralls'
+require 'simplecov-lcov'
 
-SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+SimpleCov::Formatter::LcovFormatter.config do |c|
+  c.report_with_single_file = true
+  c.single_report_path = 'coverage/lcov.info'
+end
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter
+  ]
+)
 
 SimpleCov.start do
   add_filter '/spec/'
-  # Each version of ruby and version of rails test different things
-  # This should probably just be removed.
-  minimum_coverage(85.0)
 end
 
 require 'logger'

data/spec/performable_mailer_spec.rb

@@ -40,3 +40,29 @@ describe ActionMailer::Base do
     end
   end
 end
+
+if defined?(ActionMailer::Parameterized::Mailer)
+  describe ActionMailer::Parameterized::Mailer do
+    describe 'delay' do
+      it 'enqueues a PerformableEmail job' do
+        expect do
+          job = MyMailer.with(:foo => 1, :bar => 2).delay.signup('john@example.com')
+          expect(job.payload_object.class).to eq(Delayed::PerformableMailer)
+          expect(job.payload_object.object.class).to eq(ActionMailer::Parameterized::Mailer)
+          expect(job.payload_object.object.instance_variable_get('@mailer')).to eq(MyMailer)
+          expect(job.payload_object.object.instance_variable_get('@params')).to eq(:foo => 1, :bar => 2)
+          expect(job.payload_object.method_name).to eq(:signup)
+          expect(job.payload_object.args).to eq(['john@example.com'])
+        end.to change { Delayed::Job.count }.by(1)
+      end
+    end
+
+    describe 'delay on a mail object' do
+      it 'raises an exception' do
+        expect do
+          MyMailer.with(:foo => 1, :bar => 2).signup('john@example.com').delay
+        end.to raise_error(RuntimeError)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.9
 platform: ruby
 authors:
 - Brandon Keepers
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2020-12-09 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: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
 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.
@@ -102,7 +102,10 @@ files:
 homepage: http://github.com/collectiveidea/delayed_job
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/collectiveidea/delayed_job/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/collectiveidea/delayed_job/issues
+  source_code_uri: https://github.com/collectiveidea/delayed_job
 post_install_message: 
 rdoc_options: []
 require_paths: