queue_classic_plus 4.0.0.alpha8 → 4.0.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69af5e1cbbcc08c7cd0acad4c0f06e112a9fff09756a06c9ae2ffd80a71ab39a
-  data.tar.gz: cd3cc486050b9de66397099f81e0277aac83f5469bb925456527b331dec85a6a
+  metadata.gz: 998da8f0e2f5f397e1125b9f47f447ba3cdb17908e79bb4eb9d34a5acb87f7d8
+  data.tar.gz: fb21b8b1175142d27792885d814597c145b68fe2e82e8541d6db78a000c30a86
 SHA512:
-  metadata.gz: 8d3980cb5a576ff5681812a2e5d7497c35ff98dc84934778f4dd3c867643e10e9d87a38499bad6850cc72d1c4cd519a91a2509011f8ad916e78b10be3c2e076e
-  data.tar.gz: c31d0baa284b76731b268e29ab21b3ae0e679f7404345d3b449fb755a34df11100d6f6790a6f9e0dfb373ed908a8fa365575d88184f96d28a079270be5e67605
+  metadata.gz: 84850b2d1be63a0127adf54eab5d810b6fde5de1d9ee2826a2121f76343fc3442cac74de674858234fcf5ae1f25c418f70d578e242280f83485a892e935f13e3
+  data.tar.gz: 1e2e3b3ca6d2280c5aa445737b7179e2bd7f800c8c5a971d81fc3978f753189f437c99fe6ea81b7d69c079b631e4da41c1adf09032f9fe92863c8003e3fd8ee4

data/README.md

@@ -169,3 +169,7 @@ require "queue_classic_plus/datadog"
 ```
 createdb queue_classic_plus_test
 ```
+
+## Releasing
+
+Releasing is done in CircleCI via the `push_to_rubygems`, triggered by pushing a tagged commit. To do so, simply [create a new GitHub release](https://github.com/rainforestapp/queue_classic_plus/releases/new).

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha8'.freeze
+  VERSION = '4.0.0.alpha9'.freeze
 end

data/lib/queue_classic_plus/worker.rb

@@ -25,13 +25,14 @@ module QueueClassicPlus
       end
 
       @failed_job = job
-      @failed_job_args = failed_job_class ? failed_job_class.deserialized(job[:args]) : job[:args]
+      @raw_args = job[:args]
+      @failed_job_args = failed_job_class ? failed_job_class.deserialized(@raw_args) : @raw_args
 
       if force_retry && !(failed_job_class.respond_to?(:disable_retries) && failed_job_class.disable_retries)
         Metrics.increment("qc.force_retry", source: @q_name)
         retry_with_remaining(e)
       # The mailers doesn't have a retries_on?
-    elsif failed_job_class && failed_job_class.respond_to?(:retries_on?) && failed_job_class.retries_on?(e)
+      elsif failed_job_class.respond_to?(:retries_on?) && failed_job_class.retries_on?(e)
         Metrics.increment("qc.retry", source: @q_name)
         retry_with_remaining(e)
       else
@@ -60,11 +61,9 @@ module QueueClassicPlus
     end
 
     def failed_job_class
-      begin
-        Object.const_get(@failed_job[:method].split('.')[0])
-      rescue NameError
-        nil
-      end
+      Object.const_get(@failed_job[:method].split('.')[0])
+    rescue NameError
+      nil
     end
 
     def backoff
@@ -80,7 +79,8 @@ module QueueClassicPlus
     def enqueue_failed(e)
       sql = "INSERT INTO #{QC.table_name} (q_name, method, args, last_error) VALUES ('failed_jobs', $1, $2, $3)"
       last_error = e.backtrace ? ([e.message] + e.backtrace ).join("\n") : e.message
-      QC.default_conn_adapter.execute sql, @failed_job[:method], JSON.dump(@failed_job_args), last_error
+
+      QC.default_conn_adapter.execute sql, @failed_job[:method], JSON.dump(@raw_args), last_error
 
       QueueClassicPlus.exception_handler.call(e, @failed_job)
       Metrics.increment("qc.errors", source: @q_name)

data/spec/base_spec.rb

@@ -160,11 +160,7 @@ describe QueueClassicPlus::Base do
       end
     end
 
-    context "with Rails defined" do
-      require 'active_job/arguments'
-
-      before { stub_const('Rails', true) }
-
+    context "with Rails defined", rails: true do
       subject do
         Class.new(QueueClassicPlus::Base) do
           @queue = :test

data/spec/spec_helper.rb

@@ -26,4 +26,11 @@ RSpec.configure do |config|
     # Reset the default (memoized) queue instance between specs
     QC.default_queue = nil
   end
+
+  config.before(:each, rails: true) do
+    require 'active_job'
+    require 'active_job/arguments'
+
+    stub_const('Rails', Struct.new(:logger).new(Logger.new(STDOUT)))
+  end
 end

data/spec/worker_spec.rb

@@ -26,6 +26,26 @@ describe QueueClassicPlus::CustomWorker do
       worker.work
       expect(failed_queue.count).to eq(1)
     end
+
+    context 'when Rails is defined', rails: true do
+      let(:job_type) { Jobs::Tests::TestJobNoRetry }
+      let(:queue) { job_type.queue }
+
+      it 'properly serializes arguments for jobs in the failed queue' do
+        job_type.enqueue_perform(:raise)
+        expect(failed_queue.count).to eq(0)
+        worker.work
+
+        expect(failed_queue.count).to eq(1)
+        job = QueueClassicMatchers::QueueClassicRspec.find_by_args(
+          'failed_jobs',
+          'Jobs::Tests::TestJobNoRetry._perform',
+          [:raise]).first
+
+        expect(job).to_not be_nil
+        expect(job['last_error']).to_not be_nil
+      end
+    end
   end
 
   context "retry" do
@@ -67,12 +87,7 @@ describe QueueClassicPlus::CustomWorker do
       end
     end
 
-    context 'when Rails is defined' do
-      require 'active_job'
-      require 'active_job/arguments'
-
-      before { stub_const('Rails', Struct.new(:logger).new(Logger.new(STDOUT))) }
-
+    context 'when Rails is defined', rails: true do
       it 'retries' do
         expect do
           job_type.enqueue_perform(:foo)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha8
+  version: 4.0.0.alpha9
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic