switchman 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33042670de931ff4d9974370cf8703bc2059f53b
-  data.tar.gz: b3ef2ecf2944446cfd06617b85179e2c20ddadb4
+  metadata.gz: fa3506567faae98c3df18544db429163ea0aed03
+  data.tar.gz: 8f354e57d9ce1342ce2f369a13fe485f92f6dcfa
 SHA512:
-  metadata.gz: 39f9d4473a0a544110c89b8d4c9253c651bb9b08d0e3042c605ea7b1bbf39a304a19790b43bede1a44e172756175f5d88f01de3662354eeaab7ced5a61d3bdfd
-  data.tar.gz: 4341cb78497d39d27f94d1026d45a99a7815fe96645a90692a325dca5d161229cef5ba3fd1f55c07f7729fbd9ab359827cf96b9477f4d03f644d27c1b0443404
+  metadata.gz: 4a9c5fb4a816d4e76f2991b5d39b23182c055d34771016edaeb181dda77c1f0c99c542d23fad4629b7d3ccc2202fa7954faf38b0006f76a333817a7b6e6dbd7b
+  data.tar.gz: 2e05febfa8a714552cbb27cdb0fb223d5c8442de344fb3cba606a5c4a566cac6a47df34d362991524ed5a0591a6d3e188666a33cbf3ab7b0874187488c2035d9

data/app/models/switchman/shard_internal.rb

@@ -198,7 +198,7 @@ module Switchman
             scopes = Hash[database_servers.map do |server|
               server_scope = server.shards.merge(scope)
               if parallel == 1
-                subscopes = server_scope
+                subscopes = [server_scope]
               else
                 subscopes = []
                 total = server_scope.count
@@ -223,6 +223,8 @@ module Switchman
               scopes = Hash[scopes.map do |(server, shards)|
                 [server, shards.in_groups(parallel, false).compact]
               end]
+            else
+              scopes = Hash[scopes.map { |(server, shards)| [server, [shards]] }]
             end
           end
 
@@ -250,7 +252,7 @@ module Switchman
 
           # only one process; don't bother forking
           if scopes.length == 1 && parallel == 1
-            return with_each_shard(scopes.first.last, categories, options) { yield }
+            return with_each_shard(scopes.first.last.first, categories, options) { yield }
           end
 
           # clear connections prior to forking (no more queries will be executed in the parent,
@@ -259,10 +261,6 @@ module Switchman
           ::ActiveRecord::Base.clear_all_connections!
 
           scopes.each do |server, subscopes|
-            if !(::ActiveRecord::Relation === subscopes.first) && subscopes.first.class != Array
-              subscopes = [subscopes]
-            end
-
             subscopes.each_with_index do |subscope, idx|
               if subscopes.length > 1
                 name = "#{server.id} #{idx + 1}"
@@ -274,7 +272,7 @@ module Switchman
               exception_pipes << exception_pipe
               pid, io_in, io_out, io_err = Open4.pfork4(lambda do
                 begin
-                  Switchman.config[:on_fork_proc].try(:call)
+                  Switchman.config[:on_fork_proc]&.call
                   $0 = [$0, ARGV, name].flatten.join(' ')
                   with_each_shard(subscope, categories, options) { yield }
                   exception_pipe.last.close
@@ -610,7 +608,7 @@ module Switchman
       begin
         adapter = self.database_server.config[:adapter]
         sharding_config = Switchman.config || {}
-        drop_statement = sharding_config[adapter].try(:[], :drop_statement)
+        drop_statement = sharding_config[adapter]&.[](:drop_statement)
         drop_statement ||= sharding_config[:drop_statement]
         if drop_statement
           drop_statement = Array(drop_statement).dup.

data/lib/switchman/active_record/attribute_methods.rb

@@ -27,7 +27,7 @@ module Switchman
         def reflection_for_integer_attribute(attr_name)
           attr_name = attr_name.to_s
           columns_hash[attr_name] && columns_hash[attr_name].type == :integer &&
-              reflections.find { |_, r| r.belongs_to? && r.foreign_key.to_s == attr_name }.try(:last)
+              reflections.find { |_, r| r.belongs_to? && r.foreign_key.to_s == attr_name }&.last
         rescue ::ActiveRecord::StatementInvalid
           # this is for when models are referenced in initializers before migrations have been run
           raise if connection.open_transactions > 0
@@ -65,8 +65,8 @@ module Switchman
           if reflection
             if reflection.options[:polymorphic]
               # a polymorphic association has to be discovered at runtime. This code ends up being something like
-              # context_type.try(:constantize).try(:shard_category) || :primary
-              "read_attribute(:#{reflection.foreign_type}).try(:constantize).try(:shard_category) || :primary"
+              # context_type.&.constantize&.shard_category || :primary
+              "read_attribute(:#{reflection.foreign_type})&.constantize&.shard_category || :primary"
             else
               # otherwise we can just return a symbol for the statically known type of the association
               reflection.klass.shard_category.inspect

data/lib/switchman/active_record/base.rb

@@ -33,7 +33,7 @@ module Switchman
 
         def integral_id?
           if @integral_id == nil
-            @integral_id = columns_hash[primary_key].try(:type) == :integer
+            @integral_id = columns_hash[primary_key]&.type == :integer
           end
           @integral_id
         end

data/lib/switchman/active_record/query_cache.rb

@@ -44,7 +44,7 @@ module Switchman
       end
 
       def clear_query_cache
-        Thread.current[:query_cache].try(:clear)
+        Thread.current[:query_cache]&.clear
       end
 
       def select_all(arel, name = nil, binds = [], preparable: nil)

data/lib/switchman/active_record/query_methods.rb

@@ -182,14 +182,14 @@ module Switchman
             # look for a bind param with a matching column name
             if ::Rails.version >= "5"
               binds ||= where_clause.binds + having_clause.binds
-              if binds && bind = binds.detect{|b| b.try(:name).to_s == klass.primary_key.to_s}
+              if binds && bind = binds.detect{|b| b&.name.to_s == klass.primary_key.to_s}
                 unless bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
                   local_id, id_shard = Shard.local_id_for(bind.value)
                   id_shard ||= Shard.current(klass.shard_category) if local_id
                 end
               end
             else
-              if bind_values && idx = bind_values.find_index{|b| b.is_a?(Array) && b.first.try(:name).to_s == klass.primary_key.to_s}
+              if bind_values && idx = bind_values.find_index{|b| b.is_a?(Array) && b.first&.name.to_s == klass.primary_key.to_s}
                 column, value = bind_values[idx]
                 unless value.is_a?(::ActiveRecord::StatementCache::Substitute)
                   local_id, id_shard = Shard.local_id_for(value)
@@ -313,7 +313,7 @@ module Switchman
             # look for a bind param with a matching column name
             if ::Rails.version >= "5"
               binds ||= where_clause.binds + having_clause.binds
-              if binds && bind = binds.detect{|b| b.try(:name).to_s == predicate.left.name.to_s}
+              if binds && bind = binds.detect{|b| b&.name.to_s == predicate.left.name.to_s}
                 if bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
                   bind.value.sharded = true # mark for transposition later
                   bind.value.primary = true if type == :primary
@@ -325,7 +325,7 @@ module Switchman
                 end
               end
             else
-              if bind_values && idx = bind_values.find_index{|b| b.is_a?(Array) && b.first.try(:name).to_s == predicate.left.name.to_s}
+              if bind_values && idx = bind_values.find_index{|b| b.is_a?(Array) && b.first&.name.to_s == predicate.left.name.to_s}
                 column, value = bind_values[idx]
                 if value.is_a?(::ActiveRecord::StatementCache::Substitute)
                   value.sharded = true # mark for transposition later

data/lib/switchman/database_server.rb

@@ -134,7 +134,7 @@ module Switchman
       create_schema = options[:schema]
       # look for another shard associated with this db
       other_shard = self.shards.where("name<>':memory:' OR name IS NULL").order(:id).first
-      temp_name = other_shard.try(:name) unless id == ::Rails.env
+      temp_name = other_shard&.name unless id == ::Rails.env
       temp_name = Shard.default.name if id == ::Rails.env
 
       case config[:adapter]
@@ -158,7 +158,7 @@ module Switchman
           create_statement = lambda { "CREATE DATABASE #{name}" }
       end
       sharding_config = Switchman.config
-      config_create_statement = sharding_config[config[:adapter]].try(:[], :create_statement)
+      config_create_statement = sharding_config[config[:adapter]]&.[](:create_statement)
       config_create_statement ||= sharding_config[:create_statement]
       if config_create_statement
         create_commands = Array(config_create_statement).dup

data/lib/switchman/sharded_instrumenter.rb

@@ -6,7 +6,7 @@ module Switchman
     end
 
     def instrument(name, payload={})
-      shard = @shard_host.try(:shard)
+      shard = @shard_host&.shard
       # attribute_methods_generated? will be false during a reload -
       # when we might be doing a query while defining attribute methods,
       # so just avoid logging then

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties