fleiss 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5d2237b3a3bb01c8998c273a9fbb4f65cbf75b737df03187db2315c1efa93d
-  data.tar.gz: c80f8f0423dea4b516e824ccb669ec2e34abb6c2365adbe5cea937101526c429
+  metadata.gz: fb1ff85a0ec51e90e089851ded43d6f7bb5458061e511e9a137109e3e3bb3b1f
+  data.tar.gz: 8a979667dafbe94d350cb1bf7c8375379fede61578f6251874ed69c753c908c0
 SHA512:
-  metadata.gz: e497a57b2aec4333ce4cde801a7bcf631546158c1b4c1d2b2a663ca997066438f01bb14b5103637cbb661c168e403c4b21014dbe92ee2fb927806a377b788f21
-  data.tar.gz: 7d18e086ebe3ca8f6d8c0c025ca302abdfa487487548c38664d18904cd5c3a8d7e1997132054af334c5cbb1e8863b01fcdf176546f7d9d300e30443a2958bbe0
+  metadata.gz: 3a374d658b0fabd11e0649118ed7e4a37adefb6aca004b3f91fbb5a6794026c3b0b6be72df8ffe690b6638988ec5fa62e60a226430de360e3a0a5958da65317d
+  data.tar.gz: a79f26b1b852c395c9282a770713991e7ed863ceb99b12611ab35e74fdbd084d15dea6d34ce0640aa653d238a586df71156bc514cc5887a9b115ea54699a3e74

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  ruby:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -1,2 +1,3 @@
 .rubocop-*
 pkg/
+spec/tmp

data/.rubocop.yml

@@ -1,8 +1,11 @@
-inherit_from:
-  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
-
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 AllCops:
-  TargetRubyVersion: "2.4"
+  TargetRubyVersion: "2.6"
 
 Security/Open:
   Exclude:

data/Gemfile.lock

@@ -1,71 +1,88 @@
 PATH
   remote: .
   specs:
-    fleiss (0.3.0)
-      activejob (>= 5.0)
-      activerecord (>= 5.0)
+    fleiss (0.4.2)
+      activejob (>= 6.0)
+      activerecord (>= 6.0)
       concurrent-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    minitest (5.11.3)
-    mysql2 (0.5.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pg (1.1.4)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.18.3)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-bsm (0.6.0)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.11.4)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -77,8 +94,8 @@ DEPENDENCIES
   pg
   rake
   rspec
-  rubocop
-  sqlite3 (~> 1.3.6)
+  rubocop-bsm
+  sqlite3
 
 BUNDLED WITH
-   2.0.1
+   2.2.16

data/LICENSE

@@ -1,13 +1,201 @@
-Copyright 2018 Black Square Media Ltd
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-  http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Black Square Media Ltd
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Fleiss
 
-[![Build Status](https://travis-ci.org/bsm/fleiss.png?branch=master)](https://travis-ci.org/bsm/fleiss)
+[![Test](https://github.com/bsm/fleiss/actions/workflows/test.yml/badge.svg)](https://github.com/bsm/fleiss/actions/workflows/test.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 Minimialist background jobs backed by ActiveJob and ActiveRecord.

data/bin/fleiss

@@ -5,8 +5,8 @@ $LOAD_PATH.push(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 require 'fleiss/cli'
 
-STDOUT.sync = true
-STDERR.sync = true
+$stdout.sync = true
+$stderr.sync = true
 
 cli = Fleiss::CLI.instance
 begin
@@ -14,7 +14,7 @@ begin
   cli.run!
 rescue ArgumentError => e
   warn " ! #{e.message}\n"
-  STDERR.puts
+  $stderr.puts
   warn cli.parser
   exit 1
 rescue StandardError => e

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.3.0'
+  s.version       = '0.4.2'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.6'
 
-  s.add_dependency 'activejob', '>= 5.0'
-  s.add_dependency 'activerecord', '>= 5.0'
+  s.add_dependency 'activejob', '>= 6.0'
+  s.add_dependency 'activerecord', '>= 6.0'
   s.add_dependency 'concurrent-ruby'
 
   s.add_development_dependency 'bundler'
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'sqlite3', '~> 1.3.6'
+  s.add_development_dependency 'rubocop-bsm'
+  s.add_development_dependency 'sqlite3'
 end

data/lib/fleiss/backend/active_record/concern.rb

@@ -8,19 +8,24 @@ module Fleiss
           scope :in_queue, ->(qs) { where(queue_name: Array.wrap(qs)) }
           scope :finished, -> { where.not(finished_at: nil) }
           scope :not_finished, -> { where(finished_at: nil) }
-          scope :not_expired,  ->(now=Time.zone.now) { where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now))) }
+          scope :not_expired,  lambda {|now = Time.zone.now|
+                                 where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(now)))
+                               }
           scope :started,      -> { where(arel_table[:started_at].not_eq(nil)) }
           scope :not_started,  -> { where(arel_table[:started_at].eq(nil)) }
-          scope :scheduled,    ->(now=Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
+          scope :scheduled,    ->(now = Time.zone.now) { where(arel_table[:scheduled_at].gt(now)) }
         end
 
         module ClassMethods
           def wrap_perform(&block)
             connection_pool.with_connection(&block)
+          rescue ::ActiveRecord::StatementInvalid
+            ::ActiveRecord::Base.clear_active_connections!
+            raise
           end
 
           # @return [ActiveRecord::Relation] pending scope
-          def pending(now=Time.zone.now)
+          def pending(now = Time.zone.now)
             not_finished
               .not_expired(now)
               .not_started
@@ -102,9 +107,12 @@ module Fleiss
         private
 
         def with_isolation(&block)
-          return yield unless self.class.connection.supports_transaction_isolation?
-
-          self.class.transaction(isolation: :repeatable_read, &block)
+          conn = self.class.connection
+          if conn.supports_transaction_isolation? && conn.adapter_name != 'SQLite'
+            self.class.transaction(isolation: :repeatable_read, &block)
+          else
+            yield
+          end
         end
       end
     end

data/lib/fleiss/backend/active_record/migration.rb

@@ -3,7 +3,7 @@ require 'fleiss/backend/active_record'
 module Fleiss
   module Backend
     class ActiveRecord
-      class Migration < ::ActiveRecord::Migration[5.0]
+      class Migration < ::ActiveRecord::Migration[6.0]
         def change
           create_table :fleiss_jobs do |t|
             t.string :queue_name, limit: 50, null: false

data/lib/fleiss/cli.rb

@@ -22,7 +22,7 @@ module Fleiss
       @opts = DEFAULT_OPTIONS.dup
     end
 
-    def parse!(argv=ARGV)
+    def parse!(argv = ARGV)
       parser.parse!(argv)
 
       # Check config file

data/lib/fleiss/executor.rb

@@ -15,7 +15,7 @@ class Fleiss::Executor < Concurrent::SimpleExecutorService
 
   private
 
-  def ns_initialize(opts={})
+  def ns_initialize(opts = {})
     super()
     @max_size = opts.fetch(:max_size, 1).to_i
   end

data/spec/fleiss/backend/active_record_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     described_class.find(job.provider_job_id)
   end
 
-  it 'should persist jobs' do
+  it 'persists jobs' do
     job = TestJob.perform_later
     rec = retrieve(job)
 
@@ -28,25 +28,25 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     )
   end
 
-  it 'should enqueue with delay' do
+  it 'enqueues with delay' do
     job = TestJob.set(wait: 1.day).perform_later
     rec = retrieve(job)
     expect(rec.scheduled_at).to be_within(2.seconds).of(1.day.from_now)
   end
 
-  it 'should enqueue with priority' do
+  it 'enqueues with priority' do
     job = TestJob.set(priority: 8).perform_later
     rec = retrieve(job)
     expect(rec.priority).to eq(8)
   end
 
-  it 'should expose active job ID' do
+  it 'exposes active job ID' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.job_id.size).to eq(36)
   end
 
-  it 'should scope pending' do
+  it 'scopes pending' do
     j1 = TestJob.perform_later
     expect(retrieve(j1).start('owner')).to be_truthy
     expect(retrieve(j1).finish('owner')).to be_truthy
@@ -58,7 +58,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(described_class.pending.ids).to eq [j4.provider_job_id, j2.provider_job_id]
   end
 
-  it 'should scope in_progress' do
+  it 'scopes in_progress' do
     _j1 = TestJob.perform_later
     j2 = TestJob.perform_later
     expect(retrieve(j2).start('owner')).to be_truthy
@@ -72,14 +72,14 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(described_class.in_progress('owner').ids).to eq [j2.provider_job_id]
   end
 
-  it 'should scope by queue' do
+  it 'scopes by queue' do
     j1 = TestJob.perform_later
     j2 = TestJob.set(queue: 'other').perform_later
     expect(described_class.in_queue('test-queue').ids).to eq [j1.provider_job_id]
     expect(described_class.in_queue('other').ids).to eq [j2.provider_job_id]
   end
 
-  it 'should start' do
+  it 'starts' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.start('owner')).to be_truthy
@@ -88,7 +88,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(rec.started_at).to be_within(2.seconds).of(Time.zone.now)
   end
 
-  it 'should lock atomically' do
+  it 'locks atomically' do
     24.times do
       TestJob.perform_later
     end
@@ -100,7 +100,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(counts.sum).to eq(24)
   end
 
-  it 'should finish' do
+  it 'finishes' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.finish('owner')).to be_falsey
@@ -112,7 +112,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(rec.finished_at).to be_within(2.seconds).of(Time.zone.now)
   end
 
-  it 'should reschedule' do
+  it 'reschedules' do
     job = TestJob.perform_later
     rec = retrieve(job)
     expect(rec.reschedule('owner')).to be_falsey
@@ -123,4 +123,13 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
     expect(rec.started_at).to be_nil
     expect(rec.scheduled_at).to be_within(2.seconds).of(Time.zone.now)
   end
+
+  it 'reconnects' do
+    expect(::ActiveRecord::Base).to receive(:clear_active_connections!).once.and_return(nil)
+
+    expect do
+      described_class.wrap_perform { raise ::ActiveRecord::StatementInvalid }
+    end
+      .to raise_error(::ActiveRecord::StatementInvalid) # re-raised anyway
+  end
 end

data/spec/fleiss/executor_spec.rb

@@ -3,9 +3,10 @@ require 'fleiss/executor'
 
 RSpec.describe Fleiss::Executor do
   subject { described_class.new max_size: 2 }
+
   after   { subject.kill }
 
-  it 'should check capacity' do
+  it 'checks capacity' do
     expect(described_class.new.capacity).to eq(1)
 
     expect(subject.capacity).to eq(2)
@@ -15,7 +16,7 @@ RSpec.describe Fleiss::Executor do
     expect(subject.capacity).to eq(0)
   end
 
-  it 'should discard execution when capacity is reached' do
+  it 'discards execution when capacity is reached' do
     n = Concurrent::AtomicFixnum.new(0)
     10.times do
       10.times { subject.post { n.increment } }

data/spec/fleiss/worker_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Fleiss::Worker do
     expect(yield).to be_truthy
   end
 
-  it 'should run' do
+  it 'runs' do
     # seed 24 jobs
     24.times {|n| TestJob.perform_later(n) }
     wait_for { Fleiss.backend.not_finished.count.positive? }
@@ -39,7 +39,7 @@ RSpec.describe Fleiss::Worker do
     expect(TestJob.performed).to match_array(0..23)
   end
 
-  it 'should handle failing jobs' do
+  it 'handles failing jobs' do
     TestJob.perform_later('raise')
     wait_for { Fleiss.backend.not_finished.count.zero? }
     expect(Fleiss.backend.finished.count).to eq(1)

data/spec/fleiss_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 RSpec.describe Fleiss do
-  it 'should have a backend' do
+  it 'has a backend' do
     expect(described_class.backend).to eq(Fleiss::Backend::ActiveRecord)
   end
 
-  it 'should enqueue' do
+  it 'enqueues' do
     expect do
       TestJob.set(wait: 1.week).perform_later
     end.to change { described_class.backend.count }.by(1)

data/spec/spec_helper.rb

@@ -5,15 +5,19 @@ require 'fleiss'
 require 'fleiss/backend/active_record/migration'
 require 'active_job'
 require 'active_job/queue_adapters/fleiss_adapter'
-require 'tempfile'
+require 'fileutils'
 
 ActiveJob::Base.queue_adapter = :fleiss
 ActiveJob::Base.logger = Logger.new(nil)
 
 Time.zone_default = Time.find_zone!('UTC')
 
-database_url = ENV['DATABASE_URL'] || "sqlite3://#{Tempfile.new(['fleiss-test', '.sqlite3']).path}"
-ActiveRecord::Base.configurations['test'] = { 'url' => database_url, 'pool' => 20 }
+tmpdir = File.expand_path('./tmp', __dir__)
+FileUtils.rm_rf tmpdir
+FileUtils.mkdir_p tmpdir
+
+database_url = ENV['DATABASE_URL'] || "sqlite3://#{tmpdir}/fleiss-test.sqlite3"
+ActiveRecord::Base.configurations = { 'test' => { 'url' => database_url, 'pool' => 20 } }
 
 ActiveRecord::Base.establish_connection :test
 ActiveRecord::Base.connection.drop_table('fleiss_jobs', if_exists: true)
@@ -32,7 +36,7 @@ class TestJob < ActiveJob::Base
     72.hours
   end
 
-  def perform(msg=nil)
+  def perform(msg = nil)
     raise 'Failing' if msg == 'raise'
 
     self.class.performed.push(msg)
@@ -40,7 +44,7 @@ class TestJob < ActiveJob::Base
 end
 
 RSpec.configure do |c|
-  c.after :each do
+  c.after do
     TestJob.performed.clear
     Fleiss.backend.delete_all
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,16 +140,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Run background jobs with your favourite stack.
 email:
 - info@blacksquaremedia.com
@@ -159,9 +159,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -195,14 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Minimialist background jobs backed by ActiveJob and ActiveRecord.

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.5
-  - 2.4
-before_install:
-  - gem install bundler
-  - mysql -e 'CREATE DATABASE fleiss_test;'
-  - psql -c 'CREATE DATABASE fleiss_test;' -U postgres
-services:
-  - postgresql
-  - mysql
-env:
-  - DATABASE_URL=sqlite3:///tmp/fleiss_test.sqlite3
-  - DATABASE_URL=mysql2://travis@127.0.0.1/fleiss_test
-  - DATABASE_URL=postgresql://127.0.0.1/fleiss_test