switchman 2.0.1 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d6fc62ea8d63155621448b9dc70e5aab0bfa3e15b766ad6bc8b7282e124933b
-  data.tar.gz: 210c939e4c6a5c1c4b340e81c91fa68c0e019adeabf7dd0500f42eaa3605ad1e
+  metadata.gz: 6aef8a22c98bb6cbd26aae19a97bc4357e5f2d18cbaecdf039dbe703be6ecf6c
+  data.tar.gz: 4a93fc1575776b9f39d8ab62d105f269616c1648eda8978823fd030c69e6d747
 SHA512:
-  metadata.gz: 780cc1c19606c00ecfb8df648a3f2d1e9744f375ff0a1e7793482108f81221f313254e16873db977af14e19adb0cb3d1bd9af3318c15c92ba3e54e01a91eb072
-  data.tar.gz: fe688c62be4f0b5e36279b93925377d3165d238a19c37124d90d464b9eac08691f2b8f0f550e56ccf5dd092cd872a3bf1ec23780fc719b8b2cf3a62539a06113
+  metadata.gz: d3706346b156d9653491b32564fa83ac81c35d9520917de29d0e6681784d01875722c39bd8cbdd204c816b9795940fbee8acb8b29416a48c965868c57711fa7d
+  data.tar.gz: 0f92f8e61c8a543202b4f34df3e05d86091c4c6b29e04cc28bafbc3c154978fcdf7b1bc868ea73add5a1f9c38b7671575f1284242916335ad90d98f279e51dee

data/app/models/switchman/shard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/database_server'
 require 'switchman/default_shard'
 require 'switchman/environment'

data/db/migrate/20130328212039_create_switchman_shards.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSwitchmanShards < ActiveRecord::Migration[4.2]
   def change
     create_table :switchman_shards do |t|

data/db/migrate/20130328224244_create_default_shard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDefaultShard < ActiveRecord::Migration[4.2]
   def up
     unless Switchman::Shard.default.is_a?(Switchman::Shard)

data/db/migrate/20161206323434_add_back_default_string_limits_switchman.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBackDefaultStringLimitsSwitchman < ActiveRecord::Migration[4.2]
   def up
     add_string_limit_if_missing :switchman_shards, :name

data/db/migrate/20180828183945_add_default_shard_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDefaultShardIndex < ActiveRecord::Migration[4.2]
   def change
     Switchman::Shard.where(default: nil).update_all(default: false)

data/db/migrate/20180828192111_add_timestamps_to_shards.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddTimestampsToShards < ActiveRecord::Migration[4.2]
   def change
     add_timestamps :switchman_shards, null: true

data/db/migrate/20190114212900_add_unique_name_indexes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUniqueNameIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :switchman_shards, [:database_server_id, :name], unique: true

data/lib/switchman.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "guard_rail"
 require "switchman/open4"
 require "switchman/engine"

data/lib/switchman/action_controller/caching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActionController
     module Caching

data/lib/switchman/active_record/abstract_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/sharded_instrumenter'
 
 module Switchman
@@ -27,6 +29,10 @@ module Switchman
         quote_table_name(name)
       end
 
+      def schema_migration
+        ::ActiveRecord::SchemaMigration
+      end
+
       protected
 
       def log(*args, &block)

data/lib/switchman/active_record/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Association
@@ -75,7 +77,7 @@ module Switchman
       module Association
         if ::Rails.version >= "5.2" and ::Rails.version < "6.0"
           def run(preloader)
-            associated_records_by_owner(preloader).each do |owner, records|
+            associated_records_by_owner.each do |owner, records|
               associate_records_to_owner(owner, records)
             end
           end
@@ -102,6 +104,7 @@ module Switchman
         end
 
         def associated_records_by_owner(preloader = nil)
+          return @associated_records_by_owner if defined?(@associated_records_by_owner)
           owners_map = owners_by_key
 
           if klass.nil? || owners_map.empty?
@@ -149,10 +152,13 @@ module Switchman
             records.flatten!
           end
 
+          # This ivar may look unused, but remember this is an extension of
+          # rails' AR::Associations::Preloader::Association class. It gets used
+          # by that class (and its subclasses).
           @preloaded_records = records
 
           # Each record may have multiple owners, and vice-versa
-          records_by_owner = owners.each_with_object({}) do |owner,h|
+          @associated_records_by_owner = owners.each_with_object({}) do |owner,h|
             h[owner] = []
           end
           records.each do |record|
@@ -161,10 +167,10 @@ module Switchman
 
             owners_map[owner_key.to_s].each do |owner|
               owner.association(reflection.name).set_inverse_instance(record)
-              records_by_owner[owner] << record
+              @associated_records_by_owner[owner] << record
             end
           end
-          records_by_owner
+          @associated_records_by_owner
         end
 
         def owners_by_key

data/lib/switchman/active_record/attribute_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module AttributeMethods

data/lib/switchman/active_record/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Base

data/lib/switchman/active_record/batches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Batches

data/lib/switchman/active_record/calculations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Calculations

data/lib/switchman/active_record/connection_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/connection_pool_proxy'
 
 module Switchman

data/lib/switchman/active_record/connection_pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/errors'
 
 module Switchman

data/lib/switchman/active_record/finder_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module FinderMethods

data/lib/switchman/active_record/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module LogSubscriber

data/lib/switchman/active_record/migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Migration
@@ -29,7 +31,7 @@ module Switchman
 
     module Migrator
       def generate_migrator_advisory_lock_id
-        shard_name_hash = Zlib.crc32(Shard.current.name)
+        shard_name_hash = Zlib.crc32("#{Shard.current.id}:#{Shard.current.name}")
         ::ActiveRecord::Migrator::MIGRATOR_SALT * shard_name_hash
       end
     end

data/lib/switchman/active_record/model_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module ModelSchema

data/lib/switchman/active_record/persistence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Persistence

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module PostgreSQLAdapter

data/lib/switchman/active_record/predicate_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module PredicateBuilder

data/lib/switchman/active_record/query_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module QueryCache

data/lib/switchman/active_record/query_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module QueryMethods

data/lib/switchman/active_record/reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Reflection

data/lib/switchman/active_record/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module Relation

data/lib/switchman/active_record/spawn_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module SpawnMethods

data/lib/switchman/active_record/statement_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module StatementCache

data/lib/switchman/active_record/table_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module TableDefinition

data/lib/switchman/active_record/type_caster.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module TypeCaster

data/lib/switchman/active_record/where_clause_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveRecord
     module WhereClauseFactory

data/lib/switchman/active_support/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module ActiveSupport
     module Cache

data/lib/switchman/arel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module Arel
     module Table

data/lib/switchman/call_super.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module CallSuper
     def super_method_above(method_name, above_module)

data/lib/switchman/connection_pool_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/schema_cache'
 
 module Switchman

data/lib/switchman/database_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 
 module Switchman

data/lib/switchman/default_shard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switchman/database_server'
 
 module Switchman

data/lib/switchman/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   class Engine < ::Rails::Engine
     isolate_namespace Switchman

data/lib/switchman/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'etc'
 
 module Switchman

data/lib/switchman/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   class NonExistentShardError < RuntimeError; end
   class ParallelShardExecError < RuntimeError; end

data/lib/switchman/guard_rail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module GuardRail
     module ClassMethods

data/lib/switchman/guard_rail/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module GuardRail
     module Relation

data/lib/switchman/open4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open4'
 
 # This fixes a bug with exception handling,

data/lib/switchman/r_spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "switchman/test_helper"
 
 module Switchman

data/lib/switchman/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman::Rails
   module ClassMethods
     def self.prepended(klass)

data/lib/switchman/schema_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   class SchemaCache < ::ActiveRecord::ConnectionAdapters::SchemaCache
     delegate :connection, to: :pool

data/lib/switchman/sharded_instrumenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   class ShardedInstrumenter < ::SimpleDelegator
     def initialize(instrumenter, shard_host)

data/lib/switchman/standard_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module StandardError
     def initialize(*args)
@@ -6,7 +8,7 @@ module Switchman
     end
 
     def current_shard(category = :primary)
-      @active_shards[category] || Shard.default
+      @active_shards&.[](category) || Shard.default
     end
   end
 end

data/lib/switchman/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
   module TestHelper
     class << self

data/lib/switchman/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Switchman
-  VERSION = "2.0.1"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.7
 platform: ruby
 authors:
 - Cody Cutrer
 - James Williams
 - Jacob Fugal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -140,16 +140,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +257,7 @@ homepage: http://www.instructure.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Rails sharding magic
 test_files: []