octoshark 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 250485b4a7d40ba746223723276e9edbee4fc8b0
-  data.tar.gz: 0c58c2fd4569f288fe87129c0566bba3d34790aa
+SHA256:
+  metadata.gz: 73492e9db9cf09a361e5be45ffd95b3557e2bfa70ddb102c60631d72ffa69ad2
+  data.tar.gz: f12275deb8e0e43ccc0f8b4b91975fa84808d2481ffb5e6698b55fd888d72bda
 SHA512:
-  metadata.gz: e904f55fa222ea36745a01fedbf936dd2bca0bbfe116b7eaa69ab0e56ae5fef5503fe800d2f5065d8d69d6ee2b7244ba5644e5ff5e5adc66d032f9f3d1fc9470
-  data.tar.gz: 139e493c0f689d4865f218247a8e0bfafee8f9605e7cb14b0ad0c3356422d0a32e731fd5127b52da7d6f05e291112c373af40959324b1fa2c9f5d26799ac4469
+  metadata.gz: 03751f458070db1b198c4c5cf9820d1269308758fc950fc42126d5f75c321e77b411a1959d2da0de69432b5c5d35cbdeb8ec7f78f378fcc1e39c7220179937b2
+  data.tar.gz: 5d2f7ff3902769fcd8b838215e40f0b9bc53dc8333c57fb88588b79732f11bd186a6f711f621d56ae00b955f8a4adf3ec52fc6698813569fdd14e87279a6b2ae

data/.github/workflows/build.yml

@@ -0,0 +1,130 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - master
+
+jobs:
+  legacy:
+    runs-on: ubuntu-18.04
+    services:
+      mysql:
+        image: mysql:5.5
+        env:
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - "3306:3306"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        include:
+          - gemfile: rails3.0
+            ruby: 2.4
+          - gemfile: rails3.1
+            ruby: 2.4
+          - gemfile: rails3.2
+            ruby: 2.4
+
+          - gemfile: rails4.0
+            ruby: 2.4
+          - gemfile: rails4.1
+            ruby: 2.4
+          - gemfile: rails4.2
+            ruby: 2.4
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+
+      - name: Set up database
+        run: |
+          cp spec/support/config.yml.github spec/support/config.yml
+          bundle exec rake db:create
+
+      - name: Run tests
+        run: |
+          bundle exec rspec spec
+
+
+  latest:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - "3306:3306"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        include:
+          - gemfile: rails5.0
+            ruby: 2.6
+          - gemfile: rails5.1
+            ruby: 2.6
+          - gemfile: rails5.2
+            ruby: 2.6
+          - gemfile: rails5.2
+            ruby: 3.0
+
+          - gemfile: rails6.0
+            ruby: 2.7
+          - gemfile: rails6.1
+            ruby: 2.7
+          - gemfile: rails6.1
+            ruby: 3.0
+
+          - gemfile: rails7.0
+            ruby: 2.7
+          - gemfile: rails7.0
+            ruby: 3.0
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+
+      - name: Set up database
+        run: |
+          cp spec/support/config.yml.github spec/support/config.yml
+          bundle exec rake db:create
+
+      - name: Run tests
+        run: |
+          bundle exec rspec spec

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+3.0.2

data/Appraisals

@@ -1,19 +1,29 @@
-appraise "rails3.1" do
-  gem "activerecord", "~> 3.1.0"
+appraise "rails5.1" do
+  gem "activerecord", "~> 5.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails3.2" do
-  gem "activerecord", "~> 3.2.0"
+appraise "rails5.2" do
+  gem "activerecord", "~> 5.2.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails4" do
-  gem "activerecord", "~> 4.0.0"
+appraise "rails6.0" do
+  gem "activerecord", "~> 6.0.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails4.1" do
-  gem "activerecord", "~> 4.1.0"
+appraise "rails6.1" do
+  gem "activerecord", "~> 6.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails4.2" do
-  gem "activerecord", "~> 4.2.0"
+appraise "rails7.0" do
+  gem "activerecord", "~> 7.0.0"
+  gem "mysql2", "~> 0.5"
+  gem "sqlite3", "~> 1.4"
 end

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change log
 
+## 0.4.0 2022-02-12
+
+- Add support for Rails 7.0
+- Fix `establish_connection` for Ruby 3
+
+## 0.3.0 2021-07-20
+
+- Add support for Rails 6.1
+
+## 0.2.2 2016-11-09
+
+- Fix `alias_method_chain` deprecation in Rails 5
+
+## 0.2.1 2016-09-09
+
+- Add support for Rails 5 and Rails 3
+
 ## 0.2.0 2016-08-29
 
 - `Octoshark::ConnectionManager` is split in two managers `Octoshark::ConnectionPoolsManager` for persistent connections and `Octoshark::ConnectionManager` for non-persistent connections.

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+gem "activerecord", "~> 7.0.0"
 
 # Specify your gem's dependencies in octoshark.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-![Octoshark logo](https://dl.dropboxusercontent.com/u/3230730/github/octoshark.png)
+![Octoshark logo](http://dalibornasevic.com/images/octoshark.png)
 
 ![Travis status](https://travis-ci.org/dalibor/octoshark.png)
 
@@ -163,7 +163,7 @@ When using `Octoshark::ConnectionPoolsManager`, whenever ActiveRecord::Base call
 
 ## Cleaning test databases
 
-When using persistent connections, you can use tools like [DatabaseCleaner](https://github.com/DatabaseCleaner/database_cleaner) or [DatabaseRewinder](https://github.com/amatsuda/database_rewinder) to clean test databases. Here's an example of RSpec config for `DatabaseCleaner`:
+For `Octoshark::ConnectionPoolsManager`, we can use [DatabaseCleaner](https://github.com/DatabaseCleaner/database_cleaner) and RSpec like:
 
 ```ruby
 config.before(:suite) do
@@ -177,7 +177,6 @@ config.before(:each) do
 end
 
 config.after(:each) do
-  setup_database_cleaner
   DatabaseCleaner.clean_with(:transaction)
 end
 
@@ -191,49 +190,93 @@ def setup_database_cleaner
 end
 ```
 
-When using non-persistent connections where transaction rollback as a cleaning strategy will not work, we can use a custom solution inspired by `DatabaseRewinder`. It also works with dynamic databases created on the fly in the test suite.
+For `Octoshark::ConnectionManager` where connections and databases are dynamically created and cannot be configured in the test setup, we can write a custom database cleaner inspired by [DatabaseRewinder](https://github.com/amatsuda/database_rewinder). The example below is for a multi-tenant test setup with a main (core) database and a tenant database for the `CURRENT_USER` in the test suite. `CustomDatabaseCleaner.clean_all` cleans all core database tables before test suite and `CustomDatabaseCleaner.clean` cleans used tables in both core and tenant databases after each test.
+
 
 ```ruby
-module DatabaseCleaner
-  module InsertRecorder
-    def execute(sql, *)
-      DatabaseCleaner.record_inserted_table(self, sql)
-      super
+module CustomDatabaseCleaner
+  INSERT_REGEX = /\AINSERT(?:\s+IGNORE)?\s+INTO\s+(?:\.*[`"]?(?<table>[^.\s`"]+)[`"]?)*/i
+
+  @@tables_with_inserts = []
+
+  class << self
+    def record_inserted_table(connection, sql)
+      match = sql.match(INSERT_REGEX)
+
+      if match && match[:table] && tables_with_inserts.exclude?(match[:table])
+        tables_with_inserts << match[:table]
+      end
     end
 
-    def exec_query(sql, *)
-      DatabaseCleaner.record_inserted_table(self, sql)
-      super
+    def clean_all
+      with_core_db_connection do |connection|
+        clean_tables(connection)
+      end
+
+      reset_tables_with_inserts
     end
-  end
 
-  @@tables = []
+    def clean
+      with_core_db_connection do |connection|
+        clean_tables(connection, { 'users' => [CURRENT_USER.id] })
+      end
 
-  def self.tables
-    @@tables
-  end
+      CURRENT_USER.with_tenant do |connection|
+        clean_tables(connection)
+      end
 
-  def self.record_inserted_table(connection, sql)
-    match = sql.match(/\AINSERT(?:\s+IGNORE)?\s+INTO\s+(?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
-    tables << match[1] if match && !tables.include?(match[1])
-  end
+      reset_tables_with_inserts
+    end
 
-  def self.clean
-    CoreDB.with_connection do |connection|
-      (
-        connection.tables.reject { |t| t == ActiveRecord::Migrator.schema_migrations_table_name } & tables
-      ).each do |table|
+    private
+    def with_core_db_connection(&block)
+      CoreDBManager.with_connection(ActiveRecord::Base.configurations[Rails.env].symbolize_keys, &block)
+    end
+
+    def clean_tables(connection, keep_data = {})
+      tables_to_clean = connection.tables.reject { |t| t == ActiveRecord::Migrator.schema_migrations_table_name }
+      tables_to_clean = tables_to_clean & tables_with_inserts if tables_with_inserts.present?
+
+      tables_to_clean.each do |table|
         connection.disable_referential_integrity do
-          connection.execute "DELETE FROM #{connection.quote_table_name(table)};"
+          table_name = connection.quote_table_name(table)
+          keep_ids   = keep_data[table]
+
+          if keep_ids
+            connection.execute("DELETE FROM #{table_name} WHERE id NOT IN (#{keep_ids.join(',')});")
+          else
+            connection.execute("DELETE FROM #{table_name};")
+          end
         end
       end
     end
-    @@tables = []
+
+    def reset_tables_with_inserts
+      @@tables_with_inserts = []
+    end
+
+    def tables_with_inserts
+      @@tables_with_inserts
+    end
+  end
+end
+
+module CustomDatabaseCleaner
+  module InsertRecorder
+    def execute(sql, *)
+      CustomDatabaseCleaner.record_inserted_table(self, sql)
+      super
+    end
+
+    def exec_query(sql, *)
+      CustomDatabaseCleaner.record_inserted_table(self, sql)
+      super
+    end
   end
 end
 
 require 'active_record/connection_adapters/abstract_mysql_adapter'
-ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send(:prepend, DatabaseCleaner::InsertRecorder)
+ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send(:prepend, CustomDatabaseCleaner::InsertRecorder)
 ```
 
 

data/Rakefile

@@ -10,16 +10,16 @@ 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] }
+    configs    = YAML.load_file('spec/support/config.yml')
+    config     = configs['db1'].reject { |k, v| k == '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)
+        ActiveRecord::Base.connection.create_database(database, charset: 'utf8')
         puts "#{database} created."
       rescue ActiveRecord::StatementInvalid => e
         if e.message.match /database exists/

data/gemfiles/rails3.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.0.0"
+gem "mysql2", "< 0.3"
+gem "sqlite3", "~> 1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails3.1.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.1.0"
+gem "mysql2", "~> 0.3.10"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails3.2.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
+gem "mysql2", "~> 0.3.10"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails4.gemfile → rails4.0.gemfile}

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
+gem "mysql2", "~> 0.3.10"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4.1.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
+gem "mysql2", "~> 0.3.13"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4.2.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
+gem "mysql2", "~> 0.3.13"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails5.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.4.1"
+
+gemspec path: "../"

data/gemfiles/rails5.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.4.1"
+
+gemspec path: "../"

data/gemfiles/rails6.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.4.1"
+
+gemspec path: "../"

data/gemfiles/rails6.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.4.1"
+
+gemspec path: "../"

data/gemfiles/rails7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "mysql2", "~> 0.5"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/lib/octoshark/active_record_extensions.rb

@@ -1,43 +1,45 @@
 module Octoshark
-  module ActiveRecordBase
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        alias_method_chain :establish_connection, :octoshark
+  module ConnectionHandler
+    # def establish_connection(owner, spec)                        # Rails 3.x
+    # def establish_connection(config_or_env = nil)                # Rails 4.x - 6.1
+    # def establish_connection(config, owner_name:, role:, shard:) # Rails 6.2+
+    def establish_connection(*args, **kwargs)
+      Octoshark::ConnectionPoolsManager.reset_connection_managers!
+
+      if kwargs.empty?
+        # For backward compatibility with older versions of Rails on Ruby 3
+        # that separates positional (args) and keyword arguments (kwargs).
+        super(*args)
+      else
+        super(*args, **kwargs)
       end
     end
+  end
 
-    module ClassMethods
-      # When a connection is established in an ancestor process that must have
-      # subsequently forked, ActiveRecord establishes a new connection because
-      # it can't reuse the existing one. When that happens, we need to reconnect
-      # Octoshark connection managers.
-      def establish_connection_with_octoshark(*args)
-        establish_connection_without_octoshark(*args)
-        Octoshark::ConnectionPoolsManager.reset_connection_managers!
-      end
+  module ConnectionHandlerRails3
+    def establish_connection(*args)
+      Octoshark::ConnectionPoolsManager.reset_connection_managers!
+      super(*args)
     end
   end
 
   module ActiveRecordAbstractAdapter
-    extend ActiveSupport::Concern
-
     attr_accessor :connection_name, :database_name
 
-    included do
-      alias_method_chain :log, :octoshark
-    end
-
-    def log_with_octoshark(sql, name = "SQL", *other_args, &block)
+    def log(sql, name = "SQL", *other_args, &block)
       if connection_name || database_name
         name = "[Octoshark: #{[connection_name, database_name].compact.join(' ')}] #{name}"
       end
 
-      log_without_octoshark(sql, name, *other_args, &block)
+      super(sql, name, *other_args, &block)
     end
   end
 end
 
-ActiveRecord::Base.send(:include, Octoshark::ActiveRecordBase)
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Octoshark::ActiveRecordAbstractAdapter)
+# Rails 3.0 and 3.1 does not lazy load
+unless defined?(ActiveRecord::ConnectionAdapters::ConnectionHandler)
+  require 'active_record/connection_adapters/abstract_adapter'
+end
+
+ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, Octoshark::ConnectionHandler)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, Octoshark::ActiveRecordAbstractAdapter)

data/lib/octoshark/connection_pools_manager.rb

@@ -11,7 +11,7 @@ module Octoshark
     end
 
     def self.reset_connection_managers!
-      connection_managers.map(&:reset!)
+      connection_managers.each(&:reset!)
     end
 
     def self.disconnect!
@@ -61,25 +61,68 @@ module Octoshark
     end
 
     private
-    def spec_class
-      if defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
-        spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
-      else
-        spec_class = ActiveRecord::Base::ConnectionSpecification
-      end
-    end
 
     def setup_connection_pools
       @connection_pools = HashWithIndifferentAccess.new
 
       @configs.each_pair do |name, config|
-        @connection_pools[name] = create_connection_pool(config)
+        @connection_pools[name] = create_connection_pool(name, config)
       end
     end
 
-    def create_connection_pool(config)
-      spec = spec_class.new(config, "#{config[:adapter]}_connection")
+    def create_connection_pool(name, config)
+      spec = build_connection_pool_spec(name, config)
+
       ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
     end
+
+    private
+
+    def build_connection_pool_spec(name, config)
+      if active_record_6_1_or_7?
+        env_name = defined?(Rails) ? Rails.env : nil
+        db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, name, config)
+
+        pool_config_class = ActiveRecord::ConnectionAdapters::PoolConfig
+
+        if pool_config_class.instance_method(:initialize).arity == 2
+          # ActiveRecord 6.1
+          pool_config_class.new(owner_name = ActiveRecord::Base, db_config)
+        else
+          # ActiveRecord 7.0
+          pool_config_class.new(
+            owner_name = ActiveRecord::Base,
+            db_config,
+            role = ActiveRecord::Base.current_role,
+            shard = ActiveRecord::Base.current_shard
+          )
+        end
+      else
+        adapter_method = "#{config[:adapter]}_connection"
+
+        if active_record_4_or_5_or_6?
+          spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
+
+          if spec_class.instance_method(:initialize).arity == 3
+            # ActiveRecord 5.x and 6.0
+            spec_class.new(name, config, adapter_method)
+          else
+            # ActiveRecord 4.x
+            spec_class.new(config, adapter_method)
+          end
+        else
+          # ActiveRecord 3.x
+          ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+        end
+      end
+    end
+
+    def active_record_6_1_or_7?
+      defined?(ActiveRecord::ConnectionAdapters::PoolConfig)
+    end
+
+    def active_record_4_or_5_or_6?
+      defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
+    end
   end
 end

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/octoshark.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activerecord", ">= 3.0"
 
