switchman 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbebb58633ecf7d7de5aee0392cfcc1a4f878ce
-  data.tar.gz: 0960e8a987a8f278450a25112287feac197560fe
+  metadata.gz: 8ac20dcf634164e03ce0325d01a492a6b9f37ea6
+  data.tar.gz: c6e4c46ce8b9dbc04a39678cbd892e7f4ab1e852
 SHA512:
-  metadata.gz: 3b4229a603a2276b36d20ccaf4c5ccd8517692ccc2afb8d7097222cc8bdccbc6a4de2c39fce95ece6f440b93c3a0124d27eaa10926d0ead5d0f564db82c586e9
-  data.tar.gz: adad3ed4f5ca5fef5152f2a3aadb6004df803a7b1697820409d11b79a9cb50739412f7e86fe23739ad68006b18eaab1e921183b68c34ea236f5283056dd9c664
+  metadata.gz: aed3e8db98ce052fbd21cead9d100cadc1822d20c5fa37eaee88d91bb25e9caedee72f0ce3f160b3d106359814796b43459a851e71e420cafe2ea1f8181a997a
+  data.tar.gz: 0f25cdd4c7c85f4ffd6d7c32ebfc0262d2c9593788ebebaaf71d970cfaa947ea47ba2bf40fc9d4834f06b941586ba355123cfd99952367a23b95ba68cb0829ae

data/lib/switchman/active_record/association.rb

@@ -2,12 +2,7 @@ module Switchman
   module ActiveRecord
     module Association
       def shard
-        if @reflection.options[:polymorphic] || @reflection.klass.shard_category == @owner.class.shard_category
-          # polymorphic associations assume the same shard as the owning item
-          @owner.shard
-        else
-          Shard.default
-        end
+        reflection.shard(owner)
       end
 
       def build_record(*args)
@@ -42,8 +37,10 @@ module Switchman
 
     module CollectionAssociation
       def get_records
-        shards = reflection.options[:multishard] && owner.respond_to?(:associated_shards) ? owner.associated_shards : [owner.shard]
-        Shard.with_each_shard(shards, [klass.shard_category]) do
+        shards = reflection.options[:multishard] && owner.respond_to?(:associated_shards) ? owner.associated_shards : [shard]
+        # activate both the owner and the target's shard category, so that Reflection#join_id_for,
+        # when called for the owner, will be returned relative to shard the query will execute on
+        Shard.with_each_shard(shards, [klass.shard_category, owner.class.shard_category].uniq) do
           super
         end
       end

data/lib/switchman/active_record/reflection.rb

@@ -1,6 +1,17 @@
 module Switchman
   module ActiveRecord
     module Reflection
+      module AbstractReflection
+        def shard(owner)
+          if polymorphic? || klass.shard_category == owner.class.shard_category
+            # polymorphic associations assume the same shard as the owning item
+            owner.shard
+          else
+            Shard.default
+          end
+        end
+      end
+
       module AssociationReflection
         # removes memoization - ActiveRecord::ModelSchema does that anyway;
         # and in fact this is the exact change AR makes in 4.2+
@@ -21,7 +32,7 @@ module Switchman
             if polymorphic?
               key = [key, owner._read_attribute(@foreign_type)]
             end
-            key = [key, owner.shard.id].flatten
+            key = [key, shard(owner).id].flatten
             @association_scope_cache[key] ||= @scope_lock.synchronize {
               @association_scope_cache[key] ||= yield
             }

data/lib/switchman/engine.rb

@@ -132,6 +132,11 @@ module Switchman
         ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all)
 
         ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
+        if ::Rails.version >= '4.2'
+          ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)
+        else
+          ::ActiveRecord::Reflection::AssociationReflection.include(ActiveRecord::Reflection::AbstractReflection)
+        end
         ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationReflection)
         ::ActiveRecord::Relation.prepend(ActiveRecord::Batches)
         ::ActiveRecord::Relation.prepend(ActiveRecord::Calculations)

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic