shinq 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a98bea1ff59d4ac82c52fe23e23bd70605ff985dacb6a8771b2581304a69b2
-  data.tar.gz: a595be8097e59bc3ddebdb247e6a9e3f9e37421f1fbbf96462a54dee2b3c60fc
+  metadata.gz: 4500852828c16cc3dc647eb066a1b6ebf1851783b916bb76a4afd2e220bc9382
+  data.tar.gz: 943f21748666dfd25f14fcde22abe7266bd39ef989facd673c0246e38be78611
 SHA512:
-  metadata.gz: 9b9d15ab2e0c053ad30d3508661536159a3bff7635780ff2379245e1a852f3c686804b5b98a73f53400526ef3035398311108b1eb4fd3ec8c1c281de77a80b37
-  data.tar.gz: 0c6b367b9667cf79495642883dcfcc96d9e651d5d6ea49887453e59ca8e010f46a462b0ce7fde9e4c3c3ba06d513b73026229da3c923867b923c612e73b2a194
+  metadata.gz: dd06574c63da919a33f03a5242584fead594e4030584dfe6b95100911fbcfcaaed55ac25fb2a2433360f8de10bb7086ef1620286aa48db61c99adbf5e32aa3b7
+  data.tar.gz: 85e7f4354633f56bdc6357d8e8afd0cfbb27b1dd6a85e2784d9476a63eb4ca029cd2a08c64596100096bb5c81e1cb48b0ac7c39b3cc1288a60d277e1db35e2bc

data/.github/workflows/test.yml

@@ -18,17 +18,46 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
-    
     strategy:
       max-parallel: 4
       fail-fast: true
       matrix:
-        ruby: [2.4, 2.5, 2.6, 2.7]
+        # We test only the oldest and latest Ruby versions for each Rails version.
+        ruby_gemfile:
+          - gemfile: gemfiles/rails_7.0.gemfile
+            ruby: '2.7'
+          - gemfile: gemfiles/rails_7.0.gemfile
+            ruby: '3.3'
+
+          - gemfile: gemfiles/rails_7.1.gemfile
+            ruby: '2.7'
+          - gemfile: gemfiles/rails_7.1.gemfile
+            ruby: '3.4'
+
+          - gemfile: gemfiles/rails_7.2.gemfile
+            ruby: '3.1'
+          - gemfile: gemfiles/rails_7.2.gemfile
+            ruby: '3.4'
+
+          - gemfile: gemfiles/rails_8.0.gemfile
+            ruby: '3.2'
+          - gemfile: gemfiles/rails_8.0.gemfile
+            ruby: '3.4'
+
+          - gemfile: gemfiles/rails_8.1.gemfile
+            ruby: '3.2'
+          - gemfile: gemfiles/rails_8.1.gemfile
+            ruby: '3.4'
+        adapter:
+          - trilogy
+          - mysql2
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.ruby_gemfile.gemfile }}
     services:
       mysql:
-        image: iwata/centos6-mysql56-q4m-hs
+        # https://github.com/DeNA/ubuntu22-mysql-q4m
+        image: ghcr.io/dena/ubuntu22-mysql-q4m:8.0.28-6bc571978335b6304566c8df4a5ff7e2b2d9911f
         ports:
           - 3306:3306
     steps:
@@ -40,8 +69,10 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: ${{ matrix.ruby }}
+        ruby-version: ${{ matrix.ruby_gemfile.ruby }}
     - name: Install dependencies
       run: bundle install
     - name: Run tests
+      env:
+        SHINQ_TEST_ADAPTER: ${{ matrix.adapter }}
       run: bundle exec rspec

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -11,4 +12,5 @@
 *.so
 *.o
 *.a
+/.idea/
 mkmf.log

data/Appraisals

@@ -0,0 +1,37 @@
+# Every Minor Version for the Current and Last Major Releases
+# Latest Minor Version for the Older Releases.
+# https://guides.rubyonrails.org/maintenance_policy.html
+#
+# When you update this, do not forget to update CI settings for matrix testing.
+
+# # Since bundler v1 and Appraisals are not well interacted,
+# # we do not test the rails-4 here.
+# appraise "rails-4" do
+#   gem "rails", "~> 4.0"
+# end
+
+appraise "rails-7.0" do
+  gem "activesupport", "~> 7.0.0"
+  gem "activejob", "~> 7.0.0"
+  gem 'concurrent-ruby', '1.3.4' # https://stackoverflow.com/a/79361034
+end
+
+appraise "rails-7.1" do
+  gem "activesupport", "~> 7.1.0"
+  gem "activejob", "~> 7.1.0"
+end
+
+appraise "rails-7.2" do
+  gem "activesupport", "~> 7.2.0"
+  gem "activejob", "~> 7.2.0"
+end
+
+appraise "rails-8.0" do
+  gem "activesupport", "~> 8.0.0"
+  gem "activejob", "~> 8.0.0"
+end
+
+appraise "rails-8.1" do
+  gem "activesupport", "~> 8.1.0"
+  gem "activejob", "~> 8.1.0"
+end

data/README.md

@@ -6,9 +6,10 @@ Worker and enqueuer for Q4M using the interface of ActiveJob.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add these lines to your application's Gemfile:
 
 ```ruby
+gem 'mysql2' # or gem 'trilogy'
 gem 'shinq'
 ```
 
@@ -18,7 +19,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install shinq
+    $ gem install mysql2 shinq
 
 [Install Q4M](http://q4m.github.io/install.html)
 

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "activejob", "~> 7.0.0"
+gem "concurrent-ruby", "1.3.4"
+
+gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

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

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.2.0"
+gem "activejob", "~> 7.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 8.0.0"
+gem "activejob", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 8.1.0"
+gem "activejob", "~> 8.1.0"
+
+gemspec path: "../"

data/lib/shinq/client.rb

@@ -36,11 +36,11 @@ module Shinq
       wait_query = "queue_wait(#{quoted}, #{queue_timeout_quoted})"
       has_queue = Shinq.connection.query("select #{wait_query}").first
 
-      unless has_queue[wait_query].to_i == 0
+      unless has_queue[0].to_i == 0
         sql = builder.select(table_name, ['*'])
         results = Shinq.connection.query(sql)
         # select always returns 1 line in the owner (queue_wait) mode
-        return results.first.symbolize_keys
+        return results.fields.map(&:to_sym).zip(results.each.first).to_h
       end
     end
 
@@ -50,7 +50,7 @@ module Shinq
       stats_query = "queue_stats(#{quoted})"
       result = Shinq.connection.query("select #{stats_query}")
 
-      stats = result.first[stats_query].split(/\n/).each_with_object({}) do |s, h|
+      stats = result.first[0].split(/\n/).each_with_object({}) do |s, h|
         (k,v) = s.split(/:/)
         h[k.to_sym] = v.to_i
       end
@@ -68,7 +68,7 @@ module Shinq
       @column_names_by_table_name ||= {}
       @column_names_by_table_name[table_name.to_sym] ||= begin
         quoted = SQL::Maker::Quoting.quote(table_name)
-        column = Shinq.connection.query(<<-EOS).map { |record| record['column_name'] }
+        column = Shinq.connection.query(<<-EOS).map { |record| record[0] }
 select column_name as column_name from information_schema.columns where table_schema = database() and table_name = #{quoted}
         EOS
       end

data/lib/shinq.rb

@@ -1,4 +1,3 @@
-require 'mysql2'
 require 'shinq/client'
 require 'shinq/configuration'
 
@@ -23,8 +22,20 @@ module Shinq
   end
 
   def self.setup_db_connection(db_name)
-    raise Shinq::ConfigurationError unless self.configuration.db_defined?(db_name)
-    @connections[db_name.to_sym] = Mysql2::Client.new(self.configuration.db_config[db_name])
+    raise Shinq::ConfigurationError, "#{db_name.inspect} is not defined in configuration" unless self.configuration.db_defined?(db_name)
+
+    db_config = self.configuration.db_config[db_name]
+    @connections[db_name.to_sym] =
+      case db_config[:adapter]
+      when 'trilogy'
+        require 'trilogy'
+        Trilogy.new(db_config.dup)
+      when 'mysql2', nil # for backward compatibility, we use mysql2 when adapter is not specified
+        require 'mysql2'
+        Mysql2::Client.new(db_config.merge(as: :array))
+      else
+        raise "Unsupported adapter: #{db_config[:adapter]}. Only trilogy and mysql2 are supported."
+      end
   end
 
   def self.connection(db_name: self.default_db)

data/shinq.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "shinq"
-  spec.version       = '1.2.0'
+  spec.version       = '1.4.0'
   spec.authors       = ["Ryoichi SEKIGUCHI"]
   spec.email         = ["ryopeko@gmail.com"]
   spec.summary       = %q{Worker and enqueuer for Q4M using the interface of ActiveJob.}
@@ -16,18 +16,22 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.required_ruby_version = ">= 2.3"
+
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "tapp"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-mocks"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "timecop"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "trilogy"
+  spec.add_development_dependency "mysql2"
+
+  spec.add_dependency "sql-maker", ">= 0.0.4", "< 2"
+  spec.add_dependency 'serverengine', ">= 1.5.9", "< 3"
 
-  spec.add_dependency "mysql2", ">= 0.3.16", "< 0.6"
-  spec.add_dependency "sql-maker", "~> 0.0.4"
-  spec.add_dependency "activesupport", ">= 4.2.0", "< 6.1"
-  spec.add_dependency "activejob", ">= 4.2.0", "< 6.1"
-  spec.add_dependency 'serverengine', '~> 1.5.9'
+  spec.add_dependency "activesupport", ">= 4.2.0"
+  spec.add_dependency "activejob", ">= 4.2.0"
 end

data/spec/integration_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'shinq'
 require 'shinq/client'
+require 'securerandom'
 
 describe "Integration" do
 
@@ -13,7 +14,7 @@ describe "Integration" do
 
   after do
     Shinq.clear_all_connections! # Return from owner mode
-    tables = Shinq.connection.query('show tables').flat_map(&:values)
+    tables = Shinq.connection.query('show tables').to_a.flatten
     tables.each do |table|
       Shinq.connection.query("delete from #{table}")
     end
@@ -126,12 +127,12 @@ describe "Integration" do
           args: {title: 'foo'}
         )
 
