active_record_mysql_xverify 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8916472485098dffa64b7ee6eac7e6dba77ef47c11a5a6b40962cbc1a58e9876
-  data.tar.gz: 521ce8d4c2e7cc89a9224efd0a2429c2f4eaf82b7a0f717313497ff71144886f
+  metadata.gz: f7575ed4ef4e91aa458e8f7f9a4fb38319b7fcdc07e89a6fe101c4998dbc1a8b
+  data.tar.gz: 3b88c54bffb73d7d69ca5df81172b72a3df4f4cd03e568967a1969133e6f17bb
 SHA512:
-  metadata.gz: 0a6e9a7be89d458a1eb9a95da5e2bbc5786a8ab05443273a191308840b0550303c6370fb6c29fc1af30cbd36ba14a0cc074b2188d32c97db4482f6dabb2b20d2
-  data.tar.gz: bcd6ae93459bf26aa3b54c0139a4980461c46910764ef72c83d1d68cf00b1408519a61e16ebb75a22160ba3184a8e78553c367ff39cc2a3c064c2d12fb7fec26
+  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

@@ -4,6 +4,10 @@ on:
   push:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,11 +31,12 @@ jobs:
           - 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@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
   NewCops: enable
 Metrics/BlockLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
@@ -19,3 +19,7 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Gemspec/DevelopmentDependencies:
   Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/Appraisals

@@ -5,9 +5,13 @@ appraise 'ar60' do
 end
 
 appraise 'ar61' do
-  gem 'activerecord', '~> 6.1'
+  gem 'activerecord', '~> 6.1.0'
 end
 
 appraise 'ar70' do
-  gem 'activerecord', '~> 7.0'
+  gem 'activerecord', '~> 7.0.0'
+end
+
+appraise 'ar71' do
+  gem 'activerecord', '~> 7.1.0'
 end

data/Dockerfile

@@ -7,10 +7,3 @@ RUN apt-get update && \
   rubygems
 
 WORKDIR /mnt
-COPY Gemfile* ./
-COPY lib/active_record_mysql_xverify/version.rb ./lib/active_record_mysql_xverify/
-COPY Appraisals ./
-COPY activerecord_mysql_xverify.gemspec ./
-RUN gem update bundler -f && \
-  bundle install && \
-  bundle exec appraisal install

data/README.md

@@ -134,10 +134,20 @@ Completed 302 Found in 150ms (ActiveRecord: 145.2ms)
 
 ## Test
 
+### Preparation
+
 ```sh
-docker compose up -d
 docker compose build client
-docker compose run --rm client appraisal ar60 rake
+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 up -d
+docker compose run client appraisal ar60 rake
 ```
 
 ## Related links

data/docker-compose.yml

@@ -3,11 +3,15 @@ services:
     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/ar61.gemfile

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

data/gemfiles/ar70.gemfile

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

data/gemfiles/ar71.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+
+gemspec path: "../"

data/lib/active_record_mysql_xverify/verifier.rb

@@ -3,10 +3,10 @@
 module ActiveRecordMysqlXverify
   module Verifier
     def active?
-      if _extend_verify?
+      if (@raw_connection || @connection) && _extend_verify?
         is_active = begin
           verifier = ActiveRecordMysqlXverify.verify
-          verifier.call(@connection)
+          verifier.call(@raw_connection || @connection)
         rescue StandardError => e
           ActiveRecordMysqlXverify.logger.warn("Connection verification failed: #{_build_verify_error_message(e)}")
           false
@@ -16,7 +16,7 @@ module ActiveRecordMysqlXverify
 
         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.3.0'
+  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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - winebarrel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,6 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -155,13 +156,12 @@ files:
 - README.md
 - Rakefile
 - activerecord_mysql_xverify.gemspec
-- bin/console
-- bin/setup
 - docker-compose.yml
 - gemfiles/.bundle/config
 - 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

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