fleiss 0.3.0 → 0.4.2

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: 5f5d2237b3a3bb01c8998c273a9fbb4f65cbf75b737df03187db2315c1efa93d
4
- data.tar.gz: c80f8f0423dea4b516e824ccb669ec2e34abb6c2365adbe5cea937101526c429
3
+ metadata.gz: fb1ff85a0ec51e90e089851ded43d6f7bb5458061e511e9a137109e3e3bb3b1f
4
+ data.tar.gz: 8a979667dafbe94d350cb1bf7c8375379fede61578f6251874ed69c753c908c0
5
5
  SHA512:
6
- metadata.gz: e497a57b2aec4333ce4cde801a7bcf631546158c1b4c1d2b2a663ca997066438f01bb14b5103637cbb661c168e403c4b21014dbe92ee2fb927806a377b788f21
7
- data.tar.gz: 7d18e086ebe3ca8f6d8c0c025ca302abdfa487487548c38664d18904cd5c3a8d7e1997132054af334c5cbb1e8863b01fcdf176546f7d9d300e30443a2958bbe0
6
+ metadata.gz: 3a374d658b0fabd11e0649118ed7e4a37adefb6aca004b3f91fbb5a6794026c3b0b6be72df8ffe690b6638988ec5fa62e60a226430de360e3a0a5958da65317d
7
+ data.tar.gz: a79f26b1b852c395c9282a770713991e7ed863ceb99b12611ab35e74fdbd084d15dea6d34ce0640aa653d238a586df71156bc514cc5887a9b115ea54699a3e74
@@ -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/.gitignore CHANGED
@@ -1,2 +1,3 @@
1
1
  .rubocop-*
2
2
  pkg/
3
+ spec/tmp
data/.rubocop.yml CHANGED
@@ -1,8 +1,11 @@
1
- inherit_from:
2
- - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
3
-
1
+ inherit_gem:
2
+ rubocop-bsm:
3
+ - default.yml
4
+ inherit_mode:
5
+ merge:
6
+ - Exclude
4
7
  AllCops:
5
- TargetRubyVersion: "2.4"
8
+ TargetRubyVersion: "2.6"
6
9
 
7
10
  Security/Open:
8
11
  Exclude:
data/Gemfile.lock CHANGED
@@ -1,71 +1,88 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fleiss (0.3.0)
5
- activejob (>= 5.0)
6
- activerecord (>= 5.0)
4
+ fleiss (0.4.2)
5
+ activejob (>= 6.0)
6
+ activerecord (>= 6.0)
7
7
  concurrent-ruby
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- activejob (5.2.3)
13
- activesupport (= 5.2.3)
12
+ activejob (6.1.4)
13
+ activesupport (= 6.1.4)
14
14
  globalid (>= 0.3.6)
15
- activemodel (5.2.3)
16
- activesupport (= 5.2.3)
17
- activerecord (5.2.3)
18
- activemodel (= 5.2.3)
19
- activesupport (= 5.2.3)
20
- arel (>= 9.0)
21
- activesupport (5.2.3)
15
+ activemodel (6.1.4)
16
+ activesupport (= 6.1.4)
17
+ activerecord (6.1.4)
18
+ activemodel (= 6.1.4)
19
+ activesupport (= 6.1.4)
20
+ activesupport (6.1.4)
22
21
  concurrent-ruby (~> 1.0, >= 1.0.2)
23
- i18n (>= 0.7, < 2)
24
- minitest (~> 5.1)
25
- tzinfo (~> 1.1)
26
- arel (9.0.0)
27
- ast (2.4.0)
28
- concurrent-ruby (1.1.5)
29
- diff-lcs (1.3)
22
+ i18n (>= 1.6, < 2)
23
+ minitest (>= 5.1)
24
+ tzinfo (~> 2.0)
25
+ zeitwerk (~> 2.3)
26
+ ast (2.4.2)
27
+ concurrent-ruby (1.1.9)
28
+ diff-lcs (1.4.4)
30
29
  globalid (0.4.2)
31
30
  activesupport (>= 4.2.0)
32
- i18n (1.6.0)
31
+ i18n (1.8.10)
33
32
  concurrent-ruby (~> 1.0)
34
- jaro_winkler (1.5.2)
35
- minitest (5.11.3)
36
- mysql2 (0.5.2)
37
- parallel (1.17.0)
38
- parser (2.6.3.0)
39
- ast (~> 2.4.0)
40
- pg (1.1.4)
33
+ minitest (5.14.4)
34
+ mysql2 (0.5.3)
35
+ parallel (1.20.1)
36
+ parser (3.0.2.0)
37
+ ast (~> 2.4.1)
38
+ pg (1.2.3)
41
39
  rainbow (3.0.0)
42
- rake (12.3.2)
43
- rspec (3.8.0)
44
- rspec-core (~> 3.8.0)
45
- rspec-expectations (~> 3.8.0)
46
- rspec-mocks (~> 3.8.0)
47
- rspec-core (3.8.0)
48
- rspec-support (~> 3.8.0)
49
- rspec-expectations (3.8.3)
40
+ rake (13.0.6)
41
+ regexp_parser (2.1.1)
42
+ rexml (3.2.5)
43
+ rspec (3.10.0)
44
+ rspec-core (~> 3.10.0)
45
+ rspec-expectations (~> 3.10.0)
46
+ rspec-mocks (~> 3.10.0)
47
+ rspec-core (3.10.1)
48
+ rspec-support (~> 3.10.0)
49
+ rspec-expectations (3.10.1)
50
50
  diff-lcs (>= 1.2.0, < 2.0)
51
- rspec-support (~> 3.8.0)
52
- rspec-mocks (3.8.0)
51
+ rspec-support (~> 3.10.0)
52
+ rspec-mocks (3.10.2)
53
53
  diff-lcs (>= 1.2.0, < 2.0)
54
- rspec-support (~> 3.8.0)
55
- rspec-support (3.8.0)
56
- rubocop (0.71.0)
57
- jaro_winkler (~> 1.5.1)
54
+ rspec-support (~> 3.10.0)
55
+ rspec-support (3.10.2)
56
+ rubocop (1.18.3)
58
57
  parallel (~> 1.10)
59
- parser (>= 2.6)
58
+ parser (>= 3.0.0.0)
60
59
  rainbow (>= 2.2.2, < 4.0)
60
+ regexp_parser (>= 1.8, < 3.0)
61
+ rexml
62
+ rubocop-ast (>= 1.7.0, < 2.0)
61
63
  ruby-progressbar (~> 1.7)
62
- unicode-display_width (>= 1.4.0, < 1.7)
63
- ruby-progressbar (1.10.1)
64
- sqlite3 (1.3.13)
65
- thread_safe (0.3.6)
66
- tzinfo (1.2.5)
67
- thread_safe (~> 0.1)
68
- unicode-display_width (1.6.0)
64
+ unicode-display_width (>= 1.4.0, < 3.0)
65
+ rubocop-ast (1.8.0)
66
+ parser (>= 3.0.1.1)
67
+ rubocop-bsm (0.6.0)
68
+ rubocop (~> 1.0)
69
+ rubocop-performance
70
+ rubocop-rake
71
+ rubocop-rspec
72
+ rubocop-performance (1.11.4)
73
+ rubocop (>= 1.7.0, < 2.0)
74
+ rubocop-ast (>= 0.4.0)
75
+ rubocop-rake (0.6.0)
76
+ rubocop (~> 1.0)
77
+ rubocop-rspec (2.4.0)
78
+ rubocop (~> 1.0)
79
+ rubocop-ast (>= 1.1.0)
80
+ ruby-progressbar (1.11.0)
81
+ sqlite3 (1.4.2)
82
+ tzinfo (2.0.4)
83
+ concurrent-ruby (~> 1.0)
84
+ unicode-display_width (2.0.0)
85
+ zeitwerk (2.4.2)
69
86
 
70
87
  PLATFORMS
71
88
  ruby
@@ -77,8 +94,8 @@ DEPENDENCIES
77
94
  pg
78
95
  rake
79
96
  rspec
80
- rubocop
81
- sqlite3 (~> 1.3.6)
97
+ rubocop-bsm
98
+ sqlite3
82
99
 
83
100
  BUNDLED WITH
84
- 2.0.1
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.
data/bin/fleiss CHANGED
@@ -5,8 +5,8 @@ $LOAD_PATH.push(lib_dir) unless $LOAD_PATH.include?(lib_dir)
5
5
 
6
6
  require 'fleiss/cli'
7
7
 
8
- STDOUT.sync = true
9
- STDERR.sync = true
8
+ $stdout.sync = true
9
+ $stderr.sync = true
10
10
 
11
11
  cli = Fleiss::CLI.instance
12
12
  begin
@@ -14,7 +14,7 @@ begin
14
14
  cli.run!
15
15
  rescue ArgumentError => e
16
16
  warn " ! #{e.message}\n"
17
- STDERR.puts
17
+ $stderr.puts
18
18
  warn cli.parser
19
19
  exit 1
20
20
  rescue StandardError => e
data/fleiss.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'fleiss'
3
- s.version = '0.3.0'
3
+ s.version = '0.4.2'
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.)
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
13
13
  s.test_files = `git ls-files -z -- spec/*`.split("\x0")
14
14
  s.require_paths = ['lib']
15
- s.required_ruby_version = '>= 2.4'
15
+ s.required_ruby_version = '>= 2.6'
16
16
 
17
- s.add_dependency 'activejob', '>= 5.0'
18
- s.add_dependency 'activerecord', '>= 5.0'
17
+ s.add_dependency 'activejob', '>= 6.0'
18
+ s.add_dependency 'activerecord', '>= 6.0'
19
19
  s.add_dependency 'concurrent-ruby'
20
20
 
21
21
  s.add_development_dependency 'bundler'
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
23
23
  s.add_development_dependency 'pg'
24
24
  s.add_development_dependency 'rake'
25
25
  s.add_development_dependency 'rspec'
26
- s.add_development_dependency 'rubocop'
27
- s.add_development_dependency 'sqlite3', '~> 1.3.6'
26
+ s.add_development_dependency 'rubocop-bsm'
27
+ s.add_development_dependency 'sqlite3'
28
28
  end
@@ -8,19 +8,24 @@ module Fleiss
8
8
  scope :in_queue, ->(qs) { where(queue_name: Array.wrap(qs)) }
9
9
  scope :finished, -> { where.not(finished_at: nil) }
10
10
  scope :not_finished, -> { where(finished_at: nil) }
11
- scope :not_expired, ->(now=Time.zone.now) { where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now))) }
11
+ scope :not_expired, lambda {|now = Time.zone.now|
12
+ where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now)))
13
+ }
12
14
  scope :started, -> { where(arel_table[:started_at].not_eq(nil)) }
13
15
  scope :not_started, -> { where(arel_table[:started_at].eq(nil)) }
14
- scope :scheduled, ->(now=Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
16
+ scope :scheduled, ->(now = Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
15
17
  end
16
18
 
17
19
  module ClassMethods
18
20
  def wrap_perform(&block)
19
21
  connection_pool.with_connection(&block)
22
+ rescue ::ActiveRecord::StatementInvalid
23
+ ::ActiveRecord::Base.clear_active_connections!
24
+ raise
20
25
  end
21
26
 
22
27
  # @return [ActiveRecord::Relation] pending scope
23
- def pending(now=Time.zone.now)
28
+ def pending(now = Time.zone.now)
24
29
  not_finished
25
30
  .not_expired(now)
26
31
  .not_started
@@ -102,9 +107,12 @@ module Fleiss
102
107
  private
103
108
 
104
109
  def with_isolation(&block)
105
- return yield unless self.class.connection.supports_transaction_isolation?
106
-
107
- self.class.transaction(isolation: :repeatable_read, &block)
110
+ conn = self.class.connection
111
+ if conn.supports_transaction_isolation? && conn.adapter_name != 'SQLite'
112
+ self.class.transaction(isolation: :repeatable_read, &block)
113
+ else
114
+ yield
115
+ end
108
116
  end
109
117
  end
110
118
  end
@@ -3,7 +3,7 @@ require 'fleiss/backend/active_record'
3
3
  module Fleiss
4
4
  module Backend
5
5
  class ActiveRecord
6
- class Migration < ::ActiveRecord::Migration[5.0]
6
+ class Migration < ::ActiveRecord::Migration[6.0]
7
7
  def change
8
8
  create_table :fleiss_jobs do |t|
9
9
  t.string :queue_name, limit: 50, null: false
data/lib/fleiss/cli.rb CHANGED
@@ -22,7 +22,7 @@ module Fleiss
22
22
  @opts = DEFAULT_OPTIONS.dup
23
23
  end
24
24
 
25
- def parse!(argv=ARGV)
25
+ def parse!(argv = ARGV)
26
26
  parser.parse!(argv)
27
27
 
28
28
  # Check config file
@@ -15,7 +15,7 @@ class Fleiss::Executor < Concurrent::SimpleExecutorService
15
15
 
16
16
  private
17
17
 
18
- def ns_initialize(opts={})
18
+ def ns_initialize(opts = {})
19
19
  super()
20
20
  @max_size = opts.fetch(:max_size, 1).to_i
21
21
  end
@@ -5,7 +5,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
5
5
  described_class.find(job.provider_job_id)
6
6
  end
7
7
 
8
- it 'should persist jobs' do
8
+ it 'persists jobs' do
9
9
  job = TestJob.perform_later
10
10
  rec = retrieve(job)
11
11
 
@@ -28,25 +28,25 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
28
28
  )
29
29
  end
30
30
 
31
- it 'should enqueue with delay' do
31
+ it 'enqueues with delay' do
32
32
  job = TestJob.set(wait: 1.day).perform_later
33
33
  rec = retrieve(job)
34
34
  expect(rec.scheduled_at).to be_within(2.seconds).of(1.day.from_now)
35
35
  end
36
36
 
37
- it 'should enqueue with priority' do
37
+ it 'enqueues with priority' do
38
38
  job = TestJob.set(priority: 8).perform_later
39
39
  rec = retrieve(job)
40
40
  expect(rec.priority).to eq(8)
41
41
  end
42
42
 
43
- it 'should expose active job ID' do
43
+ it 'exposes active job ID' do
44
44
  job = TestJob.perform_later
45
45
  rec = retrieve(job)
46
46
  expect(rec.job_id.size).to eq(36)
47
47
  end
48
48
 
49
- it 'should scope pending' do
49
+ it 'scopes pending' do
50
50
  j1 = TestJob.perform_later
51
51
  expect(retrieve(j1).start('owner')).to be_truthy
52
52
  expect(retrieve(j1).finish('owner')).to be_truthy
@@ -58,7 +58,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
58
58
  expect(described_class.pending.ids).to eq [j4.provider_job_id, j2.provider_job_id]
59
59
  end
60
60
 
61
- it 'should scope in_progress' do
61
+ it 'scopes in_progress' do
62
62
  _j1 = TestJob.perform_later
63
63
  j2 = TestJob.perform_later
64
64
  expect(retrieve(j2).start('owner')).to be_truthy
@@ -72,14 +72,14 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
72
72
  expect(described_class.in_progress('owner').ids).to eq [j2.provider_job_id]
73
73
  end
74
74
 
75
- it 'should scope by queue' do
75
+ it 'scopes by queue' do
76
76
  j1 = TestJob.perform_later
77
77
  j2 = TestJob.set(queue: 'other').perform_later
78
78
  expect(described_class.in_queue('test-queue').ids).to eq [j1.provider_job_id]
79
79
  expect(described_class.in_queue('other').ids).to eq [j2.provider_job_id]
80
80
  end
81
81
 
82
- it 'should start' do
82
+ it 'starts' do
83
83
  job = TestJob.perform_later
84
84
  rec = retrieve(job)
85
85
  expect(rec.start('owner')).to be_truthy
@@ -88,7 +88,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
88
88
  expect(rec.started_at).to be_within(2.seconds).of(Time.zone.now)
89
89
  end
90
90
 
91
- it 'should lock atomically' do
91
+ it 'locks atomically' do
92
92
  24.times do
93
93
  TestJob.perform_later
94
94
  end
@@ -100,7 +100,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
100
100
  expect(counts.sum).to eq(24)
101
101
  end
102
102
 
103
- it 'should finish' do
103
+ it 'finishes' do
104
104
  job = TestJob.perform_later
105
105
  rec = retrieve(job)
106
106
  expect(rec.finish('owner')).to be_falsey
@@ -112,7 +112,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
112
112
  expect(rec.finished_at).to be_within(2.seconds).of(Time.zone.now)
113
113
  end
114
114
 
115
- it 'should reschedule' do
115
+ it 'reschedules' do
116
116
  job = TestJob.perform_later
117
117
  rec = retrieve(job)
118
118
  expect(rec.reschedule('owner')).to be_falsey
@@ -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_active_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
@@ -3,9 +3,10 @@ require 'fleiss/executor'
3
3
 
4
4
  RSpec.describe Fleiss::Executor do
5
5
  subject { described_class.new max_size: 2 }
6
+
6
7
  after { subject.kill }
7
8
 
8
- it 'should check capacity' do
9
+ it 'checks capacity' do
9
10
  expect(described_class.new.capacity).to eq(1)
10
11
 
11
12
  expect(subject.capacity).to eq(2)
@@ -15,7 +16,7 @@ RSpec.describe Fleiss::Executor do
15
16
  expect(subject.capacity).to eq(0)
16
17
  end
17
18
 
18
- it 'should discard execution when capacity is reached' do
19
+ it 'discards execution when capacity is reached' do
19
20
  n = Concurrent::AtomicFixnum.new(0)
20
21
  10.times do
21
22
  10.times { subject.post { n.increment } }
@@ -25,7 +25,7 @@ RSpec.describe Fleiss::Worker do
25
25
  expect(yield).to be_truthy
26
26
  end
27
27
 
28
- it 'should run' do
28
+ it 'runs' do
29
29
  # seed 24 jobs
30
30
  24.times {|n| TestJob.perform_later(n) }
31
31
  wait_for { Fleiss.backend.not_finished.count.positive? }
@@ -39,7 +39,7 @@ RSpec.describe Fleiss::Worker do
39
39
  expect(TestJob.performed).to match_array(0..23)
40
40
  end
41
41
 
42
- it 'should handle failing jobs' do
42
+ it 'handles failing jobs' do
43
43
  TestJob.perform_later('raise')
44
44
  wait_for { Fleiss.backend.not_finished.count.zero? }
45
45
  expect(Fleiss.backend.finished.count).to eq(1)
data/spec/fleiss_spec.rb CHANGED
@@ -1,11 +1,11 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  RSpec.describe Fleiss do
4
- it 'should have a backend' do
4
+ it 'has a backend' do
5
5
  expect(described_class.backend).to eq(Fleiss::Backend::ActiveRecord)
6
6
  end
7
7
 
8
- it 'should enqueue' do
8
+ it 'enqueues' do
9
9
  expect do
10
10
  TestJob.set(wait: 1.week).perform_later
11
11
  end.to change { described_class.backend.count }.by(1)
data/spec/spec_helper.rb CHANGED
@@ -5,15 +5,19 @@ require 'fleiss'
5
5
  require 'fleiss/backend/active_record/migration'
6
6
  require 'active_job'
7
7
  require 'active_job/queue_adapters/fleiss_adapter'
8
- require 'tempfile'
8
+ require 'fileutils'
9
9
 
10
10
  ActiveJob::Base.queue_adapter = :fleiss
11
11
  ActiveJob::Base.logger = Logger.new(nil)
12
12
 
13
13
  Time.zone_default = Time.find_zone!('UTC')
14
14
 
15
- database_url = ENV['DATABASE_URL'] || "sqlite3://#{Tempfile.new(['fleiss-test', '.sqlite3']).path}"
16
- ActiveRecord::Base.configurations['test'] = { 'url' => database_url, 'pool' => 20 }
15
+ tmpdir = File.expand_path('./tmp', __dir__)
16
+ FileUtils.rm_rf tmpdir
17
+ FileUtils.mkdir_p tmpdir
18
+
19
+ database_url = ENV['DATABASE_URL'] || "sqlite3://#{tmpdir}/fleiss-test.sqlite3"
20
+ ActiveRecord::Base.configurations = { 'test' => { 'url' => database_url, 'pool' => 20 } }
17
21
 
18
22
  ActiveRecord::Base.establish_connection :test
19
23
  ActiveRecord::Base.connection.drop_table('fleiss_jobs', if_exists: true)
@@ -32,7 +36,7 @@ class TestJob < ActiveJob::Base
32
36
  72.hours
33
37
  end
34
38
 
35
- def perform(msg=nil)
39
+ def perform(msg = nil)
36
40
  raise 'Failing' if msg == 'raise'
37
41
 
38
42
  self.class.performed.push(msg)
@@ -40,7 +44,7 @@ class TestJob < ActiveJob::Base
40
44
  end
41
45
 
42
46
  RSpec.configure do |c|
43
- c.after :each do
47
+ c.after do
44
48
  TestJob.performed.clear
45
49
  Fleiss.backend.delete_all
46
50
  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.3.0
4
+ version: 0.4.2
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: 2019-05-31 00:00:00.000000000 Z
11
+ date: 2021-07-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activejob
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '5.0'
19
+ version: '6.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '5.0'
26
+ version: '6.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activerecord
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '5.0'
33
+ version: '6.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '5.0'
40
+ version: '6.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: concurrent-ruby
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
- name: rubocop
126
+ name: rubocop-bsm
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - ">="
@@ -140,16 +140,16 @@ dependencies:
140
140
  name: sqlite3
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
- version: 1.3.6
145
+ version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - "~>"
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
- version: 1.3.6
152
+ version: '0'
153
153
  description: Run background jobs with your favourite stack.
154
154
  email:
155
155
  - info@blacksquaremedia.com
@@ -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
@@ -195,14 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
195
195
  requirements:
196
196
  - - ">="
197
197
  - !ruby/object:Gem::Version
198
- version: '2.4'
198
+ version: '2.6'
199
199
  required_rubygems_version: !ruby/object:Gem::Requirement
200
200
  requirements:
201
201
  - - ">="
202
202
  - !ruby/object:Gem::Version
203
203
  version: '0'
204
204
  requirements: []
205
- rubygems_version: 3.0.3
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,16 +0,0 @@
1
- language: ruby
2
- rvm:
3
- - 2.6
4
- - 2.5
5
- - 2.4
6
- before_install:
7
- - gem install bundler
8
- - mysql -e 'CREATE DATABASE fleiss_test;'
9
- - psql -c 'CREATE DATABASE fleiss_test;' -U postgres
10
- services:
11
- - postgresql
12
- - mysql
13
- env:
14
- - DATABASE_URL=sqlite3:///tmp/fleiss_test.sqlite3
15
- - DATABASE_URL=mysql2://travis@127.0.0.1/fleiss_test
16
- - DATABASE_URL=postgresql://127.0.0.1/fleiss_test