octoshark 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a5b422e9a70b5d3ea461f8f1d60d00fdf95fcc2
-  data.tar.gz: 67b85692596f3c3414239b4820a0415e40c09af4
+SHA256:
+  metadata.gz: 743be64d2aeb897827aec871dfd86150ea1ca7ce6505839cea1caf16e85676bc
+  data.tar.gz: a801773571a7388fed3d16179be6006d10a6e060fb514813a2e21ba3532816ee
 SHA512:
-  metadata.gz: 41d351c20e433d40caa1f3e1888360911a8440a03aeded1092d618b78b91febbf6f3a8cdffc8e537ee6cf482d017500a495019191902a6f77904c165c236e099
-  data.tar.gz: a1f0f8e84cd69a8445e5ce0e6c9abcb53ac1a9b144d7141f8e36ea3596a2ec15c639a6515da9df8554f3e37066aa3368bae76794d2b990ed88ca542b197a96ed
+  metadata.gz: 2fa8e793d0eae00f5d99420e1f3b5bc6218b9b5a5b8c27b0c63dbbde080265d5797cc4d56cbce049cd25459e0f8961228f0acb5d677f35f1de45a42fbd82f610
+  data.tar.gz: 16f82b5d43d619ff5d8691229a8377189c10ef3b9d20752649d2e63725bff171afe9f232d2300916b573bff7260ff63d92be08bae567934ff7751285d6240728

data/.github/workflows/ci-legacy.yml

@@ -0,0 +1,66 @@
+name: Build Legacy
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-16.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.2
+          - gemfile: rails3.1
+            ruby: 2.2
+          - gemfile: rails3.2
+            ruby: 2.2
+
+          - 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

data/.github/workflows/ci.yml

@@ -0,0 +1,64 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    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: rails6.0
+            ruby: 2.7
+          - gemfile: rails6.1
+            ruby: 2.7
+
+    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.2.2
+2.7.4

data/Appraisals

@@ -1,28 +1,29 @@
-appraise "rails3.0" do
-  gem "activerecord", "~> 3.0.0"
-  gem "mysql2", '< 0.3'
-end
-
-appraise "rails3.1" do
-  gem "activerecord", "~> 3.1.0"
-end
-
-appraise "rails3.2" do
-  gem "activerecord", "~> 3.2.0"
+appraise "rails5.0" do
+  gem "activerecord", "~> 5.0.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.3.13"
 end
 
-appraise "rails4.0" do
-  gem "activerecord", "~> 4.0.0"
+appraise "rails5.1" do
+  gem "activerecord", "~> 5.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails4.1" do
-  gem "activerecord", "~> 4.1.0"
+appraise "rails5.2" do
+  gem "activerecord", "~> 5.2.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails4.2" do
-  gem "activerecord", "~> 4.2.0"
+appraise "rails6.0" do
+  gem "activerecord", "~> 6.0.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end
 
-appraise "rails5.0" do
-  gem "activerecord", "~> 5.0.0"
+appraise "rails6.1" do
+  gem "activerecord", "~> 6.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3",  "~> 1.4.1"
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 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

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+gem "activerecord", "~> 6.1.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)
 

data/Rakefile

@@ -19,7 +19,7 @@ namespace :db do
   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

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.0.0"
 gem "mysql2", "< 0.3"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+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.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

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.3.13"
 
-gemspec :path => "../"
+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/lib/octoshark/connection_pools_manager.rb

@@ -61,14 +61,6 @@ module Octoshark
     end
 
     private
-    def spec_class
-      if defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
-        spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
-      else
-        # Rails 3.0, 3.1 and 3.2
-        spec_class = ActiveRecord::Base::ConnectionSpecification
-      end
-    end
 
     def setup_connection_pools
       @connection_pools = HashWithIndifferentAccess.new
@@ -79,13 +71,24 @@ module Octoshark
     end
 
     def create_connection_pool(name, config)
-      adapter_method = "#{config[:adapter]}_connection"
       spec =
-        if spec_class.instance_method(:initialize).arity == 3
-          # Rails 5 ConnectionSpecification accepts spec name
-          spec_class.new(name, config, adapter_method)
+        if defined?(ActiveRecord::ConnectionAdapters::PoolConfig)
+          env_name = defined?(Rails) ? Rails.env : nil
+          db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, name, config)
+          ActiveRecord::ConnectionAdapters::PoolConfig.new(owner_name = ActiveRecord::Base, db_config)
         else
-          spec_class.new(config, adapter_method)
+          adapter_method = "#{config[:adapter]}_connection"
+          if defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
+            spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
+
+            if spec_class.instance_method(:initialize).arity == 3
+              spec_class.new(name, config, adapter_method)
+            else
+              spec_class.new(config, adapter_method)
+            end
+          else
+            ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+          end
         end
 
       ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.2.2"
+  VERSION = "0.3.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.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dalibor Nasevic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-09 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,10 +101,11 @@ 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
@@ -132,6 +119,10 @@ files:
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.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
@@ -145,14 +136,14 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher
 test_files:
@@ -178,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,20 +0,0 @@
-rvm:
-  - 2.2.2
-cache:
-  - bundler
-notifications:
-  email:
-    - dalibor.nasevic@gmail.com
-gemfile:
-  - 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/rails5.0.gemfile
-before_script:
-  - cp spec/support/config.yml.travis spec/support/config.yml
-  - bundle exec rake db:create
-script:
-  - bundle exec rspec spec