janus-ar 0.15.2 → 0.15.3

data/spec/lib/active_record/connection_adapters/janus_trilogy_adapter_spec.rb

@@ -1,80 +1,80 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
-  subject { described_class.new(config) }
-
-  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
-
-  let(:database) { 'test' }
-  let(:primary_config) do
-    {
-      'username' => 'primary',
-      'password' => 'primary_password',
-      'host' => '127.0.0.1',
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => Trilogy::TLS_VERSION_12,
-    }
-  end
-  let(:replica_config) do
-    {
-      'username' => 'replica',
-      'password' => 'replica_password',
-      'host' => '127.0.0.1',
-      'pool' => 500,
-      'ssl' => true,
-      'ssl_mode' => 'REQUIRED',
-      'tls_min_version' => Trilogy::TLS_VERSION_12,
-    }
-  end
-  let(:config) do
-    {
-      database:,
-      adapter: 'janus_trilogy',
-      janus: {
-        'primary' => primary_config,
-        'replica' => replica_config,
-      },
-    }
-  end
-
-  describe 'Configuration' do
-    it 'creates primary connection as expected' do
-      config = primary_config.dup.freeze
-      expect(subject.config).to eq config.merge('database' => database,
-                                                'flags' => ::Janus::Client::FOUND_ROWS).symbolize_keys
-    end
-
-    it 'creates replica connection as expected' do
-      config = replica_config.dup.freeze
-      expect(
-        subject.replica_connection.instance_variable_get(:@config)
-      ).to eq config.merge('database' => database).symbolize_keys
-    end
-
-    context 'Rails sets empty database for server connection' do
-      let(:database) { nil }
-
-      it 'creates primary connection as expected' do
-        config = primary_config.dup.freeze
-        expect(subject.config).to eq config.merge(
-          'database' => nil,
-          'flags' => ::Janus::Client::FOUND_ROWS
-        ).symbolize_keys
-      end
-
-      it 'creates replica connection as expected' do
-        config = replica_config.dup.freeze
-        expect(
-          subject.replica_connection.instance_variable_get(:@config)
-        ).to eq config.merge('database' => nil).symbolize_keys
-      end
-    end
-  end
-
-  describe 'Integration tests' do
-    let(:table_name) { 'table_name_trilogy' }
-
-    it_behaves_like 'a mysql like server'
-  end
-end
+# frozen_string_literal: true
+
+RSpec.describe ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter do
+  subject { described_class.new(config) }
+
+  it { expect(described_class::FOUND_ROWS).to eq 'FOUND_ROWS' }
+
+  let(:database) { 'test' }
+  let(:primary_config) do
+    {
+      'username' => 'primary',
+      'password' => 'primary_password',
+      'host' => '127.0.0.1',
+      'ssl' => true,
+      'ssl_mode' => 'REQUIRED',
+      'tls_min_version' => Trilogy::TLS_VERSION_12,
+    }
+  end
+  let(:replica_config) do
+    {
+      'username' => 'replica',
+      'password' => 'replica_password',
+      'host' => '127.0.0.1',
+      'pool' => 500,
+      'ssl' => true,
+      'ssl_mode' => 'REQUIRED',
+      'tls_min_version' => Trilogy::TLS_VERSION_12,
+    }
+  end
+  let(:config) do
+    {
+      database:,
+      adapter: 'janus_trilogy',
+      janus: {
+        'primary' => primary_config,
+        'replica' => replica_config,
+      },
+    }
+  end
+
+  describe 'Configuration' do
+    it 'creates primary connection as expected' do
+      config = primary_config.dup.freeze
+      expect(subject.config).to eq config.merge('database' => database,
+                                                'flags' => ::Janus::Client::FOUND_ROWS).symbolize_keys
+    end
+
+    it 'creates replica connection as expected' do
+      config = replica_config.dup.freeze
+      expect(
+        subject.replica_connection.instance_variable_get(:@config)
+      ).to eq config.merge('database' => database).symbolize_keys
+    end
+
+    context 'Rails sets empty database for server connection' do
+      let(:database) { nil }
+
+      it 'creates primary connection as expected' do
+        config = primary_config.dup.freeze
+        expect(subject.config).to eq config.merge(
+          'database' => nil,
+          'flags' => ::Janus::Client::FOUND_ROWS
+        ).symbolize_keys
+      end
+
+      it 'creates replica connection as expected' do
+        config = replica_config.dup.freeze
+        expect(
+          subject.replica_connection.instance_variable_get(:@config)
+        ).to eq config.merge('database' => nil).symbolize_keys
+      end
+    end
+  end
+
+  describe 'Integration tests' do
+    let(:table_name) { 'table_name_trilogy' }
+
+    it_behaves_like 'a mysql like server'
+  end
+end

data/spec/lib/janus/client_spec.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-require 'janus/client'
-
-RSpec.describe Janus::Client do
-  it { expect(described_class::FOUND_ROWS).to eq 2 }
-end
+# frozen_string_literal: true
+
+require 'janus/client'
+
+RSpec.describe Janus::Client do
+  it { expect(described_class::FOUND_ROWS).to eq 2 }
+end

data/spec/lib/janus/context_spec.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-
-require 'janus/context'
-
-RSpec.describe Janus::Context do
-  describe '#initialize' do
-    it 'sets the primary flag and expiry' do
-      context = described_class.new(primary: true, expiry: 60)
-      expect(context.use_primary?).to be true
-      expect(context.last_used_connection).to eq(:primary)
-    end
-  end
-
-  describe '#stick_to_primary' do
-    it 'sets the primary flag to true' do
-      context = described_class.new
-      context.stick_to_primary
-      expect(context.use_primary?).to be true
-    end
-  end
-
-  describe '#potential_write' do
-    it 'calls stick_to_primary' do
-      context = described_class.new
-      expect(context).to receive(:stick_to_primary)
-      context.potential_write
-    end
-  end
-
-  describe '#release_all' do
-    it 'resets the primary flag and expiry' do
-      context = described_class.new(primary: true, expiry: 60)
-      context.release_all
-      expect(context.use_primary?).to be false
-      expect(context.last_used_connection).to be_nil
-    end
-  end
-
-  describe '#used_connection' do
-    it 'sets the last used connection' do
-      context = described_class.new
-      context.used_connection(:secondary)
-      expect(context.last_used_connection).to eq(:secondary)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'janus/context'
+
+RSpec.describe Janus::Context do
+  describe '#initialize' do
+    it 'sets the primary flag and expiry' do
+      context = described_class.new(primary: true, expiry: 60)
+      expect(context.use_primary?).to be true
+      expect(context.last_used_connection).to eq(:primary)
+    end
+  end
+
+  describe '#stick_to_primary' do
+    it 'sets the primary flag to true' do
+      context = described_class.new
+      context.stick_to_primary
+      expect(context.use_primary?).to be true
+    end
+  end
+
+  describe '#potential_write' do
+    it 'calls stick_to_primary' do
+      context = described_class.new
+      expect(context).to receive(:stick_to_primary)
+      context.potential_write
+    end
+  end
+
+  describe '#release_all' do
+    it 'resets the primary flag and expiry' do
+      context = described_class.new(primary: true, expiry: 60)
+      context.release_all
+      expect(context.use_primary?).to be false
+      expect(context.last_used_connection).to be_nil
+    end
+  end
+
+  describe '#used_connection' do
+    it 'sets the last used connection' do
+      context = described_class.new
+      context.used_connection(:secondary)
+      expect(context.last_used_connection).to eq(:secondary)
+    end
+  end
+end

data/spec/lib/janus/logging/logger_spec.rb

