active_record_shards 3.7.3 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991ef99036b5e7be505d7112ba36955786e7db0f
-  data.tar.gz: 317d2333d2ad5e9bb4b48ea9df88badebb52a537
+  metadata.gz: 7ddf4f7e3054f0ae5d1d0a1fb9d50c43ff98411f
+  data.tar.gz: 22b7e496f726e396b8bece299b1b6e36d3e32e91
 SHA512:
-  metadata.gz: baf2255b7fc6aab8565693504b34973a461ae56f2c161bcb812b068daea8afdbf7e72914bbcb29456e78da31cee142e786e272cf9e4c5f9da1afa1775c44f0aa
-  data.tar.gz: dfb56f0a511b9e96829eb84f279e354311c07997bf9c84eba18d4886220b749d7278a92028b112d7ef21b96e855b532caa14a2f572761395a95b12dc43d2b600
+  metadata.gz: a3b9ec6899a75d390321297b48f9ce18e8198bcfb3919556b4935f9e803bf229551bda1bc98b69f5eb7d5cb5a050f5aeee773f3a5dbd7eefb14c2f3514feee4f
+  data.tar.gz: d63f9cd510b2c164a7fb1d2d69899560401fb9115d9425838bdeb0ee1ff224e492b3dfc2e15b7e4daf5cc11d19b3e48eca094c989359b7442e1a3db05134c036

data/lib/active_record_shards.rb

@@ -32,7 +32,7 @@ when '4.0'
   require 'active_record_shards-4-0'
 when '4.1', '4.2'
   require 'active_record_shards-4-1'
-when '5.0'
+when '5.0', '5.1'
   require 'active_record_shards-5-0'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"

data/lib/active_record_shards/connection_switcher-5-0.rb

@@ -20,9 +20,16 @@ module ActiveRecordShards
 
       pool = connection_handler.retrieve_connection_pool(spec_name)
       if pool.nil?
-        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new configurations
-        spec = resolver.spec(spec_name.to_sym, spec_name)
-        connection_handler.establish_connection spec
+        spec =
+          if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR.zero?
+            resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(configurations)
+            resolver.spec(spec_name.to_sym, spec_name)
+          else
+            # Resolver will be applied by Rails 5.1+
+            spec_name.to_sym
+          end
+
+        connection_handler.establish_connection(spec)
       end
     end
   end

data/lib/active_record_shards/connection_switcher.rb

@@ -190,7 +190,7 @@ end
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
 when '3.2', '4.0', '4.1', '4.2'
   require 'active_record_shards/connection_switcher-4-0'
-when '5.0'
+when '5.0', '5.1'
   require 'active_record_shards/connection_switcher-5-0'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.8.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.