janus-ar 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fdf4d3725380dbdf4fc2bcf1d60d3135d4d45a37976eac826d5733ddd7fc8fa
-  data.tar.gz: e3e24f00234a1eab55e2493d8a497a5c7c3916830d629b0f54ce20fc435bbffe
+  metadata.gz: 4f68517d31773a920a61e251c4f52a38a79027f0a0d6501c425403a9fa69a866
+  data.tar.gz: d4c21cf0ebc3db473bced580364c5e185fc9d97cf28781cd7b97571ef4148fe4
 SHA512:
-  metadata.gz: eed5d877a0aeece9d905d0b1092b345f5788fbc15533cc59eee878d69c5e0fe76f4af968ce0d85a5dce9d2cd1f49fe6e9a035fb2add54a2be39c8abe1cb5c326
-  data.tar.gz: 222ee284a1e96bc86451abb16df09b7a1572987bdf47c44092925ff81aaffcc1bb73a7a50e8bf3fa280bd7d2e6d1b433da80885d9302ea67321c312605e054fd
+  metadata.gz: eff2590b57eca7703f4cda808982f46c57a1c728b2b194af5a8b9b18a7d49ad7c0569f7ab394d7f5382fa368802b07f0599d0afa3a45e2476ad97920093c656a
+  data.tar.gz: cb655011ec0518dd701a668542574c71d700c8eedcf5c361207b55180888a629a2062b25c37d48ea50c21e5478245a4835a87b51dde64ebbe740dc87b1443e94

data/.bundle/config

@@ -0,0 +1,5 @@
+---
+BUNDLE_JOBS: "4"
+BUNDLE_BUILD__UNICODE: "--with-cflags=-Wno-incompatible-function-pointer-types"
+BUNDLE_BUILD__MYSQL2: "--with-ldflags=-L/opt/homebrew/opt/zstd/lib"
+BUNDLE_FROZEN: "false"

data/.github/workflows/publish.yml

@@ -5,16 +5,21 @@ on:
     tags:
       - v*
 jobs:
-  build:
+  push:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+      id-token: write
+
     steps:
-      - uses: actions/checkout@v3
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
 
-      - name: Release GEM
-        if: contains(github.ref, 'refs/tags/v')
-        uses: cadwallion/publish-rubygems-action@master
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
-          RELEASE_COMMAND: ./bin/release.sh
+      # Release
+      - uses: rubygems/release-gem@v1

data/.gitignore

@@ -1,3 +1,2 @@
 janus-ar-*.gem
-.bundle/
 .rubocop-*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janus-ar (0.9.0)
+    janus-ar (0.11.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -6,11 +6,11 @@
      style="float: left; margin: 0 auto; height: 500px;" />
 </p>
 
+> In ancient Roman religion and myth, Janus (/ˈdʒeɪnəs/ JAY-nəs; Latin: Ianvs [ˈi̯aːnʊs]) is the god of beginnings, gates, transitions, time, duality, doorways,[2] passages, frames, and endings. [(wikipedia)](https://en.wikipedia.org/wiki/Janus)
+
 [![CI](https://github.com/OLIOEX/janus-ar/actions/workflows/ci.yml/badge.svg)](https://github.com/OLIOEX/janus-ar/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/janus-ar.svg)](https://badge.fury.io/rb/janus-ar)
 
-> In ancient Roman religion and myth, Janus (/ˈdʒeɪnəs/ JAY-nəs; Latin: Ianvs [ˈi̯aːnʊs]) is the god of beginnings, gates, transitions, time, duality, doorways,[2] passages, frames, and endings. [(wikipedia)](https://en.wikipedia.org/wiki/Janus)
-
 Janus ActiveRecord is generic primary/replica proxy for ActiveRecord 7.1+ and MySQL. It handles the switching of connections between primary and replica database servers. It comes with an ActiveRecord database adapter implementation.
 
 Janus is heavily inspired by [Makara](https://github.com/instacart/makara) from TaskRabbit and then Instacart. Unfortunately this project is unmaintained and broke for us with Rails 7.1. This is an attempt to start afresh on the project. It is definitely not as fully featured as Makara at this stage.
@@ -68,12 +68,14 @@ Janus::Context.stick_to_primary
 
 ### Logging
 
-You can set a logger instance to ::Janus::Logging::Logger.logger and Janus.
+You can set a logger instance to `::Janus::Logging::Logger.logger`:
 
 ```ruby
 Janus::Logging::Logger.logger = ::Logger.new(STDOUT)
 ```
 
+If using `ActiveRecord` logging, Janus will append the name of the connection used to any logs e.g. `[primary]` or `[replica]`.
+
 ### What queries goes where?
 
 In general: Any `SELECT` statements will execute against your replica(s), anything else will go to the primary.

data/lib/active_record/connection_adapters/janus_mysql2_adapter.rb

@@ -12,6 +12,14 @@ module ActiveRecord
   end
 end
 
+module ActiveRecord
+  class Base
+    def self.janus_mysql2_adapter_class
+      ActiveRecord::ConnectionAdapters::JanusMysql2Adapter
+    end
+  end
+end
+
 module ActiveRecord
   module ConnectionAdapters
     class JanusMysql2Adapter < ActiveRecord::ConnectionAdapters::Mysql2Adapter
@@ -28,6 +36,14 @@ module ActiveRecord
 
       attr_reader :config
 
+      class << self
+        def dbconsole(config, options = {})
+          connection_config = Janus::DbConsoleConfig.new(config)
+
+          super(connection_config, options)
+        end
+      end
+
       def initialize(*args)
         args[0][:janus]['replica']['database'] = args[0][:database]
         args[0][:janus]['primary']['database'] = args[0][:database]

data/lib/janus/db_console_config.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Janus
+  class DbConsoleConfig
+    def initialize(config)
+      @_config = config.configuration_hash
+    end
+
+    def configuration_hash
+      @_config[:janus]['replica'].symbolize_keys
+    end
+
+    def database
+      @_config[:database]
+    end
+  end
+end

data/lib/janus/version.rb

@@ -4,7 +4,7 @@ module Janus
   unless defined?(::Janus::VERSION)
     module VERSION
       MAJOR = 0
-      MINOR = 9
+      MINOR = 11
       PATCH = 0
       PRE = nil
 

data/lib/janus.rb

@@ -5,6 +5,7 @@ require 'active_support'
 module Janus
   autoload :Context, 'janus/context'
   autoload :VERSION, 'janus/version'
+  autoload :DbConsoleConfig, 'janus/db_console_config'
 
   module Logging
     autoload :Subscriber, 'janus/logging/subscriber'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Lloyd Watkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,6 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/publish.yml"
@@ -190,6 +191,7 @@ files:
 - lib/active_record/connection_adapters/janus_mysql2_adapter.rb
 - lib/janus.rb
 - lib/janus/context.rb
+- lib/janus/db_console_config.rb
 - lib/janus/logging/logger.rb
 - lib/janus/logging/subscriber.rb
 - lib/janus/version.rb
@@ -217,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Read/Write proxy for ActiveRecord using primary/replica databases