fibered_mysql2 1.0.0.colin.2 → 1.0.0.colin.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb4eb8b784857e027f0d40f7f43e96e65b0bf442153831bc07be41030ae646d
-  data.tar.gz: e1ddc3b9ef66c848cb66b7fd080cd90aef0d6a40fa658ddd6abc1cd39c4ff409
+  metadata.gz: 1edbb420eedd78ecab2ae0fef48554d968f01e44c791430262f55b43c280dea0
+  data.tar.gz: 676673438f5078176bfbd836d6e34d79283a1aa8874cbd32563266dbf163a5b3
 SHA512:
-  metadata.gz: f6eb1d2947a2b8c2abcb117f39a888139683206dde1f7d6259fb0aa864b6cfae03939d69b7fb22965d464702fed0efddd8db1c1e8d5141dff79e9feaa4bc05c4
-  data.tar.gz: ec9ee0570f5e99ddc6add3d86589ce0534ed624cf1ae4daf33f4ae65ba46a251f015c34ff845064fddaf73290ba645cb53e45dce0e53c4fc8a7c029bc2b47262
+  metadata.gz: a6de1e7d5bd5afe99bb1104d772dcef36bf5414d58e57b069bf2883e506c1a5f78551a429b4ee3098321373bee5ff83ee2a200ba3477ebde9bd15d26cd78fa4f
+  data.tar.gz: e506a05e2ffd01f2c0f7380a9fd644735aceb9843f43f683b1972533f5c37d783ef4aa2b8417aa9e25ef548c03bc837fec7aeb9b16a0e000d6683ab6619d3bf7

data/.github/workflows/build.yml

@@ -8,10 +8,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7, '3.0', 3.1]
+        ruby: [3.1, 3.2]
         gemfile:
         - Gemfile
-        - gemfiles/rails_5.gemfile
         - gemfiles/rails_6.gemfile
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5' do
-  gem 'rails', '~> 5.2'
-end
-
 appraise 'rails-6' do
   gem 'rails', '~> 6.0.0'
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (1.0.0.colin.2)
+    fibered_mysql2 (1.0.0.colin.3)
       async
-      rails (>= 5.2, < 7)
+      rails (>= 6, < 7)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -2,7 +2,8 @@
 
 # FiberedMysql2
 
-FiberedMysql2 adds Fiber support to `ActiveRecord::ConnectionAdapters::EMMysql2Adapter`
+FiberedMysql2 adds Fiber support to `ActiveRecord::ConnectionAdapters::Mysql2Adapter` for Rails 6.
+This is a stop-gap until Rails 7, which adds `isolation_level: :fiber` to `ActiveRecord`.
 
 ## Installation
 
@@ -21,15 +22,15 @@ Or install it yourself as:
     $ gem install fibered_mysql2
 
 ## Support
-Tested with Rails versions 5.2 and 6.0.
+Tested with Rails 6.0, Ruby 3, and Async.
 
 ## Usage
 
-Behaves the same as `ActiveRecord::ConnectionAdapters::EMMysql2Adapter` but with added Fiber safety while leasing/expiring connections.
+Behaves the same as `ActiveRecord::ConnectionAdapters::Mysql2Adapter` but with using Fibers rather than Threads for tracking ownership when leasing/expiring connections.
 ```ruby
 connection = FiberedMysql2::FiberedMysql2Adapter.new(client, logger, options, config)
 connection.lease
-connection.expire # Rails 5+ only
+connection.expire
 ```
 
 ## Development

data/bin/console

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
+require "active_record"
 require "fibered_mysql2"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/fibered_mysql2.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'async'
-  spec.add_dependency 'rails', '>= 5.2', '< 7'
+  spec.add_dependency 'rails', '>= 6', '< 7'
 end

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -61,12 +61,9 @@ module FiberedMysql2
   end
 
   class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    case ::Rails::VERSION::MAJOR
