octoshark 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250485b4a7d40ba746223723276e9edbee4fc8b0
-  data.tar.gz: 0c58c2fd4569f288fe87129c0566bba3d34790aa
+  metadata.gz: 2f85ce710bd85c0dbfebb2c5eef56c15df187261
+  data.tar.gz: 65a8ee327c29c51b51c062e8adecbff951d382b5
 SHA512:
-  metadata.gz: e904f55fa222ea36745a01fedbf936dd2bca0bbfe116b7eaa69ab0e56ae5fef5503fe800d2f5065d8d69d6ee2b7244ba5644e5ff5e5adc66d032f9f3d1fc9470
-  data.tar.gz: 139e493c0f689d4865f218247a8e0bfafee8f9605e7cb14b0ad0c3356422d0a32e731fd5127b52da7d6f05e291112c373af40959324b1fa2c9f5d26799ac4469
+  metadata.gz: 00f549a2766e0d417746d7cb3b90c7e83d104891d5611795493d5388e50d6d0816de5f92b9abddb40e208ddf5dd539fea44a57bd293d82707275f641d08b93d7
+  data.tar.gz: d629c9207dd790baf07fe66e57a0f489b1bf364ce4257fa5385f28a8fd7debfdbd805bd69bf7c32eb29d64ffa859dd16e482fe4a3cccfd598e50df233fdf182f

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.2

data/.travis.yml

@@ -1,16 +1,18 @@
 rvm:
-  - 2.1.0
+  - 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.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

data/Appraisals

@@ -1,3 +1,8 @@
+appraise "rails3.0" do
+  gem "activerecord", "~> 3.0.0"
+  gem "mysql2", '< 0.3'
+end
+
 appraise "rails3.1" do
   gem "activerecord", "~> 3.1.0"
 end
@@ -6,7 +11,7 @@ appraise "rails3.2" do
   gem "activerecord", "~> 3.2.0"
 end
 
-appraise "rails4" do
+appraise "rails4.0" do
   gem "activerecord", "~> 4.0.0"
 end
 
@@ -17,3 +22,7 @@ end
 appraise "rails4.2" do
   gem "activerecord", "~> 4.2.0"
 end
+
+appraise "rails5.0" do
+  gem "activerecord", "~> 5.0.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 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/gemfiles/rails3.0.gemfile

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

data/gemfiles/rails5.0.gemfile

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

data/lib/octoshark/connection_pools_manager.rb

@@ -65,6 +65,7 @@ module Octoshark
       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
@@ -73,12 +74,20 @@ module Octoshark
       @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)
+      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)
+        else
+          spec_class.new(config, adapter_method)
+        end
+
       ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
     end
   end

data/lib/octoshark/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -125,11 +125,13 @@ files:
 - 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
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb
 - lib/octoshark/connection_manager.rb
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher
@@ -179,3 +181,4 @@ test_files:
 - spec/support/config.yml.template
 - spec/support/config.yml.travis
 - spec/support/helpers.rb
+has_rdoc: