switchman 1.2.34 → 1.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3e573a9c3ed8ce40af24f79d883ef09c9616fe
-  data.tar.gz: 88673ec555084d8e77269a67d742f80e3de233f1
+  metadata.gz: f57ef128744d2aff26dde580aac747cfb87d8023
+  data.tar.gz: de8662cb8530550ae45a9a4fdbb336cc72697118
 SHA512:
-  metadata.gz: aa216be606b8eb43bcb53b59ab623528adba472fe4867aae9b94527cfce6bbb97c040a8c91f5425a73e927922dd020176a35d7d1249dbdd5cb2a7c0a20cbfa0c
-  data.tar.gz: 4ea6ed350bad62f0ac1540a1cdb608e0fd1588e845c3afe694ad22c5080b2ea197fbefbb6a05e97554d309ba753e3afdf189e54e0bb20577548226a307ee23ca
+  metadata.gz: 060e61abe83142d07d485b13de1a425ba7dd988d74f3824a037f14ed907a1c79d3c955592f3d7ab64b5db422d36329303555d8d60164e03e6e6db4f9c650c2fa
+  data.tar.gz: 39a08de71d325ad177f321b6ee8bd2be610eb1f336c10865bd6f5fd3309a5b01d730363c5ee80ca5442f2a25d60ce28be8891c3ce11fb05cd6b2b9d174cd65db

data/app/models/switchman/shard.rb

@@ -374,10 +374,6 @@ module Switchman
         end
       end
 
-      def primary?
-        self == database_server.primary_shard
-      end
-
       # takes an id-ish, and returns an integral id relative to
       # target_shard. returns any_id itself if it can't be interpreted
       def relative_id_for(any_id, source_shard, target_shard)
@@ -453,6 +449,10 @@ module Switchman
       @database_server = database_server
     end
 
+    def primary?
+      self == database_server.primary_shard
+    end
+
     def description
       [database_server.id, name].compact.join(':')
     end

data/lib/switchman/default_shard.rb

@@ -29,7 +29,7 @@ module Switchman
     end
 
     def ==(rhs)
-      return true if rhs.is_a?(DefaultShard) || (rhs.is_a?(Shard) && rhs.default?)
+      return true if rhs.is_a?(DefaultShard) || (rhs.is_a?(Shard) && rhs[:default])
       super
     end
 

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.34"
+  VERSION = "1.2.35"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.34
+  version: 1.2.35
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties