janus-ar 0.15.2 → 7.2.0

data/spec/lib/{janus → janus-ar}/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,46 @@
-# 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-ar'
+require './lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter'
+require './lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter'
+
+ActiveRecord::ConnectionAdapters.register("janus_trilogy", "ActiveRecord::ConnectionAdapters::JanusTrilogyAdapter")
+ActiveRecord::ConnectionAdapters.register("janus_mysql2", "ActiveRecord::ConnectionAdapters::JanusMysql2Adapter")
+
+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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 7.2.0
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
-  type: :development
+        version: '7.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,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.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.26.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -203,22 +203,22 @@ files:
 - assets/janus-logo.png
 - bin/release.sh
 - janus-ar.gemspec
-- lib/active_record/connection_adapters/janus_mysql2_adapter.rb
-- lib/active_record/connection_adapters/janus_trilogy_adapter.rb
-- lib/janus.rb
-- lib/janus/client.rb
-- lib/janus/context.rb
-- lib/janus/db_console_config.rb
-- lib/janus/logging/logger.rb
-- lib/janus/logging/subscriber.rb
-- lib/janus/query_director.rb
-- lib/janus/version.rb
-- spec/lib/active_record/connection_adapters/janus_mysql_adapter_spec.rb
-- spec/lib/active_record/connection_adapters/janus_trilogy_adapter_spec.rb
-- spec/lib/janus/client_spec.rb
-- spec/lib/janus/context_spec.rb
-- spec/lib/janus/logging/logger_spec.rb
-- spec/lib/janus/query_director_spec.rb
+- lib/janus-ar.rb
+- lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter.rb
+- lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter.rb
+- lib/janus-ar/client.rb
+- lib/janus-ar/context.rb
+- lib/janus-ar/db_console_config.rb
+- lib/janus-ar/logging/logger.rb
+- lib/janus-ar/logging/subscriber.rb
+- lib/janus-ar/query_director.rb
+- lib/janus-ar/version.rb
+- spec/lib/janus-ar/active_record/connection_adapters/janus_mysql_adapter_spec.rb
+- spec/lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter_spec.rb
+- spec/lib/janus-ar/client_spec.rb
+- spec/lib/janus-ar/context_spec.rb
+- spec/lib/janus-ar/logging/logger_spec.rb
+- spec/lib/janus-ar/query_director_spec.rb
 - spec/shared_examples/a_mysql_like_server.rb
 - spec/spec_helper.rb
 homepage: https://github.com/olioex/janus-ar
@@ -241,7 +241,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

data/lib/janus.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support'
-
-module Janus
-  autoload :Context, 'janus/context'
-  autoload :Client, 'janus/client'
-  autoload :QueryDirector, 'janus/query_director'
-  autoload :VERSION, 'janus/version'
-  autoload :DbConsoleConfig, 'janus/db_console_config'
-
-  module Logging
-    autoload :Subscriber, 'janus/logging/subscriber'
-    autoload :Logger, 'janus/logging/logger'
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::LogSubscriber.log_subscribers.each do |subscriber|
-    subscriber.extend Janus::Logging::Subscriber
-  end
-end