fleiss 0.4.1 → 0.4.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3433257ea2a501706212f8876c0c9636a00028a6c9616daf86d66aa36d0dbd9a
4
- data.tar.gz: d792288414d281a0667fd8100475eb45ec610c3330fce5e0d8434aa3d3ac50fe
3
+ metadata.gz: 4a8ecda4ed800fa1d15848bf37c3f7f1a49cba62be614d25eea8725c00baab0d
4
+ data.tar.gz: fade5ca7d61dad9e7a912b99125b1b43159ab61df2c68b02fb8ed21a73382854
5
5
  SHA512:
6
- metadata.gz: 0fbf7922526ece6336986a26e69bfcf84263d3183ab39bb296f82ae1b08994af912d52f7d06ab16dee5f31c1100643814e220aa2052b6ca408b459ad8efb4a8d
7
- data.tar.gz: a23fe3139ea3f1f891847343333e476de1edc1bf35b24279122b734f2867a15b66d5da9cfa77c37820e511a97c40a240bc4e3c7ae77c721020591119f8c3652f
6
+ metadata.gz: ee3ee999372b9d214cd7261e115a0a5ceb7b0c3b266dc2924cb6c7f8c888fbd98140fd39a02a75e108af4f541bee564a67cef179ed62e38d4a0ae019f071f182
7
+ data.tar.gz: 70d922d556feeef102242c726c1812f4f4625ee25f19d01087074aa0725b677d0e74e043097f665b9626f3e16bc5a424f5441e8a3e96088e180cabb9d1a99b45
@@ -0,0 +1,21 @@
1
+ name: Test
2
+
3
+ on:
4
+ push:
5
+ branches: [main]
6
+ pull_request:
7
+ branches: [main]
8
+
9
+ jobs:
10
+ ruby:
11
+ runs-on: ubuntu-latest
12
+ strategy:
13
+ matrix:
14
+ ruby-version: ["2.6", "2.7", "3.0"]
15
+ steps:
16
+ - uses: actions/checkout@v2
17
+ - uses: ruby/setup-ruby@v1
18
+ with:
19
+ ruby-version: ${{ matrix.ruby-version }}
20
+ bundler-cache: true
21
+ - run: bundle exec rake
data/.rubocop.yml CHANGED
@@ -4,7 +4,6 @@ inherit_gem:
4
4
  inherit_mode:
5
5
  merge:
6
6
  - Exclude
7
-
8
7
  AllCops:
9
8
  TargetRubyVersion: "2.6"
10
9
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fleiss (0.4.1)
4
+ fleiss (0.4.5)
5
5
  activejob (>= 6.0)
6
6
  activerecord (>= 6.0)
7
7
  concurrent-ruby
@@ -9,38 +9,37 @@ PATH
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- activejob (6.1.1)
13
- activesupport (= 6.1.1)
12
+ activejob (6.1.4.1)
13
+ activesupport (= 6.1.4.1)
14
14
  globalid (>= 0.3.6)
15
- activemodel (6.1.1)
16
- activesupport (= 6.1.1)
17
- activerecord (6.1.1)
18
- activemodel (= 6.1.1)
19
- activesupport (= 6.1.1)
20
- activesupport (6.1.1)
15
+ activemodel (6.1.4.1)
16
+ activesupport (= 6.1.4.1)
17
+ activerecord (6.1.4.1)
18
+ activemodel (= 6.1.4.1)
19
+ activesupport (= 6.1.4.1)
20
+ activesupport (6.1.4.1)
21
21
  concurrent-ruby (~> 1.0, >= 1.0.2)
22
22
  i18n (>= 1.6, < 2)
23
23
  minitest (>= 5.1)
24
24
  tzinfo (~> 2.0)
25
25
  zeitwerk (~> 2.3)
26
- ast (2.4.1)
27
- concurrent-ruby (1.1.8)
26
+ ast (2.4.2)
27
+ concurrent-ruby (1.1.9)
28
28
  diff-lcs (1.4.4)
29
- globalid (0.4.2)
30
- activesupport (>= 4.2.0)
31
- i18n (1.8.7)
29
+ globalid (0.5.2)
30
+ activesupport (>= 5.0)
31
+ i18n (1.8.10)
32
32
  concurrent-ruby (~> 1.0)
33
- minitest (5.14.3)
33
+ minitest (5.14.4)
34
34
  mysql2 (0.5.3)
35
- parallel (1.20.1)
36
- parser (3.0.0.0)
35
+ parallel (1.21.0)
36
+ parser (3.0.2.0)
37
37
  ast (~> 2.4.1)
38
38
  pg (1.2.3)
39
- rack (2.2.3)
40
39
  rainbow (3.0.0)
41
- rake (13.0.3)
42
- regexp_parser (2.0.3)
43
- rexml (3.2.4)
40
+ rake (13.0.6)
41
+ regexp_parser (2.1.1)
42
+ rexml (3.2.5)
44
43
  rspec (3.10.0)
45
44
  rspec-core (~> 3.10.0)
46
45
  rspec-expectations (~> 3.10.0)
@@ -50,44 +49,39 @@ GEM
50
49
  rspec-expectations (3.10.1)
51
50
  diff-lcs (>= 1.2.0, < 2.0)
52
51
  rspec-support (~> 3.10.0)
53
- rspec-mocks (3.10.1)
52
+ rspec-mocks (3.10.2)
54
53
  diff-lcs (>= 1.2.0, < 2.0)
55
54
  rspec-support (~> 3.10.0)
56
- rspec-support (3.10.1)
57
- rubocop (1.8.1)
55
+ rspec-support (3.10.2)
56
+ rubocop (1.21.0)
58
57
  parallel (~> 1.10)
59
58
  parser (>= 3.0.0.0)
60
59
  rainbow (>= 2.2.2, < 4.0)
61
60
  regexp_parser (>= 1.8, < 3.0)
62
61
  rexml
63
- rubocop-ast (>= 1.2.0, < 2.0)
62
+ rubocop-ast (>= 1.9.1, < 2.0)
64
63
  ruby-progressbar (~> 1.7)
65
64
  unicode-display_width (>= 1.4.0, < 3.0)
66
- rubocop-ast (1.4.0)
67
- parser (>= 2.7.1.5)
68
- rubocop-bsm (0.5.4)
65
+ rubocop-ast (1.11.0)
66
+ parser (>= 3.0.1.1)
67
+ rubocop-bsm (0.6.0)
69
68
  rubocop (~> 1.0)
70
69
  rubocop-performance
71
- rubocop-rails
72
70
  rubocop-rake
73
71
  rubocop-rspec
74
- rubocop-performance (1.9.2)
75
- rubocop (>= 0.90.0, < 2.0)
72
+ rubocop-performance (1.11.5)
73
+ rubocop (>= 1.7.0, < 2.0)
76
74
  rubocop-ast (>= 0.4.0)
77
- rubocop-rails (2.9.1)
78
- activesupport (>= 4.2.0)
79
- rack (>= 1.1)
80
- rubocop (>= 0.90.0, < 2.0)
81
- rubocop-rake (0.5.1)
82
- rubocop
83
- rubocop-rspec (2.1.0)
75
+ rubocop-rake (0.6.0)
76
+ rubocop (~> 1.0)
77
+ rubocop-rspec (2.4.0)
84
78
  rubocop (~> 1.0)
85
79
  rubocop-ast (>= 1.1.0)
86
80
  ruby-progressbar (1.11.0)
87
81
  sqlite3 (1.4.2)
88
82
  tzinfo (2.0.4)
89
83
  concurrent-ruby (~> 1.0)
90
- unicode-display_width (2.0.0)
84
+ unicode-display_width (2.1.0)
91
85
  zeitwerk (2.4.2)
92
86
 
93
87
  PLATFORMS
@@ -104,4 +98,4 @@ DEPENDENCIES
104
98
  sqlite3
105
99
 
106
100
  BUNDLED WITH
107
- 2.1.4
101
+ 2.2.16
data/LICENSE CHANGED
@@ -1,13 +1,201 @@
1
- Copyright 2018 Black Square Media Ltd
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
2
4
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
6
 
7
- http://www.apache.org/licenses/LICENSE-2.0
7
+ 1. Definitions.
8
8
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2021 Black Square Media Ltd
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Fleiss
2
2
 
3
- [![Build Status](https://travis-ci.org/bsm/fleiss.png?branch=master)](https://travis-ci.org/bsm/fleiss)
3
+ [![Test](https://github.com/bsm/fleiss/actions/workflows/test.yml/badge.svg)](https://github.com/bsm/fleiss/actions/workflows/test.yml)
4
4
  [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
5
5
 
6
6
  Minimialist background jobs backed by ActiveJob and ActiveRecord.
@@ -38,6 +38,16 @@ class ExpringJob < ActiveJob::Base
38
38
  end
39
39
  ```
40
40
 
41
+ Allow to subscribe on worker perform method and detect errors
42
+
43
+ ```ruby
44
+ ActiveSupport::Notifications.subscribe('worker_perform.fleiss') do |event|
45
+ break unless event.payload.key?(:exception_object)
46
+
47
+ Raven.capture_exception(event.payload[:exception_object])
48
+ end
49
+ ```
50
+
41
51
  Include the data migration:
42
52
 
43
53
  ```ruby
data/fleiss.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'fleiss'
3
- s.version = '0.4.1'
3
+ s.version = '0.4.5'
4
4
  s.authors = ['Black Square Media Ltd']
5
5
  s.email = ['info@blacksquaremedia.com']
6
6
  s.summary = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -3,11 +3,11 @@ require 'fleiss'
3
3
  module ActiveJob
4
4
  module QueueAdapters
5
5
  class FleissAdapter
6
- def enqueue(job) #:nodoc:
6
+ def enqueue(job) # :nodoc:
7
7
  enqueue_at(job, nil)
8
8
  end
9
9
 
10
- def enqueue_at(job, scheduled_at) #:nodoc:
10
+ def enqueue_at(job, scheduled_at) # :nodoc:
11
11
  job_id = Fleiss.backend.enqueue(job, scheduled_at: scheduled_at)
12
12
  job.provider_job_id = job_id
13
13
  job_id
@@ -19,6 +19,9 @@ module Fleiss
19
19
  module ClassMethods
20
20
  def wrap_perform(&block)
21
21
  connection_pool.with_connection(&block)
22
+ rescue ::ActiveRecord::StatementInvalid
23
+ ::ActiveRecord::Base.clear_all_connections!
24
+ raise
22
25
  end
23
26
 
24
27
  # @return [ActiveRecord::Relation] pending scope
data/lib/fleiss/worker.rb CHANGED
@@ -5,14 +5,12 @@ require 'securerandom'
5
5
  class Fleiss::Worker
6
6
  attr_reader :queues, :uuid, :wait_time
7
7
 
8
- # Shortcut for new(*args).run
9
- def self.run(*args)
10
- new(*args).run
8
+ # Shortcut for new(**opts).run
9
+ def self.run(**opts)
10
+ new(**opts).run
11
11
  end
12
12
 
13
13
  # Init a new worker instance
14
- # @param [ConnectionPool] disque client connection pool
15
- # @param [Hash] options
16
14
  # @option [Array<String>] :queues queues to watch. Default: ["default"]
17
15
  # @option [Integer] :concurrency the number of concurrent pool. Default: 10
18
16
  # @option [Numeric] :wait_time maximum time (in seconds) to wait for jobs when retrieving next batch. Default: 1s.
@@ -62,21 +60,24 @@ class Fleiss::Worker
62
60
 
63
61
  batch.each do |job|
64
62
  @pool.post do
65
- Fleiss.backend.wrap_perform { perform(job) }
63
+ thread_id = Thread.current.object_id.to_s(16).reverse
64
+ Fleiss.backend.wrap_perform { perform(job, thread_id) }
65
+ rescue StandardError => e
66
+ log_exception e, "processing job ##{job.id} (by thread #{thread_id})"
66
67
  end
67
68
  end
68
69
  rescue StandardError => e
69
- handle_exception e, 'running cycle'
70
+ log_exception e, 'running cycle'
70
71
  end
71
72
 
72
- def perform(job)
73
- thread_id = Thread.current.object_id.to_s(16).reverse
74
- owner = "#{uuid}/#{thread_id}"
73
+ def perform(job, thread_id)
74
+ owner = "#{uuid}/#{thread_id}"
75
75
  return unless job.start(owner)
76
76
 
77
77
  log(:info) { "Worker #{uuid} execute job ##{job.id} (by thread #{thread_id})" }
78
78
  finished = false
79
- begin
79
+
80
+ ActiveSupport::Notifications.instrument('worker_perform.fleiss', id: job.id, uuid: uuid, thread_id: thread_id) do |payload|
80
81
  ActiveJob::Base.execute job.job_data
81
82
  finished = true
82
83
  rescue StandardError
@@ -84,12 +85,11 @@ class Fleiss::Worker
84
85
  raise
85
86
  ensure
86
87
  finished ? job.finish(owner) : job.reschedule(owner)
88
+ payload[:finished] = finished
87
89
  end
88
- rescue StandardError => e
89
- handle_exception e, "processing job ##{job.id} (by thread #{thread_id})"
90
90
  end
91
91
 
92
- def handle_exception(err, intro)
92
+ def log_exception(err, intro)
93
93
  log(:error) do
94
94
  [
95
95
  "Worker #{uuid} error on #{intro}:",
@@ -123,4 +123,13 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
123
123
  expect(rec.started_at).to be_nil
124
124
  expect(rec.scheduled_at).to be_within(2.seconds).of(Time.zone.now)
125
125
  end
126
+
127
+ it 'reconnects' do
128
+ expect(::ActiveRecord::Base).to receive(:clear_all_connections!).once.and_return(nil)
129
+
130
+ expect do
131
+ described_class.wrap_perform { raise ::ActiveRecord::StatementInvalid }
132
+ end
133
+ .to raise_error(::ActiveRecord::StatementInvalid) # re-raised anyway
134
+ end
126
135
  end
@@ -16,6 +16,13 @@ RSpec.describe Fleiss::Worker do
16
16
  runner.kill
17
17
  end
18
18
 
19
+ around do |example|
20
+ callback = ->(*args) { notifications.push ActiveSupport::Notifications::Event.new(*args) }
21
+ ActiveSupport::Notifications.subscribed(callback, 'worker_perform.fleiss') do
22
+ example.call
23
+ end
24
+ end
25
+
19
26
  def wait_for
20
27
  100.times do
21
28
  break if yield
@@ -43,5 +50,19 @@ RSpec.describe Fleiss::Worker do
43
50
  TestJob.perform_later('raise')
44
51
  wait_for { Fleiss.backend.not_finished.count.zero? }
45
52
  expect(Fleiss.backend.finished.count).to eq(1)
53
+
54
+ expect(notifications.size).to eq(1)
55
+ expect(notifications.first.payload).to have_key(:id)
56
+ expect(notifications.first.payload).to have_key(:uuid)
57
+ expect(notifications.first.payload).to have_key(:thread_id)
58
+ expect(notifications.first.payload[:finished]).to be_truthy
59
+ expect(notifications.first.payload[:exception_object]).to be_an_instance_of(RuntimeError)
60
+ expect(notifications.first.payload[:exception_object].message).to eq('Failing')
61
+ end
62
+
63
+ private
64
+
65
+ def notifications
66
+ @notifications ||= []
46
67
  end
47
68
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fleiss
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Black Square Media Ltd
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-01-21 00:00:00.000000000 Z
11
+ date: 2021-10-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activejob
@@ -159,9 +159,9 @@ extensions: []
159
159
  extra_rdoc_files: []
160
160
  files:
161
161
  - ".editorconfig"
162
+ - ".github/workflows/test.yml"
162
163
  - ".gitignore"
163
164
  - ".rubocop.yml"
164
- - ".travis.yml"
165
165
  - Gemfile
166
166
  - Gemfile.lock
167
167
  - LICENSE
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
202
202
  - !ruby/object:Gem::Version
203
203
  version: '0'
204
204
  requirements: []
205
- rubygems_version: 3.1.4
205
+ rubygems_version: 3.2.15
206
206
  signing_key:
207
207
  specification_version: 4
208
208
  summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.
data/.travis.yml DELETED
@@ -1,15 +0,0 @@
1
- language: ruby
2
- rvm:
3
- - 2.7
4
- - 2.6
5
- before_install:
6
- - gem install bundler
7
- - mysql -e 'CREATE DATABASE fleiss_test;'
8
- - psql -c 'CREATE DATABASE fleiss_test;' -U postgres
9
- services:
10
- - postgresql
11
- - mysql
12
- env:
13
- - DATABASE_URL=sqlite3:///tmp/fleiss_test.sqlite3
14
- - DATABASE_URL=mysql2://travis@127.0.0.1/fleiss_test
15
- - DATABASE_URL=postgresql://127.0.0.1/fleiss_test