switchman 1.5.19 → 1.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65bb936a3b1c3df9044c0c8429a6e7b01b0bafb3
-  data.tar.gz: a1e4e5e2c846e10fd95f1916a175b5327e4429d1
+  metadata.gz: f93ffdf39f2476bbca446bd460d92929f405fd20
+  data.tar.gz: b9474a6f15ce63eca588224f8b079481628b5cea
 SHA512:
-  metadata.gz: 3d7888becfe60dd1e14255cfca4c3492268ea4048133819a2aa40de66c696b0dd6c4965c66eb82bb68603346afdc43b3f5b8ee636da2ff36a58db7bd0628a52c
-  data.tar.gz: bf563c2246872f3afb630f93e08906b55f8e6e7f63a92cd0c765cd87a1fb21120634b375a011fa5b29793c293400ccc96bca83d4796025d15d6985ccc138825f
+  metadata.gz: 69ab7d6917a101adbd9b7d2d52c86da2c1c24d3acbc44410aab2068ec9e24ad45bae9e4fcc89db8d4b9d6d67107e3ccfadbe4adfdfefe4a70409c66dcc6233c7
+  data.tar.gz: 4144225d20c804a42d22e952afa493ebaafc537a7dc72a9836d6026940a375222ea534d6513538a03ae51eac2b1c8e4ace3cb7ae9bbcac8c7252fdc06673b083

data/app/models/switchman/shard_internal.rb

@@ -451,7 +451,8 @@ module Switchman
 
       # takes an id-ish, and returns a local id and the shard it's
       # local to. [nil, nil] if it can't be interpreted. [id, nil]
-      # if it's already a local ID
+      # if it's already a local ID. [nil, nil] if it's a well formed
+      # id, but the shard it refers to does not exist
       NIL_NIL_ID = [nil, nil].freeze
       def local_id_for(any_id)
         id = integral_id_for(any_id)
@@ -466,10 +467,13 @@ module Switchman
       end
 
       # takes an id-ish, and returns an integral id relative to
-      # target_shard. returns any_id itself if it can't be interpreted
+      # target_shard. returns nil if it can't be interpreted,
+      # or the integral version of the id if it refers to a shard
+      # that does not exist
       def relative_id_for(any_id, source_shard, target_shard)
-        local_id, shard = local_id_for(any_id)
-        return any_id unless local_id
+        integral_id = integral_id_for(any_id)
+        local_id, shard = local_id_for(integral_id)
+        return integral_id unless local_id
         shard ||= source_shard
         return local_id if shard == target_shard
         shard.global_id_for(local_id)

data/lib/switchman/active_record/query_methods.rb

@@ -295,6 +295,7 @@ module Switchman
             local_ids = []
             predicate.right.each do |value|
               local_id = Shard.relative_id_for(value, current_source_shard, target_shard)
+              next unless local_id
               unless remove && local_id > Shard::IDS_PER_SHARD
                 if ::Rails.version > "4.2" && value.is_a?(::Arel::Nodes::Casted)
                   if local_id == value.val

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.19"
+  VERSION = "1.5.20"
 end

metadata

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