octoshark 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161e067d71a05ad670c0878c76c81cf2f12e46f6
-  data.tar.gz: 2ea1161f0943be6a2898098ce33a45d71c198d79
+  metadata.gz: ef8f0466152f75ea82a3324d87b4ee88c4ae0d35
+  data.tar.gz: 37a1d71986565517d011c6a8ebb908967e5d2ee1
 SHA512:
-  metadata.gz: e564f3d12510245908fa909d14712e1a3c7be6463b9bdd48c5040951762f08aeaa4052a7e17a434671396dae16a19c6a3c64c7164db2463884551b316895a5c2
-  data.tar.gz: 770a6674f4dfb97311027811c613450dabc42c95894f314477b174f121793357f529efb81257aa7972b94696963d45ad1760588c7fa62323bb771b63f63c67b2
+  metadata.gz: b7509fcade61d16d7c0a914b7dc51ad41b0467f1bbdfddb778235d1a120ad9f8d1e4580f507d59103068735d09a280cc1f204a7d5e4b25cfcefbe2ac81761bb5
+  data.tar.gz: fe4f0103ba756cb7acc45cbc06f1e3af59cdb29ce8f62026525f2e9a55a48c06df36e23186a28ec31377efed3b5f77a6cdf568dc04e7a5b22288dc77635bb665

data/lib/octoshark.rb

@@ -15,7 +15,7 @@ module Octoshark
     delegate :current_connection, :with_connection,
       :connection, :current_or_default_connection,
       :connection_pools, :find_connection_pool,
-      :disconnect!, to: :switcher
+      :current_connection_name, :disconnect!, to: :switcher
 
     def configure(configs)
       @configs = configs

data/lib/octoshark/active_record_extensions.rb

@@ -1,5 +1,5 @@
 module Octoshark
-  module ActiveRecordExtensions
+  module ActiveRecordBase
     extend ActiveSupport::Concern
 
     included do
@@ -15,6 +15,23 @@ module Octoshark
       end
     end
   end
+
+  module ActiveRecordLogSubscriber
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :debug, :octoshark
+    end
+
+    def debug_with_octoshark(msg)
+      prefix = if Octoshark.current_connection_name.present?
+                 color("[Octoshark: #{Octoshark.current_connection_name}]",
+                       ActiveSupport::LogSubscriber::GREEN, true)
+               end
+      debug_without_octoshark("#{prefix}#{msg}")
+    end
+  end
 end
 
-ActiveRecord::Base.send(:include, Octoshark::ActiveRecordExtensions)
+ActiveRecord::Base.send(:include, Octoshark::ActiveRecordBase)
+ActiveRecord::LogSubscriber.send(:include, Octoshark::ActiveRecordLogSubscriber)

data/lib/octoshark/connection_switcher.rb

@@ -4,6 +4,7 @@ module Octoshark
     attr_reader :connection_pools
 
     def initialize(configs = {})
+      configs           = configs.with_indifferent_access
       @default_pool     = ActiveRecord::Base.connection_pool
       @connection_pools = { default: @default_pool }.with_indifferent_access
 
@@ -14,11 +15,15 @@ module Octoshark
     end
 
     def current_connection
-      Thread.current[OCTOSHARK] || raise(NoCurrentConnectionError, "No current connection, use Octoshark.with_connection")
+      current_details[:connection] || raise(NoCurrentConnectionError, "No current connection, use Octoshark.with_connection")
     end
 
     def current_or_default_connection
-      Thread.current[OCTOSHARK] || @default_pool.connection
+      current_details[:connection] || @default_pool.connection
+    end
+
+    def current_connection_name
+      current_details[:name]
     end
 
     def with_connection(name, &block)
@@ -26,7 +31,8 @@ module Octoshark
 
       find_connection_pool(name).with_connection do |connection|
         previous_connection = Thread.current[OCTOSHARK]
-        Thread.current[OCTOSHARK] = connection
+        Thread.current[OCTOSHARK] = { name: name, connection: connection }
+
         begin
           result = yield(connection)
         ensure
@@ -55,5 +61,9 @@ module Octoshark
         spec_class = ActiveRecord::Base::ConnectionSpecification
       end
     end
+
+    def current_details
+      Thread.current[OCTOSHARK] || {}
+    end
   end
 end

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/octoshark/active_record_extensions_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
+require 'logger'
 
-describe Octoshark::ActiveRecordExtensions do
-
-  it "reloads Octoshark connection pools when establishing a new connection" do
+describe "ActiveRecord Extensions" do
+  it "reloads connection pools when establishing a new connection" do
     Octoshark.configure(configs)
 
     spec = ActiveRecord::Base.remove_connection
@@ -10,4 +10,20 @@ describe Octoshark::ActiveRecordExtensions do
 
     expect(ActiveRecord::Base.connection_pool).to eq(Octoshark.find_connection_pool(:default))
   end
+
+  it "logs current connection name" do
+    io = StringIO.new
+    logger = Logger.new(io)
+
+    ActiveRecord::Base.logger = logger
+
+    Octoshark.configure(configs)
+    Octoshark.with_connection(:db1) do |connection|
+      connection.execute("SELECT 1")
+    end
+
+    expect(io.string).to include('[Octoshark: db1]')
+
+    ActiveRecord::Base.logger = nil
+  end
 end

data/spec/octoshark/connection_switcher_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Octoshark::ConnectionSwitcher do
   describe "#initialize" do
-    it "can initialize connection switcher with default connection" do
+    it "initializes connection switcher with default connection" do
       switcher = Octoshark::ConnectionSwitcher.new
       conn = ActiveRecord::Base.connection
 
@@ -10,13 +10,20 @@ describe Octoshark::ConnectionSwitcher do
       expect(switcher.connection_pools[:default]).to be_an_instance_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
     end
 
-    it "can initialize connection switcher with custom connections" do
+    it "initializes connection switcher with custom connections" do
       switcher = Octoshark::ConnectionSwitcher.new(configs)
 
       expect(switcher.connection_pools.length).to eq(3)
       expect(switcher.connection_pools[:default]).to be_an_instance_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
       expect(switcher.connection_pools[:db1]).to be_an_instance_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
     end
+
+    it "accepts configs with string keys" do
+      configs = { 'db1' => { 'adapter' => "sqlite3", 'database' => "tmp/db1.sqlite" } }
+      switcher = Octoshark::ConnectionSwitcher.new(configs)
+
+      expect { switcher.connection_pools[:db1].connection }.not_to raise_error
+    end
   end
 
   describe "#current_connection" do
@@ -50,6 +57,22 @@ describe Octoshark::ConnectionSwitcher do
     end
   end
 
+  describe "#current_connection_name" do
+    it "returns current connection" do
+      switcher = Octoshark::ConnectionSwitcher.new(configs)
+
+      switcher.with_connection(:db1) do |connection|
+        expect(switcher.current_connection_name).to eq(:db1)
+      end
+    end
+
+    it "returns nil when no current connection" do
+      switcher = Octoshark::ConnectionSwitcher.new
+
+      expect(switcher.current_connection_name).to be_nil
+    end
+  end
+
   describe '#find_connection_pool' do
     it "can find connection pool by name" do
       switcher = Octoshark::ConnectionSwitcher.new(configs)

data/spec/octoshark_spec.rb

@@ -73,7 +73,8 @@ describe Octoshark do
   [
     :current_connection, :with_connection,
     :connection, :current_or_default_connection,
-    :connection_pools, :find_connection_pool
+    :connection_pools, :find_connection_pool,
+    :current_connection_name, :disconnect!
   ].each do |method_name|
     describe ".#{method_name}" do
       it "delegates #{method_name} to connection switcher" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dalibor Nasevic