sidekiq-transaction_guard 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe8af50053f7431c866b6091475ac6c11498619b6dc443e3a6320fa54ce41e0
-  data.tar.gz: fc14706b5ad35440b365db3065f12f5342ecf048a2a29e96a0baecff8179ea0a
+  metadata.gz: 5f1c8f731c16ff8a3da91b3073be50dd1544a1b17a82521b60637baaa4643421
+  data.tar.gz: 711cd9daff96b69e24d54a8e21803bcf85bf64e60ab813ba168d943e7092f236
 SHA512:
-  metadata.gz: e4902e75a12e5b2ae4943cd415cbe7e4173db2304b8c431d40e49cd51b4c41a8acb5f23e0c20f8f1d2062593f559b4edb34ea479621988cc6df55f4e0a749a4f
-  data.tar.gz: 88cbea82b257c33439955f45e49a36beba1d0b7b72de2a7f4fb74d6bfbda6cfc2c292bbfc12b6eed8d0ac0cf9f6565f46d9508aa100be29d6fc8f954230c389f
+  metadata.gz: ff23694280b688a5d0cdf7274408aa3640385dd4269814fb54421848c339f101b7dc865c7013dde0ff83ce6a9031810082155f3bfed727eaf9643a5b7cffdaa0
+  data.tar.gz: 36ad8e565e052c16e309fffa3f6e2b6fa715c8c694546b74b63d4aeee7f04224b68ebd193421a1f1f550fc8d02c8332507f0acf9583e1f074247d24eea60b3c4

data/CHANGELOG.md

@@ -4,18 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.3
+
+### Changed
+
+- Updated Middleware to include Sidekiq::ClientMiddleware for Sidekiq 7.0 compatibility
+
+
 ## 1.0.2
 
 ### Changed
+
 - Updated database cleaner dependency to use database_cleaner-active_record instead of deprecated database_cleaner gem.
 - Added YARD doc param and return types.
 
 ## 1.0.1
 
 ### Added
+
 - Sidekiq 6.0 compatibility
 
 ## 1.0.0
 
 ### Added
+
 - Initial release

data/README.md

@@ -1,7 +1,9 @@
-# Sidekiq::TransactionGuard
+# Sidekiq Transaction Guard
 
-[![Build Status](https://travis-ci.com/bdurand/sidekiq-transaction_guard.svg?branch=master)](https://travis-ci.com/bdurand/sidekiq-transaction_guard)
-[![Maintainability](https://api.codeclimate.com/v1/badges/17bbf5cb6eda022028fe/maintainability)](https://codeclimate.com/github/bdurand/sidekiq-transaction_guard/maintainability)
+[![Continuous Integration](https://github.com/bdurand/sidekiq-transaction_guard/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/bdurand/sidekiq-transaction_guard/actions/workflows/continuous_integration.yml)
+[![Regression Test](https://github.com/bdurand/sidekiq-transaction_guard/actions/workflows/regression_test.yml/badge.svg)](https://github.com/bdurand/sidekiq-transaction_guard/actions/workflows/regression_test.yml)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
+[![Gem Version](https://badge.fury.io/rb/sidekiq-transaction_guard.svg)](https://badge.fury.io/rb/sidekiq-transaction_guard)
 
 You should never call a Sidekiq worker that relies on the state of the database from within a database transaction. You will end up with a race condition since the worker could kick off before the transaction is actually written to the database. This gem can be used to highlight where your code may be scheduling workers in an indeterminate state.
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/sidekiq/transaction_guard/middleware.rb

@@ -10,6 +10,10 @@ module Sidekiq
     # the default behavior set in `Sidekiq::TransactionGuard.mode` and
     # `Sidekiq::TransactionGuard.notify` respectively.
     class Middleware
+      if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0")
+        include Sidekiq::ClientMiddleware
+      end
+
       def call(worker_class, job, queue, redis_pool)
         # Check if we need to log this. Also, convert worker_class to its actual class
         if in_transaction?

data/sidekiq-transaction_guard.gemspec

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "lib/sidekiq/transaction_guard/version"
-
 Gem::Specification.new do |spec|
   spec.name = "sidekiq-transaction_guard"
-  spec.version = Sidekiq::TransactionGuard::VERSION
+  spec.version = File.read(File.expand_path("VERSION", __dir__)).strip
   spec.authors = ["Brian Durand", "Winston Durand"]
   spec.email = ["bbdurand@gmail.com", "me@winstondurand.com"]
 
@@ -15,24 +13,25 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   ignore_files = %w[
-    .gitignore
-    .travis.yml
+    .
     Appraisals
     Gemfile
     Gemfile.lock
     Rakefile
+    bin/
     gemfiles/
     spec/
   ]
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| ignore_files.any? { |path| f.start_with?(path) } }
   end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.2.2"
 
   spec.add_dependency "activerecord", ">= 4.0"
   spec.add_dependency "sidekiq", ">= 3.0"
+
+  spec.add_development_dependency "bundler"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-transaction_guard
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brian Durand
 - Winston Durand
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - bbdurand@gmail.com
@@ -47,9 +61,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
-- ".github/workflows/continuous_integration.yml"
-- ".standard.yml"
 - CHANGELOG.md
 - MIT_LICENSE.txt
 - README.md
@@ -79,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Protect from accidentally invoking Sidekiq jobs when there are open database

data/.github/dependabot.yml

@@ -1,12 +0,0 @@
-# Dependabot update strategy
-version: 2
-updates:
-  - package-ecosystem: bundler
-    directory: "/"
-    schedule:
-      interval: weekly
-    allow:
-      # Automatically keep all runtime dependencies updated
-      - dependency-name: "*"
-        dependency-type: "production"
-    versioning-strategy: lockfile-only

data/.github/workflows/continuous_integration.yml

@@ -1,84 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches:
-      - master
-      - actions-*
-    tags:
-      - v*
-  pull_request:
-    branches-ignore:
-      - actions-*
-
-env:
-  BUNDLE_CLEAN: "true"
-  BUNDLE_PATH: vendor/bundle
-  BUNDLE_JOBS: 3
-  BUNDLE_RETRY: 3
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ruby: "ruby"
-            standardrb: true
-          - ruby: "3.2"
-            appraisal: "activerecord_7.0"
-          - ruby: "3.1"
-            appraisal: "activerecord_6.1"
-          - ruby: "2.7"
-            appraisal: "activerecord_6.0"
-          - ruby: "2.7"
-            appraisal: "activerecord_5.2"
-          - ruby: "2.6"
-            appraisal: "activerecord_5.1"
-          - ruby: "2.6"
-            appraisal: "activerecord_5.0"
-          - ruby: "2.5"
-            appraisal: "activerecord_4.2"
-          - ruby: "2.5"
-            appraisal: "activerecord_4.1"
-          - ruby: "2.5"
-            appraisal: "activerecord_4.0"
-          - ruby: "3.2"
-            appraisal: "sidekiq_7"
-          - ruby: "3.0"
-            appraisal: "sidekiq_6"
-          - ruby: "2.7"
-            appraisal: "sidekiq_5"
-          - ruby: "2.6"
-            appraisal: "sidekiq_4"
-          - ruby: "2.5"
-            appraisal: "sidekiq_3"
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "${{ matrix.ruby }}"
-    - name: Install packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install libsqlite3-dev
-    - name: Setup bundler
-      if: matrix.bundler != ''
-      run: |
-        gem uninstall bundler --all
-        gem install bundler --no-document --version ${{ matrix.bundler }}
-    - name: Set Appraisal bundle
-      if: matrix.appraisal != ''
-      run: |
-        echo "using gemfile gemfiles/${{ matrix.appraisal }}.gemfile"
-        bundle config set gemfile "gemfiles/${{ matrix.appraisal }}.gemfile"
-    - name: Install gems
-      run: |
-        bundle update
-    - name: Run Tests
-      run: bundle exec rake
-    - name: standardrb
-      if:   matrix.standardrb == true
-      run:  bundle exec rake standard

data/.standard.yml

@@ -1,9 +0,0 @@
-format: progress
-
-ruby_version: 2.5
-
-ignore:
-  - 'spec/**/*':
-    - Lint/ConstantDefinitionInBlock
-    - Lint/UselessAssignment
-