active_record_mysql_xverify 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a46880b7feb5ba8ae7bff088286906fed643d0a4e675e427f3f15f3c8a23acf
-  data.tar.gz: 33b49e0e82fc7895a7ecdd29c8d49b3c34a28900377628e7d1f4c899c6ef7871
+  metadata.gz: f7575ed4ef4e91aa458e8f7f9a4fb38319b7fcdc07e89a6fe101c4998dbc1a8b
+  data.tar.gz: 3b88c54bffb73d7d69ca5df81172b72a3df4f4cd03e568967a1969133e6f17bb
 SHA512:
-  metadata.gz: d480ed34d3c86dc5f62d082e86161c63b1478e8d8dbb185c25de527b48d8644d9eb6a9e56e94fc7525ee9700c28e156788811256e1e1f05b68dbfb8bdc9a912a
-  data.tar.gz: 2106e3d52403afc79bad9a27b0cecc0f2c174cc4f454d674393258288f6b3d370e215309b27b0cac6c39bbf7bb19c0deedcfc55a14be147a5e15abc846feab62
+  metadata.gz: 956a695d38ac8f6c5d73c2b7e297c6f1a1615f57176b3b33d8c1a9d3dee08e5c1aa5343b35d8d8e3a6f22a3e98b75b5f9699734d6ddcc8a97893a32fcbb3b77c
+  data.tar.gz: 152451692be0cb60f5307981fb12dc4535de405d914e511692c93f13becd9187ce68cb2d99de26a6da24f7d0ffe6bb2866107345ffbec56e8dd32bcd78b0299c

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+        options: --health-cmd "mysqladmin ping -h localhost" --health-interval 1s --health-timeout 3s --health-retries 60
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.7
+          - 3.0
+          - 3.1
+          - 3.2
+        gemfile:
+          - gemfiles/ar60.gemfile
+          - gemfiles/ar61.gemfile
+          - gemfiles/ar70.gemfile
+          - gemfiles/ar71.gemfile
+    env:
+      DATABASE_HOST: 127.0.0.1
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,10 +1,13 @@
 AllCops:
   Exclude:
     - "gemfiles/**/*"
-  TargetRubyVersion: 2.4
+    - "vendor/bundle/**/*"
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
+  NewCops: enable
 Metrics/BlockLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
@@ -14,80 +17,9 @@ Style/Documentation:
   Enabled: false
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
-Gemspec/RequiredRubyVersion:
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
   Enabled: false
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/BinaryOperatorWithIdenticalOperands:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/DuplicateElsifCondition:
-  Enabled: true
-Lint/DuplicateRescueException:
-  Enabled: true
-Lint/EmptyConditionalBody:
-  Enabled: true
-Lint/FloatComparison:
-  Enabled: true
-Lint/MissingSuper:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Lint/OutOfRangeRegexpRef:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/SelfAssignment:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Lint/TopLevelReturnWithArgument:
-  Enabled: true
-Lint/UnreachableLoop:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/ArrayCoercion:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/CaseLikeIf:
-  Enabled: true
-Style/ExplicitBlockArgument:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/GlobalStdStream:
-  Enabled: true
-Style/HashAsLastArrayItem:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashLikeCase:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Style/OptionalBooleanParameter:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/SingleArgumentDig:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Style/StringConcatenation:
-  Enabled: true

data/Appraisals

@@ -1,22 +1,17 @@
 # frozen_string_literal: true
 
-appraise 'ar42' do
-  gem 'activerecord', '~> 4.2.10'
-  gem 'mysql2', '< 0.5'
-end
-
-appraise 'ar50' do
-  gem 'activerecord', '~> 5.0.7'
+appraise 'ar60' do
+  gem 'activerecord', '~> 6.0.3'
 end
 
-appraise 'ar51' do
-  gem 'activerecord', '~> 5.1.6'
+appraise 'ar61' do
+  gem 'activerecord', '~> 6.1.0'
 end
 
-appraise 'ar52' do
-  gem 'activerecord', '~> 5.2.1'
+appraise 'ar70' do
+  gem 'activerecord', '~> 7.0.0'
 end
 