@@ -1,31 +1,31 @@
-# frozen_string_literal: true
-
-RSpec.describe Janus::Logging::Logger do
-  describe '.log' do
-    let(:logger) { double('logger') }
-
-    before do
-      described_class.logger = logger
-    end
-
-    it 'logs the message with the specified format' do
-      expect(logger).to receive(:send).with(:info, '[Janus] Test message')
-      described_class.log('Test message', :info)
-    end
-
-    it 'does not log the message if logger is not set' do
-      described_class.logger = nil
-      expect(logger).not_to receive(:send)
-      described_class.log('Test message', :info)
-    end
-  end
-
-  describe '.logger=' do
-    let(:logger) { double('logger') }
-
-    it 'sets the logger' do
-      described_class.logger = logger
-      expect(described_class.logger).to eq(logger)
-    end
-  end
-end
+# frozen_string_literal: true
+
+RSpec.describe Janus::Logging::Logger do
+  describe '.log' do
+    let(:logger) { double('logger') }
+
+    before do
+      described_class.logger = logger
+    end
+
+    it 'logs the message with the specified format' do
+      expect(logger).to receive(:send).with(:info, '[Janus] Test message')
+      described_class.log('Test message', :info)
+    end
+
+    it 'does not log the message if logger is not set' do
+      described_class.logger = nil
+      expect(logger).not_to receive(:send)
+      described_class.log('Test message', :info)
+    end
+  end
+
+  describe '.logger=' do
+    let(:logger) { double('logger') }
+
+    it 'sets the logger' do
+      described_class.logger = logger
+      expect(described_class.logger).to eq(logger)
+    end
+  end
+end

data/spec/lib/janus/query_director_spec.rb

@@ -1,59 +1,59 @@
-# frozen_string_literal: true
-
-RSpec.describe Janus::QueryDirector do
-  describe 'Constants' do
-    it { expect(described_class::SQL_SKIP_ALL_MATCHERS).to eq [/\A\s*set\s+local\s/i] }
-    it {
-      expect(described_class::SQL_PRIMARY_MATCHERS).to eq(
-        [
-          /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
-          /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i,
-          /\A\s*show/i
-        ]
-      )
-    }
-    it { expect(described_class::SQL_REPLICA_MATCHERS).to eq([/\A\s*(select|with.+\)\s*select)\s/i]) }
-    it { expect(described_class::SQL_ALL_MATCHERS).to eq([/\A\s*set\s/i]) }
-    it {
-      expect(described_class::WRITE_PREFIXES).to eq %w(INSERT UPDATE DELETE LOCK CREATE GRANT DROP ALTER TRUNCATE BEGIN
-                                                       SAVEPOINT FLUSH)
-    }
-
-    it { expect(described_class::ALL).to eq :all }
-    it { expect(described_class::REPLICA).to eq :replica }
-    it { expect(described_class::PRIMARY).to eq :primary }
-  end
-
-  describe '#where_to_send?' do
-    before(:each) do
-      Janus::Context.release_all
-    end
-
-    context 'when should send to all' do
-      it 'returns :all' do
-        sql = 'SET foo = bar'
-        open_transactions = 0
-        query_director = described_class.new(sql, open_transactions)
-        expect(query_director.where_to_send?).to eq(:all)
-      end
-    end
-
-    context 'when can go to replica' do
-      it 'returns :replica' do
-        sql = 'SELECT * FROM users'
-        open_transactions = 0
-        query_director = described_class.new(sql, open_transactions)
-        expect(query_director.where_to_send?).to eq(:replica)
-      end
-    end
-
-    context 'when should go to primary' do
-      it 'returns :primary' do
-        sql = 'INSERT INTO users (name) VALUES ("John")'
-        open_transactions = 0
-        query_director = described_class.new(sql, open_transactions)
-        expect(query_director.where_to_send?).to eq(:primary)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+RSpec.describe Janus::QueryDirector do
+  describe 'Constants' do
+    it { expect(described_class::SQL_SKIP_ALL_MATCHERS).to eq [/\A\s*set\s+local\s/i] }
+    it {
+      expect(described_class::SQL_PRIMARY_MATCHERS).to eq(
+        [
+          /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
+          /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i,
+          /\A\s*show/i
+        ]
+      )
+    }
+    it { expect(described_class::SQL_REPLICA_MATCHERS).to eq([/\A\s*(select|with.+\)\s*select)\s/i]) }
+    it { expect(described_class::SQL_ALL_MATCHERS).to eq([/\A\s*set\s/i]) }
+    it {
+      expect(described_class::WRITE_PREFIXES).to eq %w(INSERT UPDATE DELETE LOCK CREATE GRANT DROP ALTER TRUNCATE BEGIN
+                                                       SAVEPOINT FLUSH)
+    }
+
+    it { expect(described_class::ALL).to eq :all }
+    it { expect(described_class::REPLICA).to eq :replica }
+    it { expect(described_class::PRIMARY).to eq :primary }
+  end
+
+  describe '#where_to_send?' do
+    before(:each) do
+      Janus::Context.release_all
+    end
+
+    context 'when should send to all' do
+      it 'returns :all' do
+        sql = 'SET foo = bar'
+        open_transactions = 0
+        query_director = described_class.new(sql, open_transactions)
+        expect(query_director.where_to_send?).to eq(:all)
+      end
+    end
+
+    context 'when can go to replica' do
+      it 'returns :replica' do
+        sql = 'SELECT * FROM users'
+        open_transactions = 0
+        query_director = described_class.new(sql, open_transactions)
+        expect(query_director.where_to_send?).to eq(:replica)
+      end
+    end
+
+    context 'when should go to primary' do
+      it 'returns :primary' do
+        sql = 'INSERT INTO users (name) VALUES ("John")'
+        open_transactions = 0
+        query_director = described_class.new(sql, open_transactions)
+        expect(query_director.where_to_send?).to eq(:primary)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,43 +1,43 @@
-# frozen_string_literal: true
-
-require 'pry'
-
-require 'active_record'
-
-require './lib/janus'
-require './lib/active_record/connection_adapters/janus_mysql2_adapter'
-require './lib/active_record/connection_adapters/janus_trilogy_adapter'
-
-require './spec/shared_examples/a_mysql_like_server.rb'
-
-class QueryLogger
-  def initialize
-    @_logs = []
-  end
-
-  def flush_all
-    @_logs = []
-  end
-
-  def log(level, message)
-    @_logs << "#{level}: #{message}"
-  end
-
-  def error(message)
-    log('error', message)
-  end
-
-  def queries
-    @_logs
-  end
-
-  def debug?
-    true
-  end
-
-  def debug(message)
-    log('debug', message)
-  end
-end
-
-$query_logger = ActiveRecord::Base.logger = QueryLogger.new
+# frozen_string_literal: true
+
+require 'pry'
+
+require 'active_record'
+
+require './lib/janus'
+require './lib/active_record/connection_adapters/janus_mysql2_adapter'
+require './lib/active_record/connection_adapters/janus_trilogy_adapter'
+
+require './spec/shared_examples/a_mysql_like_server.rb'
+
+class QueryLogger
+  def initialize
+    @_logs = []
+  end
+
+  def flush_all
+    @_logs = []
+  end
+
+  def log(level, message)
+    @_logs << "#{level}: #{message}"
+  end
+
+  def error(message)
+    log('error', message)
+  end
+
+  def queries
+    @_logs
+  end
+
+  def debug?
+    true
+  end
+
+  def debug(message)
+    log('debug', message)
+  end
+end
+
+$query_logger = ActiveRecord::Base.logger = QueryLogger.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Lloyd Watkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,13 +17,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
-  type: :development
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +126,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.63.0
+        version: 1.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.63.0
+        version: 1.65.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Read/Write proxy for ActiveRecord using primary/replica databases