-  spec.add_development_dependency "bundler",  "~> 1.5"
   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 "rspec",    "~> 3.7.0"
+  spec.add_development_dependency "sqlite3",  "~> 1.4.1"
+  spec.add_development_dependency "mysql2",   "~> 0.5.2"
   spec.add_development_dependency "appraisal"
 end

data/spec/octoshark/connection_manager_spec.rb

@@ -42,7 +42,7 @@ describe Octoshark::ConnectionManager do
         connection.execute("SELECT 1")
       end
 
-      expect(result).to eq([{"1"=>1, 0=>1}])
+      expect(result.first['1']).to eq(1)
     end
   end
 end

data/spec/octoshark/connection_pools_manager_spec.rb

@@ -67,7 +67,7 @@ describe Octoshark::ConnectionPoolsManager do
     it "returns value from execution" do
       manager = Octoshark::ConnectionPoolsManager.new(configs)
       result = manager.with_connection(:db1) { |connection| connection.execute("SELECT 1") }
-      expect(result).to eq([{"1"=>1, 0=>1}])
+      expect(result.first['1']).to eq(1)
     end
 
     it "raises Octoshark::Error::NoConnection" do

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.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2022-02-12 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,21 +101,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.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
+- gemfiles/rails7.0.gemfile
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb
 - lib/octoshark/connection_manager.rb
@@ -143,8 +136,8 @@ files:
 - 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:
@@ -165,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher
@@ -176,6 +168,6 @@ test_files:
 - 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