algoliasearch 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6499852364a9df2e8315a4fd8dd39f990aeddd24
-  data.tar.gz: f7adb2fa84f3c2ba9b777687776a6cb62c4606d1
+  metadata.gz: 4050df50fa8668d5c9c873c8783a195bd575dd6f
+  data.tar.gz: 214b9bc3a0afc498470fe6d21fab6a3893ea138d
 SHA512:
-  metadata.gz: 2ea07f4064258fc0e80ba6d5f3aac45e0b53f7ab16f601c294d8919864639be0c49c5c270aad2311c04efd4772846cc2f669217baf3ef732a4002da4cdfb495e
-  data.tar.gz: 1198f1d56a57cbfd8d00d2bc5644e9c762c6d55b403fae3b693fe85e2b7942f1eeb2b42ee7103a86c418512b5d03cd5c1f5559e75e5871a4768927f844138b0c
+  metadata.gz: d92b856c6c07c952637e11c4108c7057f844bc8a0eab04e53a3aa9a0200124036220e8808db600892d1e63062ea8147210cdd41df33abf8eb3ad07c98d550688
+  data.tar.gz: 534342154bf113bc6f65385c875907f0f90c48c464b73dbfb004372c3d3da57a67d5f3dd66f1c4c03eb97b065b85d371df8c3758cbaf1ff66cc7459a7559527c

data/ChangeLog

@@ -1,5 +1,8 @@
 CHANGELOG
 
+2016-12-06
+      * Allow for multiple clients on different app ids on the same thread
+
 2016-12-05
       * Fix client scoped methods
 

data/lib/algolia/client.rb

@@ -41,6 +41,11 @@ module Algolia
       }
     end
 
+    def destroy
+      Thread.current["algolia_search_hosts_#{application_id}"] = nil
+      Thread.current["algolia_hosts_#{application_id}"] = nil
+    end
+
     #
     # Initialize a new index
     #
@@ -338,6 +343,10 @@ module Algolia
         send_timeout += 10 if i == 2
         receive_timeout += 10 if i == 2
 
+        thread_index_key = type != :write ? "algolia_search_host_index_#{application_id}" : "algolia_host_index_#{application_id}"
+        Thread.current[thread_index_key] = host[:index]
+        host[:last_call] = Time.now.to_i
+
         host[:session].connect_timeout = connect_timeout
         host[:session].send_timeout = send_timeout
         host[:session].receive_timeout = receive_timeout
@@ -374,16 +383,29 @@ module Algolia
 
     # This method returns a thread-local array of sessions
     def thread_local_hosts(read)
-      Thread.current[read ? :algolia_search_hosts : :algolia_hosts] ||= (read ? search_hosts : hosts).map do |host|
+      thread_hosts_key = read ? "algolia_search_hosts_#{application_id}" : "algolia_hosts_#{application_id}"
+      Thread.current[thread_hosts_key] ||= (read ? search_hosts : hosts).each_with_index.map do |host, i|
         client = HTTPClient.new
         client.ssl_config.ssl_version = @ssl_version if @ssl && @ssl_version
         client.transparent_gzip_decompression = true
         client.ssl_config.add_trust_ca File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'resources', 'ca-bundle.crt'))
         {
+          :index => i,
           :base_url => "http#{@ssl ? 's' : ''}://#{host}",
-          :session => client
+          :session => client,
+          :last_call => nil
         }
       end
+      hosts = Thread.current[thread_hosts_key]
+      thread_index_key = read ? "algolia_search_host_index_#{application_id}" : "algolia_host_index_#{application_id}"
+      current_host = Thread.current[thread_index_key].to_i # `to_i` to ensure first call is 0
+      if current_host != 0 && hosts[current_host][:last_call].to_i < Time.now.to_i - 60
+        # the current_host is not the first one and we've been using it for less than a minute; continue doing so
+        first = hosts[current_host]
+        [first] + hosts.reject { |h| h[:index] == 0 || h == first } + hosts.select { |h| h[:index] == 0 }
+      else
+        hosts
+      end
     end
 
     def perform_request(session, url, method, data)
@@ -649,7 +671,8 @@ module Algolia
 
   # Used mostly for testing. Lets you delete the api key global vars.
   def Algolia.destroy
-    @@client = Thread.current[:algolia_hosts] = Thread.current[:algolia_search_hosts] = nil
+    @@client.destroy unless @@client.nil?
+    @@client = nil
     self
   end
 

data/lib/algolia/version.rb

@@ -1,3 +1,3 @@
 module Algolia
-  VERSION = "1.12.2"
+  VERSION = "1.12.3"
 end

data/spec/client_spec.rb

@@ -997,6 +997,15 @@ describe 'Client' do
         @client.list_indexes # fallback on the second host after 5 sec (connection timeout)
         expect(start_time.to_i + 5).to be <= Time.now.to_i + 1
       end
+
+      it "should re-use the working (2nd) host after the 1st one failed" do
+        start_time = Time.now
+        @client.list_indexes # fallback on the second host after 5 sec (connection timeout)
+        expect(start_time.to_i + 5).to be <= Time.now.to_i + 1
+        start_time = Time.now
+        @client.list_indexes # re-use the 2nd one
+        expect(start_time.to_i).to be <= Time.now.to_i + 1
+      end
     end
   end
 

data/spec/mock_spec.rb

@@ -7,7 +7,10 @@ describe 'With a mocked client' do
 
   before(:each) do
     WebMock.enable!
-    Thread.current[:algolia_hosts] = Thread.current[:algolia_search_hosts] = nil # reset session objects
+    # reset session objects
+    app_id = Algolia.client.application_id
+    Thread.current["algolia_hosts_#{app_id}"] = nil
+    Thread.current["algolia_search_hosts_#{app_id}"] = nil
   end
 
   it "should add a simple object" do

data/spec/stub_spec.rb

@@ -6,7 +6,10 @@ describe 'With a rate limited client' do
 
   before(:each) do
     WebMock.enable!
-    Thread.current[:algolia_hosts] = Thread.current[:algolia_search_hosts] = nil
+    # reset session objects
+    app_id = Algolia.client.application_id
+    Thread.current["algolia_hosts_#{app_id}"] = nil
+    Thread.current["algolia_search_hosts_#{app_id}"] = nil
   end
 
   it "should pass the right headers" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient