fibered_mysql2 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41cb4d0725b7f699c21fd92b704670b2d9d1c6eed7fba14297dd283035fca821
-  data.tar.gz: cd196fb2a415466eb1f2ba296e24d0ca1bf0f87d6f8745ea9bf4f14bb4fc0622
+  metadata.gz: 06e557a5d00028db8da31e8223fd964d677e127d3bee250f99f9dcc63050da11
+  data.tar.gz: 0c5cd0a295a99df37b18d2b1320c62df3f83277613140a1048d18decb093e411
 SHA512:
-  metadata.gz: 1e57f523e8651d787ae6e357636d2c2ee77872a02277c85b88147ed1a0e06252d9b9a49f57b5a8caef4177c16d670eca767fcfade00585ceb29d589325339866
-  data.tar.gz: f25a91dda4cee006f3891f112bb66c31b67a6ea6fc8ce1fd1bd62c37c4c42faaae029fb9dc56182b10ee27e93d15115b37bdf3f7d4b88da1b5d50e0c2118bf7f
+  metadata.gz: ff1b23498c12622a05eee7926f48369a4f2f680507a71db167521d393d6a09ac8bd6c167beb4884d19fa6a4613f68208cbf38453ebc880dfb6750036e91d1583
+  data.tar.gz: 4b4a665ca475b5b28745d6085d8e3729fc3aad2a1f61e1cbbe13b79b7f1cdfd87fa24436cf1b9f62e2f6c6e42719f31082880050deeb0cb0b28114ab196d7d6c

data/.github/workflows/build.yml

@@ -8,10 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2]
+        ruby: [3.1, 3.2, 3.3]
         gemfile:
         - Gemfile
-        - gemfiles/rails_6.gemfile
+        - gemfiles/rails_6_0.gemfile
+        - gemfiles/rails_6_1.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:

data/Appraisals

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-6' do
-  gem 'rails', '~> 6.0.0'
-end
+require "appraisal/matrix"
+
+appraisal_matrix(rails: "~> 6.0")

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.1] - 2024-08-19
+### Fixed
+- Fixed issues in Rails 6.1+
+
 ## [1.0.0] - 2023-05-31
 ### Changed
 - Changed to Ruby 3.2.1 with Async rather than EventMachine+Synchrony. Only support Rails 6.0 as Rails 7

data/Gemfile

@@ -6,11 +6,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'appraisal'
+gem 'appraisal-matrix'
 gem 'coveralls', require: false
 gem 'mysql2',     '~> 0.5'
-gem 'nokogiri',   '< 1.13'
-gem 'pry',        '~> 0.13'
-gem 'pry-byebug', '~> 3.9'
-gem 'rails',      '< 6.1'
-gem 'rake',       '~> 13.0'
-gem 'rspec',      '~> 3.0'
+gem 'nokogiri'
+gem 'pry'
+gem 'pry-byebug'
+gem 'rake'
+gem 'rspec'

data/Gemfile.lock

@@ -1,82 +1,91 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (1.0.0)
+    fibered_mysql2 (1.0.1)
       async
       rails (>= 6, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.6.1)
-      actionpack (= 6.0.6.1)
+    actioncable (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionmailbox (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
+    actionmailer (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
-      actionview (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.8)
+      actionview (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actiontext (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionview (6.1.7.8)
+      activesupport (= 6.1.7.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    activejob (6.1.7.8)
+      activesupport (= 6.1.7.8)
       globalid (>= 0.3.6)
-    activemodel (6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activerecord (6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activestorage (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
+    activemodel (6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activerecord (6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       marcel (~> 1.0)
-    activesupport (6.0.6.1)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    async (2.5.1)
-      console (~> 1.10)
-      io-event (~> 1.1)
-      timers (~> 4.1)
-    builder (3.2.4)
+    appraisal-matrix (0.3.0)
+      appraisal (~> 2.2)
+    async (2.15.3)
+      console (~> 1.26)
+      fiber-annotation
+      io-event (~> 1.6, >= 1.6.5)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    console (1.16.2)
-      fiber-local
+    concurrent-ruby (1.3.4)
+    console (1.27.0)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -84,18 +93,21 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    date (3.3.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    erubi (1.12.0)
-    fiber-local (1.0.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.13.0)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    erubi (1.13.0)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    io-event (1.2.2)
-    json (2.6.3)
-    loofah (2.21.3)
+    io-event (1.6.5)
+    json (2.7.2)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -103,24 +115,24 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.18.0)
-    mysql2 (0.5.5)
-    net-imap (0.3.4)
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
+    mysql2 (0.5.6)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -128,92 +140,93 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.6.2)
-    rack (2.2.7)
+    racc (1.8.1)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6.1)
-      actioncable (= 6.0.6.1)
-      actionmailbox (= 6.0.6.1)
-      actionmailer (= 6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actiontext (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6.1)
+    rails (6.1.7.8)
+      actioncable (= 6.1.7.8)
+      actionmailbox (= 6.1.7.8)
+      actionmailer (= 6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actiontext (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.8)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sync (0.5.0)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.11.2)
       tins (~> 1.0)
-    thor (1.2.2)
-    thread_safe (0.3.6)
-    timeout (0.3.2)
-    timers (4.3.5)
-    tins (1.32.1)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tins (1.33.0)
+      bigdecimal
       sync
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.5)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
+  appraisal-matrix
   coveralls
   fibered_mysql2!
   mysql2 (~> 0.5)
-  nokogiri (< 1.13)
-  pry (~> 0.13)
-  pry-byebug (~> 3.9)
-  rails (< 6.1)
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  nokogiri
+  pry
+  pry-byebug
+  rake
+  rspec
 
 BUNDLED WITH
    2.2.29

data/catalog-info.yaml

@@ -0,0 +1,15 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: fibered_mysql2
+  title: FiberedMysql2 gem
+  annotations:
+    github.com/project-slug: Invoca/fibered_mysql2
+    endoflife.date/products: ruby@3.1
+  tags:
+  - ruby
+  - open-source
+spec:
+  type: library
+  lifecycle: production
+  owner: octothorpe

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/{rails_6.gemfile → rails_6_0.gemfile}

@@ -3,13 +3,14 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "appraisal-matrix"
 gem "coveralls", require: false
 gem "mysql2", "~> 0.5"
-gem "nokogiri", "< 1.13"
-gem "pry", "~> 0.13"
-gem "pry-byebug", "~> 3.9"
+gem "nokogiri"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec"
 gem "rails", "~> 6.0.0"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
 
 gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "appraisal-matrix"
+gem "coveralls", require: false
+gem "mysql2", "~> 0.5"
+gem "nokogiri"
+gem "pry"
+gem "pry-byebug"
+gem "rake"
+gem "rspec"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -30,8 +30,12 @@ module FiberedMysql2
     end
 
     def initialize(connection_spec, *args, **keyword_args)
-      connection_spec.config[:reaping_frequency] and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
-      connection_spec.config[:reaping_frequency] = nil # starting in Rails 5, this defaults to 60 if not explicitly set
+      if ActiveRecord.gem_version < "6.1"
+        connection_spec.config[:reaping_frequency] and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
+        connection_spec.config[:reaping_frequency] = nil # starting in Rails 5, this defaults to 60 if not explicitly set
+      elsif connection_spec.db_config.reaping_frequency
+        connection_spec.db_config.reaping_frequency > 0 and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
+      end
 
       super(connection_spec, *args, **keyword_args)
 

data/lib/fibered_mysql2/hash_config_override.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module FiberedMysql2
+  module HashConfigOverride
+    # Override the reaping_frequency method to return nil so that the connection pool does not reap connections when in fibered mode.
+    def reaping_frequency
+      nil
+    end
+  end
+end
+
+if ActiveRecord.gem_version >= "6.1"
+  ActiveRecord::DatabaseConfigurations::HashConfig.prepend(FiberedMysql2::HashConfigOverride)
+end

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/fibered_mysql2.rb

@@ -5,4 +5,5 @@ require 'async'
 require_relative 'active_record/connection_adapters/fibered_mysql2_adapter'
 require_relative 'fibered_mysql2/fibered_database_connection_pool'
 require_relative 'fibered_mysql2/fibered_mysql2_connection_factory'
+require_relative 'fibered_mysql2/hash_config_override'
 require_relative 'fibered_mysql2/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -65,12 +65,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- catalog-info.yaml
 - fibered_mysql2.gemspec
-- gemfiles/rails_6.gemfile
+- gemfiles/.bundle/config
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/active_record/connection_adapters/fibered_mysql2_adapter.rb
 - lib/fibered_mysql2.rb
 - lib/fibered_mysql2/fibered_database_connection_pool.rb
 - lib/fibered_mysql2/fibered_mysql2_connection_factory.rb
+- lib/fibered_mysql2/hash_config_override.rb
 - lib/fibered_mysql2/version.rb
 homepage: https://github.com/Invoca/fibered_mysql2
 licenses: []