octoshark 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920e18506d2e0b50577f3be766712eac70beec32
-  data.tar.gz: f8748e37f5a862a547caa5b170d72c352a942582
+  metadata.gz: 90a3eb977595f681e0fffb0fe11387a0bfd14a5f
+  data.tar.gz: 2eb1ddcefcd71470ab1f6f0271b854b3294b9874
 SHA512:
-  metadata.gz: e156d431037b1a543b86b5ccd2de0cbadc3f6698233cab5509f08c99e033f3214cac61e87d2cf661862bc725e41eda13a999113ff3bbc0202d8e610935fb9d64
-  data.tar.gz: e190b0f3a02d968dd4d4e857c6eea3ff757e9042760afa29d69f1888a07ce7a3170ee734ea25b395c3ffb63a09d8d8aa5f01367aabf04db5ddda60076d8be58f
+  metadata.gz: f317a576062bdee24ca65433969742ec7d86890af9f936d6fa6241bd69e5e4486dfa06e2de5bcac6f2c639c4946c9b25fd144db7afdfc29478cee5ff4b0db991
+  data.tar.gz: d27b2fdafc8a99bd78ac69e80152e509710908ebc5116451128c732ef793f79d5ad852dc4c47df3dfc757d21ec710996b4f4ff97f000d9f3df34230845e4763b

data/.travis.yml

@@ -7,5 +7,8 @@ notifications:
     - dalibor.nasevic@gmail.com
 gemfile:
   - gemfiles/rails3.gemfile
+  - gemfiles/rails3.1.gemfile
+  - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.gemfile
+  - gemfiles/rails4.1.gemfile
 script: bundle exec rspec spec

data/Appraisals

@@ -2,6 +2,18 @@ appraise "rails3" do
   gem "activerecord", "~> 3.0.0"
 end
 
+appraise "rails3.1" do
+  gem "activerecord", "~> 3.1.0"
+end
+
+appraise "rails3.2" do
+  gem "activerecord", "~> 3.2.0"
+end
+
 appraise "rails4" do
   gem "activerecord", "~> 4.0.0"
 end
+
+appraise "rails4.1" do
+  gem "activerecord", "~> 4.1.0"
+end

data/gemfiles/rails3.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.0"
+
+gemspec :path => "../"

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,
-      :current_connection_name, :disconnect!, to: :switcher
+      :disconnect!, to: :switcher
 
     def configure(configs)
       @configs = configs

data/lib/octoshark/active_record_extensions.rb

@@ -16,22 +16,18 @@ module Octoshark
     end
   end
 
-  module ActiveRecordLogSubscriber
-    extend ActiveSupport::Concern
+  module ActiveRecordAbstractAdapter
+    attr_accessor :connection_name
 
-    included do
-      alias_method_chain :debug, :octoshark
-    end
+    def log(sql, name = "SQL", *other_args)
+      if connection_name
+        name = "[Octoshark: #{connection_name}] #{name}"
+      end
 
-    def debug_with_octoshark(msg)
-      prefix = if Octoshark.configured? && Octoshark.current_connection_name
-                 color("[Octoshark: #{Octoshark.current_connection_name}]",
-                       ActiveSupport::LogSubscriber::GREEN, true)
-               end
-      debug_without_octoshark("#{prefix}#{msg}")
+      super(sql, name, *other_args)
     end
   end
 end
 
 ActiveRecord::Base.send(:include, Octoshark::ActiveRecordBase)
-ActiveRecord::LogSubscriber.send(:include, Octoshark::ActiveRecordLogSubscriber)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, Octoshark::ActiveRecordAbstractAdapter)

data/lib/octoshark/connection_switcher.rb

@@ -15,15 +15,11 @@ module Octoshark
     end
 
     def current_connection
-      current_details[:connection] || raise(NoCurrentConnectionError, "No current connection, use Octoshark.with_connection")
+      Thread.current[OCTOSHARK] || raise(NoCurrentConnectionError, "No current connection, use Octoshark.with_connection")
     end
 
     def current_or_default_connection
-      current_details[:connection] || @default_pool.connection
-    end
-
-    def current_connection_name
-      current_details[:name]
+      Thread.current[OCTOSHARK] || @default_pool.connection
     end
 
     def with_connection(name, &block)
@@ -31,7 +27,9 @@ module Octoshark
 
       find_connection_pool(name).with_connection do |connection|
         previous_connection = Thread.current[OCTOSHARK]
-        Thread.current[OCTOSHARK] = { name: name, connection: connection }
+        Thread.current[OCTOSHARK] = connection
+
+        connection.connection_name = name
 
         begin
           result = yield(connection)
@@ -61,9 +59,5 @@ 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.5"
+  VERSION = "0.0.6"
 end

data/spec/octoshark/active_record_extensions_spec.rb

@@ -8,7 +8,7 @@ describe "ActiveRecord Extensions" do
     spec = ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection(spec)
 
-    expect(ActiveRecord::Base.connection_pool).to eq(Octoshark.find_connection_pool(:default))
+    expect(Octoshark.find_connection_pool(:default)).to eq(ActiveRecord::Base.connection_pool)
   end
 
   it "logs current connection name" do
@@ -26,4 +26,20 @@ describe "ActiveRecord Extensions" do
 
     ActiveRecord::Base.logger = nil
   end
+
+  it "logs the connection name for the Octoshark connection only" do
+    io = StringIO.new
+    logger = Logger.new(io)
+
+    ActiveRecord::Base.logger = logger
+
+    Octoshark.configure(configs)
+    Octoshark.with_connection(:db1) do |connection|
+      ActiveRecord::Base.connection.execute("SELECT 1")
+    end
+
+    expect(io.string).not_to include('[Octoshark: db1]')
+
+    ActiveRecord::Base.logger = nil
+  end
 end

data/spec/octoshark/connection_switcher_spec.rb

@@ -57,22 +57,6 @@ 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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,7 +109,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.2.gemfile
 - gemfiles/rails3.gemfile
+- gemfiles/rails4.1.gemfile
 - gemfiles/rails4.gemfile
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb