misha-ar-octopus 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d7aed4e7a1e49c21bb58f7caf135c524213fcb6
-  data.tar.gz: 19f02f593808210ad8525908a7dad698ddba16b5
+  metadata.gz: 281daf3f746620c9c532e375151dc38b60723410
+  data.tar.gz: 8ec2145b1f7a5ad70b28eb28afcc6648bb929f35
 SHA512:
-  metadata.gz: 6a2c17edad9ba36dc637ed61a7405c7af4d7e90f2f3b670b005352747861107f061a007dba7ebb66121c169af75a903ffbd5f678ae9614e09014947f75ff7925
-  data.tar.gz: 93cbcc6e5c248f23f7dab52d2e04529c1eff4d894b9d3a1c162a2f416c6bb2bd9b8fb0074084df96951b1cf66f05eba4db5781d0a71441ed3d314138e1bc8c4d
+  metadata.gz: 567b3f257582d25174cbc5665de939f606236bf6646049db6fa29b13f0e05bfeb704589fd0182cbb95bc27c2c7dd6f5beb8117395d64c2b31efbbfa1b9e5ba4d
+  data.tar.gz: 87817bf90a7e1dc94404440c348c79b670afa4afce2080dbe31b94e1f272131a7ea7ba6613d66560c43b56b796bd74c80f8522161b83a67bc4ccedbd378ca3dd

data/lib/octopus.rb

@@ -117,11 +117,11 @@ module Octopus
     ActiveRecord::Base.connection.initialize_shards(@config)
   end
 
-  def self.using(shard, options = {}, &block)
+  def self.using(shard, &block)
     conn = ActiveRecord::Base.connection
 
     if conn.is_a?(Octopus::Proxy)
-      conn.run_queries_on_shard(shard, options, &block)
+      conn.run_queries_on_shard(shard, &block)
     else
       yield
     end

data/lib/octopus/proxy.rb

@@ -10,7 +10,7 @@ module Octopus
     CURRENT_SHARD_KEY = 'octopus.current_shard'.freeze
     CURRENT_GROUP_KEY = 'octopus.current_group'.freeze
     CURRENT_SLAVE_GROUP_KEY = 'octopus.current_slave_group'.freeze
-    CURRENT_OPTIONS_KEY = 'octopus.current_options'.freeze
+    CURRENT_LOAD_BALANCE_OPTIONS_KEY = 'octopus.current_load_balance_options'.freeze
     BLOCK_KEY = 'octopus.block'.freeze
     LAST_CURRENT_SHARD_KEY = 'octopus.last_current_shard'.freeze
     FULLY_REPLICATED_KEY = 'octopus.fully_replicated'.freeze
@@ -118,6 +118,7 @@ module Octopus
         hash = shard_symbol
         shard_symbol = hash[:shard]
         slave_group_symbol = hash[:slave_group]
+        load_balance_options = hash[:load_balance_options]
 
         if shard_symbol.nil? && slave_group_symbol.nil?
           fail 'Neither shard or slave group must be specified'
@@ -134,6 +135,7 @@ module Octopus
           end
         end
         self.current_slave_group = slave_group_symbol
+        self.current_load_balance_options = load_balance_options
       else
         fail "Nonexistent Shard Name: #{shard_symbol}" if @shards[shard_symbol].nil?
       end
@@ -160,14 +162,15 @@ module Octopus
 
     def current_slave_group=(slave_group_symbol)
       Thread.current[CURRENT_SLAVE_GROUP_KEY] = slave_group_symbol
+      Thread.current[CURRENT_LOAD_BALANCE_OPTIONS_KEY] = nil if slave_group_symbol.nil?
     end
 
-    def current_options
-      Thread.current[CURRENT_OPTIONS_KEY]
+    def current_load_balance_options
+      Thread.current[CURRENT_LOAD_BALANCE_OPTIONS_KEY]
     end
 
-    def current_options=(options)
-      Thread.current[CURRENT_OPTIONS_KEY] = options
+    def current_load_balance_options=(options)
+      Thread.current[CURRENT_LOAD_BALANCE_OPTIONS_KEY] = options
     end
 
     def block
@@ -237,9 +240,9 @@ module Octopus
       @adapters.size > 1
     end
 
-    def run_queries_on_shard(shard, options={}, &_block)
+    def run_queries_on_shard(shard, &_block)
       keeping_connection_proxy(shard) do
-        using_shard(shard, options) do
+        using_shard(shard) do
           yield
         end
       end
@@ -438,7 +441,7 @@ module Octopus
 
     def send_queries_to_selected_slave(method, *args, &block)
       if current_model.replicated || fully_replicated?
-        selected_slave = @slaves_load_balancer.next current_options
+        selected_slave = @slaves_load_balancer.next current_load_balance_options
       else
         selected_slave = Octopus.master_shard
       end
@@ -466,7 +469,7 @@ module Octopus
     # Temporarily switch `current_shard` to the next slave in a slave group and send queries to it
     # while preserving `current_shard`
     def send_queries_to_balancer(balancer, method, *args, &block)
-      send_queries_to_slave(balancer.next(current_options), method, *args, &block)
+      send_queries_to_slave(balancer.next(current_load_balance_options), method, *args, &block)
     end
 
     # Temporarily switch `current_shard` to the specified slave and send queries to it
@@ -493,21 +496,21 @@ module Octopus
     end
 
     # Temporarily switch `current_shard` and run the block
-    def using_shard(shard, options = {}, &_block)
+    def using_shard(shard, &_block)
       older_shard = current_shard
       older_slave_group = current_slave_group
-      older_options = current_options
+      older_load_balance_options = current_load_balance_options
+
 
       begin
         unless current_model && !current_model.allowed_shard?(shard)
           self.current_shard = shard
-          self.current_options = options
         end
         yield
       ensure
         self.current_shard = older_shard
         self.current_slave_group = older_slave_group
-        self.current_options = older_options
+        self.current_load_balance_options = older_load_balance_options
       end
     end
 

data/lib/octopus/slave_group.rb

@@ -6,8 +6,8 @@ module Octopus
       @load_balancer = Octopus.load_balancer.new(slaves_list)
     end
 
-    def next
-      @load_balancer.next
+    def next(options)
+      @load_balancer.next options
     end
   end
 end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.8.5'
+  VERSION = '0.8.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: misha-ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Thiago Pradi