switchman 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ac20dcf634164e03ce0325d01a492a6b9f37ea6
-  data.tar.gz: c6e4c46ce8b9dbc04a39678cbd892e7f4ab1e852
+  metadata.gz: 2287cafb5c656fc9033e4549edec54e5497977b5
+  data.tar.gz: 0a5c7fb962a37016087842675dfc37f90ccd697b
 SHA512:
-  metadata.gz: aed3e8db98ce052fbd21cead9d100cadc1822d20c5fa37eaee88d91bb25e9caedee72f0ce3f160b3d106359814796b43459a851e71e420cafe2ea1f8181a997a
-  data.tar.gz: 0f25cdd4c7c85f4ffd6d7c32ebfc0262d2c9593788ebebaaf71d970cfaa947ea47ba2bf40fc9d4834f06b941586ba355123cfd99952367a23b95ba68cb0829ae
+  metadata.gz: 9c6200530e3662721b2eb0f66dee5107f9d8200fbd90229974d3be29d875d8328c71b9971b5d1e6a39d69e02e74fe2c7491c81630a4fa0c9e01ea58dff6b3067
+  data.tar.gz: 9044787290f4ce2bca81c26cba8c83c6ee4284fbea4afcf17223a8586d333e4bd119fd2472cbaadaee77701b58dc5ab839d367f070e257db1d2be6285f682914

data/lib/switchman/active_record/reflection.rb

@@ -12,21 +12,21 @@ module Switchman
         end
       end
 
-      module AssociationReflection
-        # removes memoization - ActiveRecord::ModelSchema does that anyway;
-        # and in fact this is the exact change AR makes in 4.2+
-        if ::Rails.version < '4.2'
-          def quoted_table_name
-            klass.quoted_table_name
+      if ::Rails.version >= '4.2'
+        module AssociationScopeCache
+          def initialize(*args)
+            super
+            # on ThroughReflection, these won't be initialized (cause it doesn't
+            # inherit from AssociationReflection), so make sure they're
+            # initialized here
+            @association_scope_cache ||= {}
+            @scope_lock ||= Mutex.new
           end
-        else
-          def join_id_for(owner)
-            owner.send(active_record_primary_key) # use sharded id values in association binds
-          end
-        end
 
-        # cache association scopes by shard.
-        if ::Rails.version >= '4.2'
+          # cache association scopes by shard.
+          # this technically belongs on AssociationReflection, but we put it on
+          # ThroughReflection as well, instead of delegating to its internal
+          # HasManyAssociation, losing its proper `klass`
           def association_scope_cache(conn, owner)
             key = conn.prepared_statements
             if polymorphic?
@@ -39,6 +39,20 @@ module Switchman
           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+
+        if ::Rails.version < '4.2'
+          def quoted_table_name
+            klass.quoted_table_name
+          end
+        else
+          def join_id_for(owner)
+            owner.send(active_record_primary_key) # use sharded id values in association binds
+          end
+        end
+      end
     end
   end
 end

data/lib/switchman/engine.rb

@@ -134,6 +134,8 @@ module Switchman
         ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
         if ::Rails.version >= '4.2'
           ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)
+          ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationScopeCache)
+          ::ActiveRecord::Reflection::ThroughReflection.prepend(ActiveRecord::Reflection::AssociationScopeCache)
         else
           ::ActiveRecord::Reflection::AssociationReflection.include(ActiveRecord::Reflection::AbstractReflection)
         end

data/lib/switchman/version.rb

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

metadata

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