-        @queue_count = Shinq.connection.query("select count(*) as c from #{queue_table}").first['c']
+        @queue_count = Shinq.connection.query("select count(*) as c from #{queue_table}").first.first
 
         Shinq::Client.dequeue(table_name: queue_table)
         Shinq::Client.abort
 
-        @after_queue_count = Shinq.connection.query("select count(*) as c from #{queue_table}").first['c']
+        @after_queue_count = Shinq.connection.query("select count(*) as c from #{queue_table}").first.first
       end
 
       it { expect(@after_queue_count).to be @queue_count }

data/spec/shinq/client_spec.rb

@@ -34,13 +34,13 @@ describe Shinq::Client do
 
   describe '.column_names' do
     it 'fetches column_names' do
-      expect(shinq_client.column_names(table_name: :queue_test)).to eq(['job_id', 'title', 'scheduled_at', 'enqueued_at'])
+      expect(shinq_client.column_names(table_name: :queue_test).sort).to eq(['job_id', 'title', 'scheduled_at', 'enqueued_at'].sort)
     end
   end
 
   describe 'fetch_column_names' do
     it 'fetches column_names' do
-      expect(shinq_client.fetch_column_names(table_name: :queue_test)).to eq(['job_id', 'title', 'scheduled_at', 'enqueued_at'])
+      expect(shinq_client.fetch_column_names(table_name: :queue_test).sort).to eq(['job_id', 'title', 'scheduled_at', 'enqueued_at'].sort)
     end
   end
 end

data/spec/shinq_spec.rb

@@ -64,7 +64,14 @@ describe Shinq do
 
       it do
         shinq.connection(db_name: :test)
-        expect(shinq.connection(db_name: :test)).to be_a_kind_of(Mysql2::Client)
+        case shinq.configuration.default_db_config[:adapter]
+        when 'mysql2'
+          expect(shinq.connection(db_name: :test)).to be_a_kind_of(Mysql2::Client)
+        when 'trilogy'
+          expect(shinq.connection(db_name: :test)).to be_a_kind_of(Trilogy)
+        else
+          raise "Unexpected adapter: #{shinq.configuration.default_db_config[:adapter]}"
+        end
       end
     end
   end
@@ -83,7 +90,17 @@ describe Shinq do
 
       it 'closes connection' do
         shinq.clear_all_connections!
-        expect(connection.ping).to be false
+
+        # Trilogy raises an exception while mysql2 returns false
+        # see: https://github.com/trilogy-libraries/trilogy/pull/145
+        case shinq.configuration.default_db_config[:adapter]
+        when 'trilogy'
+          expect { connection.ping }.to raise_error Trilogy::ConnectionClosed
+        when 'mysql2'
+          expect(connection.ping).to eq false
+        else
+          raise "Unexpected adapter: #{shinq.configuration.default_db_config[:adapter]}"
+        end
       end
 
       it 'clears connection cache' do

data/spec/spec_helper.rb

@@ -5,12 +5,14 @@ require 'rspec/mocks/standalone'
 require 'simplecov'
 require 'erb'
 require 'yaml'
+require 'active_support'
 require 'active_support/core_ext/hash'
+require 'active_support/core_ext/numeric/time'
 require 'mysql2'
 require 'timecop'
 
-def load_database_config
-  db_config = YAML.load_file(File.expand_path('./config/database.yml', __dir__)).deep_symbolize_keys
+def load_database_config(adapter: ENV.fetch('SHINQ_TEST_ADAPTER', 'trilogy'))
+  YAML.load_file(File.expand_path('./config/database.yml', __dir__)).deep_symbolize_keys.deep_merge(test: { adapter: adapter })
 end
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2025-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,21 +24,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: tapp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tapp
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,69 +122,80 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: trilogy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sql-maker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 1.5.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 1.5.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,24 +203,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: serverengine
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.9
-description: 
+        version: 4.2.0
 email:
 - ryopeko@gmail.com
 executables:
@@ -221,11 +227,17 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/shinq
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/generators/shinq/worker/templates/create_table_migration.erb
 - lib/generators/shinq/worker/templates/worker.erb
 - lib/generators/shinq/worker/worker_generator.rb
@@ -252,7 +264,6 @@ homepage: https://github.com/ryopeko/shinq
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -260,15 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Worker and enqueuer for Q4M using the interface of ActiveJob.
 test_files: