switchman 1.2.32 → 1.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b6039fc60b8a5db9ef9281e88c08877f7e1d26
-  data.tar.gz: 91f66cda658940618dcdb0da4629cbc8a7f17efc
+  metadata.gz: a349637588bb7ed6a77000f7e289c69f1a4631d8
+  data.tar.gz: 495616221bc75fcd1921a736fe7fd6fbba32a3ef
 SHA512:
-  metadata.gz: 647c24616377cff9c9d3f5fcbc57186ae5886ce04d3a6297fbcd27990f1bba8211ba5acb0db20eaf9bfb3fa13a4f88837fea10eda4b985e4652c896d2ba90cbc
-  data.tar.gz: 3a87e1c36cd2a001029ac5aae33a7dcd6cda63028c152e9191248d2517c2de888632f003286831cf2001b81a3daf8cebdfaea3f58333486baccbb4492a4974e4
+  metadata.gz: 2c5775a79605ae66621b26e907c90a99fb773134ad0248a4325000de2a7423e9cbff71c5f7272b9ee458495205752fa2c32bd584a9bfc93116b06d1ba3c85a8a
+  data.tar.gz: ae552414da6895cbc182124ce667f52a8b8652f1fce32b936b908a2186ab04858647ddbb0b7164fa4aa3483665ff7538a3414238cfb88c50ec024fa6cb9776d3

data/app/models/switchman/shard.rb

@@ -21,6 +21,8 @@ module Switchman
 
     after_save :clear_cache
 
+    scope :primary, -> { where(name: nil).order(:database_server_id, :id).distinct_on(:database_server_id) }
+
     class << self
       def categories
         CATEGORIES.keys
@@ -372,6 +374,10 @@ 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)

data/lib/switchman/database_server.rb

@@ -265,6 +265,13 @@ module Switchman
       end
     end
 
+    def primary_shard
+      unless instance_variable_defined?(:@primary_shard)
+        @primary_shard = shards.where(name: nil).first
+      end
+      @primary_shard
+    end
+
     private
     def reset_column_information
       ::ActiveRecord::Base.connection_handler.switchman_connection_pool_proxies.each { |pool| pool.schema_cache.clear! }

data/lib/switchman/default_shard.rb

@@ -6,6 +6,7 @@ module Switchman
     def activate(*categories); yield; end
     def activate!(*categories); end
     def default?; true; end
+    def primary?; true; end
     def relative_id_for(local_id, target = nil); local_id; end
     def global_id_for(local_id); local_id; end
     def database_server_id; nil; end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.32"
+  VERSION = "1.2.33"
 end

data/lib/tasks/switchman.rake

@@ -72,6 +72,10 @@ module Switchman
           shard_ids << Shard.default.id
         elsif id == '-default'
           negative_shard_ids << Shard.default.id
+        elsif id == 'primary'
+          shard_ids.concat(Shard.primary.pluck(:id))
+        elsif id == '-primary'
+          negative_shard_ids.concat(Shard.primary.pluck(:id))
         elsif id =~ /(-?)(\d+)?\.\.(\.)?(\d+)?/
           negative, start, open, finish = $1.present?, $2, $3.present?, $4
           raise "Invalid shard id or range: #{id}" unless start || finish

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.32
+  version: 1.2.33
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails 3 sharding magic