octoshark 0.1.2 → 0.3.0

data/spec/octoshark/current_connection_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe "connection manager" do
+  let(:config) { configs[:db1] }
+
+  describe "#identifier" do
+    it "has unique identifiers" do
+      manager1 = Octoshark::ConnectionManager.new
+      manager2 = Octoshark::ConnectionManager.new
+      expect(manager1.identifier).to_not eq(manager2.identifier)
+    end
+  end
+
+  describe "#current_connection" do
+    it "returns last used connection as current one" do
+      manager = Octoshark::ConnectionManager.new
+      manager.with_connection(config) do |connection|
+        expect(manager.current_connection).to eq(connection)
+      end
+    end
+
+    it "raises error when no current connection" do
+      manager = Octoshark::ConnectionManager.new
+
+      expect { manager.current_connection }.to raise_error(Octoshark::Error::NoCurrentConnection)
+    end
+  end
+
+  describe "#current_connection?" do
+    it "returns true if current one" do
+      manager = Octoshark::ConnectionManager.new
+      manager.with_connection(config) do
+        expect(manager.current_connection?).to be_truthy
+      end
+    end
+
+    it "returns false if no current one" do
+      manager = Octoshark::ConnectionManager.new
+
+      expect(manager.current_connection?).to be_falsey
+    end
+  end
+
+  describe "#current_or_default_connection" do
+    it "returns current connection" do
+      manager = Octoshark::ConnectionManager.new
+      manager.with_connection(config) do |connection|
+        expect(manager.current_or_default_connection).to eq(connection)
+      end
+    end
+
+    it "returns default connection when no current connection" do
+      manager = Octoshark::ConnectionManager.new
+
+      expect(manager.current_or_default_connection).to eq(ActiveRecord::Base.connection_pool.connection)
+    end
+  end
+
+  describe '#without_connection' do
+    it "can reset current connection temporarily inside nested connection block" do
+      manager = Octoshark::ConnectionManager.new
+
+      manager.with_connection(config) do
+        expect(db(manager.current_connection)).to eq("db1")
+
+        manager.without_connection do
+          expect { manager.current_connection }.to raise_error(Octoshark::Error::NoCurrentConnection)
+        end
+
+        expect(db(manager.current_connection)).to eq("db1")
+      end
+    end
+  end
+end

data/spec/support/{config.yml.travis → config.yml.github}

@@ -4,9 +4,9 @@ db1:
   reconnect: false
   database: octoshark_db1
   pool: 5
-  username: travis
-  password:
-  host: localhost
+  username: root
+  password: pass
+  host: 127.0.0.1
   port: 3306
 
 db2:
@@ -15,7 +15,7 @@ db2:
   reconnect: false
   database: octoshark_db2
   pool: 5
-  username: travis
-  password:
-  host: localhost
+  username: root
+  password: pass
+  host: 127.0.0.1
   port: 3306

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dalibor Nasevic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -115,38 +101,49 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci-legacy.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails3.0.gemfile
 - gemfiles/rails3.1.gemfile
 - gemfiles/rails3.2.gemfile
+- gemfiles/rails4.0.gemfile
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
-- gemfiles/rails4.gemfile
+- gemfiles/rails5.0.gemfile
+- gemfiles/rails5.1.gemfile
+- gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb
 - lib/octoshark/connection_manager.rb
+- lib/octoshark/connection_pools_manager.rb
+- lib/octoshark/current_connection.rb
 - lib/octoshark/error.rb
 - lib/octoshark/version.rb
 - octoshark.gemspec
 - spec/octoshark/active_record_extensions_spec.rb
 - spec/octoshark/connection_manager_spec.rb
-- spec/octoshark_spec.rb
+- spec/octoshark/connection_pools_manager_spec.rb
+- spec/octoshark/current_connection_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.yml.github
 - spec/support/config.yml.template
-- spec/support/config.yml.travis
 - spec/support/helpers.rb
 homepage: https://github.com/dalibor/octoshark
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,16 +158,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher
 test_files:
 - spec/octoshark/active_record_extensions_spec.rb
 - spec/octoshark/connection_manager_spec.rb
-- spec/octoshark_spec.rb
+- spec/octoshark/connection_pools_manager_spec.rb
+- spec/octoshark/current_connection_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.yml.github
 - spec/support/config.yml.template
-- spec/support/config.yml.travis
 - spec/support/helpers.rb

data/.travis.yml

@@ -1,18 +0,0 @@
-rvm:
-  - 2.1.0
-cache:
-  - bundler
-notifications:
-  email:
-    - dalibor.nasevic@gmail.com
-gemfile:
-  - gemfiles/rails3.1.gemfile
-  - gemfiles/rails3.2.gemfile
-  - gemfiles/rails4.gemfile
-  - gemfiles/rails4.1.gemfile
-  - gemfiles/rails4.2.gemfile
-before_script:
-  - cp spec/support/config.yml.travis spec/support/config.yml
-  - bundle exec rake db:create
-script:
-  - bundle exec rspec spec

data/spec/octoshark_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe Octoshark do
-
-  describe ".reset_connection_managers!" do
-    it "resets connection managers" do
-      manager = Octoshark::ConnectionManager.new(configs)
-      old_pools = manager.connection_pools.map(&:object_id)
-
-      Octoshark.reset_connection_managers!
-
-      new_pools = manager.connection_pools.map(&:object_id)
-      expect(new_pools).to_not eq(old_pools)
-    end
-  end
-
-  describe ".disconnect!" do
-    it "disconnects connection managers" do
-      manager = Octoshark::ConnectionManager.new(configs)
-
-      Octoshark.disconnect!
-
-      expect(Octoshark.connection_managers).to be_blank
-    end
-
-    it "cleans old connections" do
-      manager = Octoshark::ConnectionManager.new(configs)
-
-      manager.with_connection(:db1) { |connection| connection.execute("SELECT 1") }
-      manager.with_connection(:db2) { |connection| connection.execute("SELECT 1") }
-      expect(manager.connection_pools[:db1].connections.count).to eq(1)
-      expect(manager.connection_pools[:db2].connections.count).to eq(1)
-
-      Octoshark.disconnect!
-
-      expect(manager.connection_pools[:db1].connections.count).to eq(0)
-      expect(manager.connection_pools[:db2].connections.count).to eq(0)
-    end
-  end
-end