octoshark 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 055693668b801861b20b03a2b5d59cbe98a01184
-  data.tar.gz: 0b23a9ce02c5c88ec3c3abfae20ab9433e934221
+  metadata.gz: d10a2b8a447790535e9be0663c9d1acc6957d910
+  data.tar.gz: c39b418126b47da9297c24d6d13587262a7d5f49
 SHA512:
-  metadata.gz: d2301c93076eb07afa01dead10f23c17524a5772089df8ecf5ddffca1902ff2fe3ad4022ca38db4b70a8fe6c7f8387335b6e2e2750c11cfb830a07fc14c5b9ce
-  data.tar.gz: 64f37f5fde130bc56398cbfc40e397f16cbd8c8a294db6638c44f0bcec799c9a7f9459ab34dbdff5d49a32f699a96e7bf13d3ae250cefd7a05dd333c2e066987
+  metadata.gz: 78c66eeb430047ecc67499f8d3ad9d44a9eec1e2f7c88c889427c309286d99c1860c1a6c9d3a6815a95323db3993c485991370cd3e786cd3b1f9f3c8acd3095c
+  data.tar.gz: 91016b143ce9fa9179ac1376905df68d32dc4980989e31d2bed926641457d4f34d752ef5d6e267ded3d15f034e9e1697625b5522232e21fa45287e3a3995dd5e

data/.gitignore

@@ -12,6 +12,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/support/config.yml
 test/tmp
 test/version_tmp
 tmp

data/.travis.yml

@@ -6,10 +6,13 @@ notifications:
   email:
     - dalibor.nasevic@gmail.com
 gemfile:
-  - gemfiles/rails3.gemfile
   - gemfiles/rails3.1.gemfile
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.gemfile
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
-script: bundle exec rspec spec
+before_script:
+  - cp spec/support/config.yml.travis spec/support/config.yml
+  - bundle exec rake db:create
+script:
+  - bundle exec rspec spec

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails3" do
-  gem "activerecord", "~> 3.0.0"
-end
-
 appraise "rails3.1" do
   gem "activerecord", "~> 3.1.0"
 end

data/README.md

@@ -140,6 +140,13 @@ end
 
 `CONN_MANAGER.with_new_connection` method creates a temporary connection that will automatically disconnect. If you want to reuse it in subsequent connection switches, set `reusable: true` and it will be added to the connection manager and reused with the next calls. Depends on the use-case and what's preferable. In test environment usually you would want to set it to `reusable` so that database cleaner can clean data with transaction strategy.
 
+Alternatively, for better performance (only supported on MySQL), database connection can be switched with `use database` statement. Once connection manager is defined with connectino configs to database servers, selecting a database can be done with:
+
+```ruby
+CONN_MANAGER.use_database(:db1, 'database') do
+  # run queries on database server identified by 'db1' using database 'database'
+end
+```
 
 ## Octoshark.reset_connection_managers!
 

data/Rakefile

@@ -1,6 +1,39 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'yaml'
+require 'mysql2'
+require 'octoshark'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :db do
+  task :establish_connection do
+    configs    = YAML.load_file('spec/support/config.yml').with_indifferent_access
+    config     = configs[:db1].except(:database)
+    @databases = configs.map { |_, config| config[:database] }
+    ActiveRecord::Base.establish_connection(config)
+  end
+
+  task :create => :establish_connection do
+    @databases.each do |database|
+      begin
+        ActiveRecord::Base.connection.create_database(database)
+        puts "#{database} created."
+      rescue ActiveRecord::StatementInvalid => e
+        if e.message.match /database exists/
+          puts "#{database} exists."
+        else
+          raise e
+        end
+      end
+    end
+  end
+
+  task :drop => :establish_connection do
+    @databases.each do |database|
+      ActiveRecord::Base.connection.drop_database(database)
+    end
+  end
+end

data/lib/octoshark/active_record_extensions.rb

@@ -23,7 +23,7 @@ module Octoshark
   module ActiveRecordAbstractAdapter
     extend ActiveSupport::Concern
 
-    attr_accessor :connection_name
+    attr_accessor :connection_name, :database_name
 
     included do
       alias_method_chain :log, :octoshark
@@ -31,7 +31,11 @@ module Octoshark
 
     def log_with_octoshark(sql, name = "SQL", *other_args, &block)
       if connection_name
-        name = "[Octoshark: #{connection_name}] #{name}"
+        if database_name
+          name = "[Octoshark: #{connection_name} #{database_name}] #{name}"
+        else
+          name = "[Octoshark: #{connection_name}] #{name}"
+        end
       end
 
       log_without_octoshark(sql, name, *other_args, &block)

data/lib/octoshark/connection_manager.rb

@@ -44,6 +44,11 @@ module Octoshark
       end
     end
 
+    def use_database(name, database_name, &block)
+      connection_pool = find_connection_pool(name)
+      with_connection_pool(name, connection_pool, database_name, &block)
+    end
+
     def without_connection(&block)
       change_connection_reference(nil) do
         yield
@@ -97,9 +102,13 @@ module Octoshark
       ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
     end
 
-    def with_connection_pool(name, connection_pool, &block)
+    def with_connection_pool(name, connection_pool, database_name = nil, &block)
       connection_pool.with_connection do |connection|
         connection.connection_name = name
