active_record_shards 4.0.0.beta5 → 4.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635a833192fb641e710ff4bf7b30380023936a1a
-  data.tar.gz: 8fa608a3b2f2f692b20b8445a4a21d879b88688f
+  metadata.gz: 4a5e26f845c2b9628ad246c6afafc466be8d00c8
+  data.tar.gz: ccffb2df58a242e590c6f5940a30814572eaf742
 SHA512:
-  metadata.gz: 2ea40014c08f3670c4155e721d05abcab31eb366b6761a02fb1386710288d9f9ca59ea8f2580da0d71d4f502ede737775952f3f0a47140f7527e6a2eabf49716
-  data.tar.gz: 6343baabe62a1a3007a8cacd42eea95873e0a7f5713249e8d65c1b0ba16f6b0850eaf5429b06fa5ba7dc7f4e6641d38342fe3a30a57a4b00bd1f67cc0951ad8e
+  metadata.gz: 96333291c802edcfd68cf8bb989252bfed8b08e72c8afca8bf8d09098b7053b18ec58472df76f1cf48cc05a624570ab4996e350440d42c0908f5bb5b86c08e56
+  data.tar.gz: ac5e5f9820f2d91d8eb726312a60e509e9d000dd72d5f04e19ff7cc6956352ec9aa8643ff244385ba48332dbe44eb5e4dd672d5594dfb25382ebbe304ad2ffdd

data/lib/active_record_shards/connection_switcher.rb

@@ -64,6 +64,10 @@ module ActiveRecordShards
       current_shard_selection.shard
     end
 
+    def on_shard?
+      current_shard_selection.on_shard?
+    end
+
     def shard_names
       unless config = configurations[shard_env]
         raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.inspect})"

data/lib/active_record_shards/no_shard_selection.rb

@@ -10,5 +10,9 @@ module ActiveRecordShards
     def connection_config
       raise NoShardSelected, "No shard selected, can't connect"
     end
+
+    def on_shard?
+      false
+    end
   end
 end

data/lib/active_record_shards/shard_selection.rb

@@ -10,5 +10,9 @@ module ActiveRecordShards
     def connection_config
       { shard: shard }
     end
+
+    def on_shard?
+      true
+    end
   end
 end

data/lib/active_record_shards/slave_db.rb

@@ -79,7 +79,7 @@ module ActiveRecordShards
     end
 
     def current_slave_selection
-      Thread.current[:slave_selection] ||= false
+      !!Thread.current[:slave_selection]
     end
 
     def connection_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta5
+  version: 4.0.0.beta6
 platform: ruby
 authors:
 - Mick Staugaard