-appraise 'ar60' do
-  gem 'activerecord', '~> 6.0.3'
+appraise 'ar71' do
+  gem 'activerecord', '~> 7.1.0'
 end

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM rubylang/ruby:2.5-bionic
+FROM rubylang/ruby:2.7
 
 RUN apt-get update && \
   apt-get install -y \
@@ -6,8 +6,4 @@ RUN apt-get update && \
   libmysqlclient-dev \
   rubygems
 
-COPY ./ /mnt/
 WORKDIR /mnt
-RUN gem update bundler -f && \
-  bundle install && \
-  bundle exec appraisal install

data/README.md

@@ -7,7 +7,7 @@ cf. https://github.com/brianmario/mysql2/issues/948
 **Note: This library does not retry queries. Just reconnect.**
 
 [![Gem Version](https://badge.fury.io/rb/active_record_mysql_xverify.svg)](http://badge.fury.io/rb/active_record_mysql_xverify)
-[![Build Status](https://travis-ci.org/winebarrel/active_record_mysql_xverify.svg?branch=master)](https://travis-ci.org/winebarrel/active_record_mysql_xverify)
+[![Build Status](https://github.com/winebarrel/active_record_mysql_xverify/workflows/test/badge.svg?branch=master)](https://github.com/winebarrel/active_record_mysql_xverify/actions)
 
 ## How it works
 
@@ -53,6 +53,8 @@ end
 # Default: ->(conn) { conn.ping }
 
 ActiveRecordMysqlXverify.handle_if = ->(config) do
+  # Check Aurora writer node
+  # NOTE: DO NOT verify reader node connection
   config[:host] == '127.0.0.1'
 end
 # Default: ->(_) { true }
@@ -132,11 +134,20 @@ Completed 302 Found in 150ms (ActiveRecord: 145.2ms)
 
 ## Test
 
-## Test
+### Preparation
+
+```sh
+docker compose build client
+docker compose run --rm client gem update bundler
+docker compose run --rm client bundle install
+docker compose run --rm client appraisal install
+```
+
+### Run tests
 
 ```sh
-docker-compose build
-docker-compose run client bundle exec appraisal ar60 rake
+docker compose up -d
+docker compose run client appraisal ar60 rake
 ```
 
 ## Related links

data/activerecord_mysql_xverify.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'activerecord'
   spec.add_dependency 'mysql2'
@@ -30,5 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '>= 1.8.0'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/docker-compose.yml

@@ -1,12 +1,17 @@
-version: "3.8"
 services:
   client:
     build: .
     volumes:
       - ./:/mnt
-    depends_on:
-      - mysql
+      - gems_bin:/usr/local/bin
+      - gems:/usr/local/lib/ruby/gems/2.7.0
+    profiles:
+      - extra
   mysql:
+    platform: linux/amd64
     image: mysql:5.7
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+volumes:
+  gems_bin:
+  gems:

data/gemfiles/{ar50.gemfile → ar61.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.7"
+gem "activerecord", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/{ar51.gemfile → ar70.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.6"
+gem "activerecord", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/{ar52.gemfile → ar71.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.1"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/active_record_mysql_xverify/error_handler.rb

@@ -2,7 +2,14 @@
 
 module ActiveRecordMysqlXverify
   module ErrorHandler
-    def execute(*)
+    def execute(*, **)
+      super
+    rescue StandardError
+      _flag_extend_verify!
+      raise
+    end
+
+    def raw_execute(*, **)
       super
     rescue StandardError
       _flag_extend_verify!

data/lib/active_record_mysql_xverify/utils.rb

@@ -5,10 +5,10 @@ module ActiveRecordMysqlXverify
     class << self
       def mysql2_connection_info(conn)
         thread_id = begin
-                      conn.thread_id
-                    rescue StandardError
-                      nil
-                    end
+          conn.thread_id
+        rescue StandardError
+          nil
+        end
 
         "host=#{conn.query_options[:host]}, database=#{conn.query_options[:database]}, " \
           "username=#{conn.query_options[:username]}, thread_id=#{thread_id}"

data/lib/active_record_mysql_xverify/verifier.rb

@@ -3,20 +3,20 @@
 module ActiveRecordMysqlXverify
   module Verifier
     def active?
-      if _extend_verify?
+      if (@raw_connection || @connection) && _extend_verify?
         is_active = begin
-                      verifier = ActiveRecordMysqlXverify.verify
-                      verifier.call(@connection)
-                    rescue StandardError => e
-                      ActiveRecordMysqlXverify.logger.warn("Connection verification failed: #{_build_verify_error_message(e)}")
-                      false
-                    ensure
-                      Thread.current[ActiveRecordMysqlXverify::EXTEND_VERIFY_FLAG] = false
-                    end
+          verifier = ActiveRecordMysqlXverify.verify
+          verifier.call(@raw_connection || @connection)
+        rescue StandardError => e
+          ActiveRecordMysqlXverify.logger.warn("Connection verification failed: #{_build_verify_error_message(e)}")
+          false
+        ensure
+          Thread.current[ActiveRecordMysqlXverify::EXTEND_VERIFY_FLAG] = false
+        end
 
         unless is_active
           ActiveRecordMysqlXverify.logger.info(
-            "Invalid connection: #{ActiveRecordMysqlXverify::Utils.mysql2_connection_info(@connection)}"
+            "Invalid connection: #{ActiveRecordMysqlXverify::Utils.mysql2_connection_info(@raw_connection || @connection)}"
           )
         end
 
@@ -27,7 +27,7 @@ module ActiveRecordMysqlXverify
     end
 
     def _build_verify_error_message(e)
-      "cause: #{e.message} [#{e.class}, " + ActiveRecordMysqlXverify::Utils.mysql2_connection_info(@connection)
+      "cause: #{e.message} [#{e.class}, " + ActiveRecordMysqlXverify::Utils.mysql2_connection_info(@raw_connection || @connection)
     end
 
     def _extend_verify?

data/lib/active_record_mysql_xverify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordMysqlXverify
-  VERSION = '0.2.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mysql_xverify
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - winebarrel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -96,6 +96,34 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,10 +144,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Dockerfile
 - Gemfile
@@ -127,15 +156,12 @@ files:
 - README.md
 - Rakefile
 - activerecord_mysql_xverify.gemspec
-- bin/console
-- bin/setup
 - docker-compose.yml
 - gemfiles/.bundle/config
-- gemfiles/ar42.gemfile
-- gemfiles/ar50.gemfile
-- gemfiles/ar51.gemfile
-- gemfiles/ar52.gemfile
 - gemfiles/ar60.gemfile
+- gemfiles/ar61.gemfile
+- gemfiles/ar70.gemfile
+- gemfiles/ar71.gemfile
 - lib/active_record_mysql_xverify.rb
 - lib/active_record_mysql_xverify/config.rb
 - lib/active_record_mysql_xverify/constants.rb
@@ -149,8 +175,9 @@ files:
 homepage: https://github.com/winebarrel/active_record_mysql_xverify
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,15 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: It is a library that performs extended verification when an error occurs
   when executing SQL.

data/.travis.yml

@@ -1,25 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-env:
-  - DATABASE_HOST=localhost DATABASE_USER=travis
-before_install:
-  - for i in {1..60}; do mysqladmin -u travis ping && break; sleep 1; done
-script:
-  - bundle exec rake
-gemfile:
-  - gemfiles/ar42.gemfile
-  - gemfiles/ar50.gemfile
-  - gemfiles/ar51.gemfile
-  - gemfiles/ar52.gemfile
-  - gemfiles/ar60.gemfile
-services:
-  - mysql
-jobs:
-  exclude:
-    - rvm: 2.7.1
-      gemfile: gemfiles/ar42.gemfile

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'active_record_mysql_xverify'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/gemfiles/ar42.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.10"
-gem "mysql2", "< 0.5"
-
-gemspec path: "../"