+        if database_name
+          connection.database_name = database_name
+          connection.execute("use #{database_name}")
+        end
 
         change_connection_reference(connection) do
           yield(connection)

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/octoshark.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec",    "~> 3.0.0"
   spec.add_development_dependency "sqlite3",  "~> 1.3.0"
+  spec.add_development_dependency "mysql2",   "~> 0.3.14"
   spec.add_development_dependency "appraisal"
 end

data/spec/octoshark/active_record_extensions_spec.rb

@@ -18,6 +18,23 @@ describe "ActiveRecord Extensions" do
     ActiveRecord::Base.logger = nil
   end
 
+  it "logs current database name", mysql2: true do
+    io = StringIO.new
+    logger = Logger.new(io)
+    database_name = mysql2_configs[:db1][:database]
+
+    ActiveRecord::Base.logger = logger
+
+    manager = Octoshark::ConnectionManager.new(mysql2_configs)
+    manager.use_database(:db1, database_name) do |connection|
+      connection.execute("SELECT 1")
+    end
+
+    expect(io.string).to include("[Octoshark: db1 #{database_name}]")
+
+    ActiveRecord::Base.logger = nil
+  end
+
   it "logs the connection name for the Octoshark connection only" do
     io = StringIO.new
     logger = Logger.new(io)

data/spec/octoshark/connection_manager_spec.rb

@@ -164,6 +164,32 @@ describe Octoshark::ConnectionManager do
     end
   end
 
+  describe "#use_database" do
+    it "can nest connection", mysql2: true do
+      manager = Octoshark::ConnectionManager.new(mysql2_configs)
+
+      db1 = mysql2_configs[:db1]['database']
+      db2 = mysql2_configs[:db2]['database']
+
+      manager.use_database(:db1, db1) do
+        expect(db(manager.current_connection)).to eq(db1)
+
+        manager.use_database(:db2, db2) do
+          expect(db(manager.current_connection)).to eq(db2)
+        end
+
+        expect(db(manager.current_connection)).to eq(db1)
+      end
+    end
+
+    it "returns value from execution", mysql2: true do
+      manager = Octoshark::ConnectionManager.new(mysql2_configs)
+      db1 = mysql2_configs[:db1]['database']
+      result = manager.use_database(:db1, db1) { |connection| connection.execute("SELECT 1") }.to_a
+      expect(result).to eq([[1]])
+    end
+  end
+
   describe '#without_connection' do
     it "can reset current connection temporarily inside nested connection block" do
       manager = Octoshark::ConnectionManager.new(configs)

data/spec/spec_helper.rb

@@ -19,6 +19,11 @@ RSpec.configure do |config|
     ActiveRecord::Base.establish_connection({adapter: 'sqlite3', database: 'tmp/default.sqlite'})
   end
 
+  config.before :each, :mysql2 do
+    config = mysql2_configs[:db1].except(:database)
+    ActiveRecord::Base.establish_connection(config)
+  end
+
   config.after :suite do
     FileUtils.rm_rf(TMP)
   end

data/spec/support/config.yml.template

@@ -0,0 +1,21 @@
+db1:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: octoshark_db1
+  pool: 5
+  username: root
+  password: pass
+  host: localhost
+  port: 3306
+
+db2:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: octoshark_db2
+  pool: 5
+  username: root
+  password: pass
+  host: localhost
+  port: 3306

data/spec/support/config.yml.travis

@@ -0,0 +1,21 @@
+db1:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: octoshark_db1
+  pool: 5
+  username: travis
+  password:
+  host: localhost
+  port: 3306
+
+db2:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: octoshark_db2
+  pool: 5
+  username: travis
+  password:
+  host: localhost
+  port: 3306

data/spec/support/helpers.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Helpers
 
   def configs
@@ -7,10 +9,16 @@ module Helpers
     }
   end
 
+  def mysql2_configs
+    YAML.load_file('spec/support/config.yml').with_indifferent_access
+  end
+
   def db(connection)
-    connection.execute('PRAGMA database_list').
-      first['file'].
-      split('/').last.
-      split('.').first
+    case connection
+    when ActiveRecord::ConnectionAdapters::SQLite3Adapter
+      connection.execute('PRAGMA database_list').first['file'].split('/').last.split('.').first
+    when ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      connection.instance_variable_get(:@config)[:database]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.14
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +126,6 @@ files:
 - Rakefile
 - gemfiles/rails3.1.gemfile
 - gemfiles/rails3.2.gemfile
-- gemfiles/rails3.gemfile
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
 - gemfiles/rails4.gemfile
@@ -126,6 +139,8 @@ files:
 - spec/octoshark/connection_manager_spec.rb
 - spec/octoshark_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.yml.template
+- spec/support/config.yml.travis
 - spec/support/helpers.rb
 homepage: https://github.com/dalibor/octoshark
 licenses:
@@ -156,5 +171,7 @@ test_files:
 - spec/octoshark/connection_manager_spec.rb
 - spec/octoshark_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.yml.template
+- spec/support/config.yml.travis
 - spec/support/helpers.rb
 has_rdoc: 

data/gemfiles/rails3.gemfile

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