fibered_mysql2 0.1.0.pre.4 → 0.1.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a7c1f9db37bca0d6b9861985ad594863e1cde7847952dc83a2ed94bed72d2e
-  data.tar.gz: 1ac220f2391d1b7c74df9985ddfaca59855570ee01e36f8351841f8651306a98
+  metadata.gz: 4dc370ac1991b20233635be62b5987835aaa7f257d1a5205f7b024265a86580d
+  data.tar.gz: ca03aa8ba38ed8b7997967c939fd994bf03c4042ddf3fee99c2b15a0fcdb9250
 SHA512:
-  metadata.gz: 4df2ada93ac02bf3b34b6a223c83c26690a620a88eec6c38ffc4f1a1c8a052867fc126b4f745ad3e1aa9278e86a7808c08dc7b493dbd99cb93812895b1901584
-  data.tar.gz: 78fafb964db2b16da1604032ea1421b2761f81ef60c52851be4df30f96e78a9f688b9a656fec1d4a0ad4b1564aca20f57bb9722a69aba64be4891835d11cfd6e
+  metadata.gz: 63e6cabcc9f2e91870802e806017d12140b86d12da87edd4bf4864646207e583aabc76690a4d553ee4b886aae18cc34b5018c1093255ed68d347a9b911b38c96
+  data.tar.gz: 3fe04ea933864b648c50d804f787577c1742aef9dcb0449c4a3510ba51e483186f7715cb0c949ad0aa8ac70afc3f2078ff91476f01b94bf70388f2e0ae21f303

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
+--format progress
 --color
 --require spec_helper

data/CHANGELOG.md

@@ -6,9 +6,9 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 
 ## [0.1.0] - Unreleased
 ### Added
-- An adapter for Rails 4, 5, and 6.
-- Appraisals for Rails 4, 5, and 6.
-- TravisCI unit test pipeline.
-- Coverage reports via Coveralls.
+- Added an adapter for Rails 4, 5, and 6.
+- Added appraisals for Rails 4, 5, and 6.
+- Added TravisCI unit test pipeline.
+- Added coverage reports via Coveralls.
 
-[0.1.0]: https://github.com/Invoca/fibered_mysql2/tree/v0.1.0
+[0.1.0]: https://github.com/Invoca/fibered_mysql2/tree/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.1.0.pre.4)
+    fibered_mysql2 (0.1.0.pre.5)
       em-synchrony (~> 1.0)
       rails (>= 4.2, < 7)
 

data/README.md

@@ -29,7 +29,7 @@ Behaves the same as `ActiveRecord::ConnectionAdapters::EMMysql2Adapter` but with
 ```ruby
 connection = FiberedMysql2::FiberedMysql2Adapter.new(client, logger, options, config)
 connection.lease
-connection.expire // Rails 5+ only
+connection.expire # Rails 5+ only
 ```
 
 ## Development

data/fibered_mysql2.gemspec

@@ -7,16 +7,18 @@ require "fibered_mysql2/version"
 Gem::Specification.new do |spec|
   spec.name          = "fibered_mysql2"
   spec.version       = FiberedMysql2::VERSION
-  spec.authors       = ["Octothorp"]
-  spec.email         = ["octothorp@invoca.com"]
+  spec.authors       = ["Invoca Development"]
+  spec.email         = ["development@invoca.com"]
 
   spec.summary       = "An adapter for fibered mysql2"
   spec.homepage      = "https://github.com/Invoca/fibered_mysql2"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["homepage_uri"]      = spec.homepage
+  spec.metadata = {
+    "allowed_push_host" => "https://rubygems.org",
+    "homepage_uri"      => spec.homepage
+  }
 
   # 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.

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -124,12 +124,44 @@ module FiberedMysql2
       def cached_connections
         @reserved_connections
       end
+
+      def current_connection_id
+        ActiveRecord::Base.connection_id ||= Fiber.current.object_id
+      end
+
+      def checkout
+        begin
+          reap_connections
+        rescue => ex
+          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+        end
+        super
+      end
     end
 
     module Adapter_5_2
       def cached_connections
         @thread_cached_conns
       end
+
+      def current_connection_id
+        connection_cache_key(current_thread)
+      end
+
+      def checkout(checkout_timeout = @checkout_timeout)
+        begin
+          reap_connections
+        rescue => ex
+          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+        end
+        super
+      end
+
+      def release_connection(owner_thread = Fiber.current)
+        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
+          checkin(conn)
+        end
+      end
     end
 
     case Rails::VERSION::MAJOR
@@ -139,10 +171,10 @@ module FiberedMysql2
       include Adapter_5_2
     end
 
-    def initialize(connection_spec)
+    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)"
 
-      super(connection_spec)
+      super(connection_spec, *args, **keyword_args)
 
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
 
@@ -165,36 +197,6 @@ module FiberedMysql2
       end
     end
 
-    if Rails::VERSION::MAJOR > 4
-      def release_connection(owner_thread = Fiber.current)
-        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
-          checkin(conn)
-        end
-      end
-    end
-
-    def current_connection_id
-      case Rails::VERSION::MAJOR
-      when 4
-        ActiveRecord::Base.connection_id ||= Fiber.current.object_id
-      else
-        connection_cache_key(current_thread)
-      end
-    end
-
-    def checkout(checkout_timeout = @checkout_timeout)
-      begin
-        reap_connections
-      rescue => ex
-        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
-      end
-      if Rails::VERSION::MAJOR > 4
-        super
-      else
-        super()
-      end
-    end
-
     def reap_connections
       cached_connections.values.each do |connection|
         unless connection.owner.alive?

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.1.0.pre.4"
+  VERSION = "0.1.0.pre.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.1.0.pre.5
 platform: ruby
 authors:
-- Octothorp
+- Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -46,7 +46,7 @@ dependencies:
         version: '7'
 description:
 email:
-- octothorp@invoca.com
+- development@invoca.com
 executables: []
 extensions: []
 extra_rdoc_files: []