-    when 6
-      include FiberedMysql2Adapter_6
-    else
-      raise ArgumentError, "unexpected Rails version #{Rails::VERSION::MAJOR}"
-    end
+    ActiveRecord::VERSION::MAJOR == 6 or raise ArgumentError, "unexpected Rails version #{ActiveRecord::VERSION::MAJOR}"
+
+    include FiberedMysql2Adapter_6
 
     def initialize(*args)
       super

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -4,11 +4,7 @@
 
 module FiberedMysql2
   module FiberedDatabaseConnectionPool
-    case ::Rails::VERSION::MAJOR
-    when 6
-    else
-      raise ArgumentError, "unexpected Rails version #{Rails::VERSION::MAJOR}"
-    end
+    ActiveRecord::VERSION::MAJOR == 6 or raise ArgumentError, "unexpected Rails version #{ActiveRecord::VERSION::MAJOR}"
 
     def cached_connections
       @thread_cached_conns

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "1.0.0.colin.2"
+  VERSION = "1.0.0.colin.3"
 end

data/lib/fibered_mysql2.rb

@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
 require 'async'
-require 'fibered_mysql2/version'
-require_relative '../lib/active_record/connection_adapters/fibered_mysql2_adapter'
-require 'fibered_mysql2/fibered_database_connection_pool'
-require 'fibered_mysql2/fibered_mutex_with_waiter_priority'
-require 'fibered_mysql2/fibered_mysql2_connection_factory'
 
-module FiberedMysql2
-  class Error < StandardError; end
-  # Your code goes here...
-end
+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/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.colin.2
+  version: 1.0.0.colin.3
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -66,13 +66,10 @@ files:
 - bin/console
 - bin/setup
 - fibered_mysql2.gemspec
-- gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
 - lib/active_record/connection_adapters/fibered_mysql2_adapter.rb
 - lib/fibered_mysql2.rb
-- lib/fibered_mysql2/async_task.rb
 - lib/fibered_mysql2/fibered_database_connection_pool.rb
-- lib/fibered_mysql2/fibered_mutex_with_waiter_priority.rb
 - lib/fibered_mysql2/fibered_mysql2_connection_factory.rb
 - lib/fibered_mysql2/version.rb
 homepage: https://github.com/Invoca/fibered_mysql2

data/gemfiles/rails_5.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "coveralls", require: false
-gem "mysql2", "~> 0.5"
-gem "nokogiri", "< 1.13"
-gem "pry", "~> 0.13"
-gem "pry-byebug", "~> 3.9"
-gem "rails", "~> 5.2"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
-
-gemspec path: "../"

data/lib/fibered_mysql2/async_task.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module FiberedMysql2
-  module AsyncTask
-    class NoTaskPlaceholder
-      class << self
-        def alive? = true
-      end
-    end
-
-    class << self
-      # Adapted from https://github.com/socketry/async/blob/main/lib/async/task.rb#L236-L238
-      def current_or_none
-        Thread.current[:async_task] || NoTaskPlaceholder
-      end
-    end
-  end
-end

data/lib/fibered_mysql2/fibered_mutex_with_waiter_priority.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module FiberedMysql2
-  module FiberedMutexWithWaiterPriority
-    # Note: @waiters is a bit confusing because the first waiter is actually the current fiber that has it locked;
-    # the _rest_ of @waiters are the actual waiters
-    def sleep(timeout = nil)
-      unlock
-      beg = Time.now
-      current = Fiber.current
-      @slept[current] = true
-      if timeout
-        timer = EM.add_timer(timeout) do
-          _wakeup(current)
-        end
-        Fiber.yield
-        EM.cancel_timer(timer) # if we resumed not via timer
-      else
-        Fiber.yield
-      end
-      @slept.delete(current)
-      yield if block_given?
-
-      # Invoca patch: inline lock that puts us at the front of the mutex @waiters queue instead of the back
-      # ==========================
-      @waiters.unshift(current)
-      Fiber.yield if @waiters.size > 1
-      # ==========================
-
-      Time.now - beg
-    end
-  end
-end