algoliasearch 1.10.0 → 1.11.0

data/algoliasearch.gemspec

@@ -50,17 +50,17 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httpclient>, ["~> 2.7.1"])
+      s.add_runtime_dependency(%q<httpclient>, ["~> 2.8.2"])
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
       s.add_development_dependency "travis"
       s.add_development_dependency "rake"
       s.add_development_dependency "rdoc"
     else
-      s.add_dependency(%q<httpclient>, ["~> 2.4"])
+      s.add_dependency(%q<httpclient>, ["~> 2.8.2"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
     end
   else
-    s.add_dependency(%q<httpclient>, ["~> 2.4"])
+    s.add_dependency(%q<httpclient>, ["~> 2.8.2"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
   end
 end

data/lib/algolia/client.rb

@@ -333,12 +333,14 @@ module Algolia
       end
       receive_timeout = type == :search ? @search_timeout : @receive_timeout
 
-      (type == :write ? @hosts : @search_hosts).size.times do |i|
+      thread_local_hosts(type != :write).each_with_index do |host, i|
         connect_timeout += 2 if i == 2
         send_timeout += 10 if i == 2
         receive_timeout += 10 if i == 2
 
-        host = thread_local_hosts(type != :write, connect_timeout, send_timeout, receive_timeout)[i]
+        host[:session].connect_timeout = connect_timeout
+        host[:session].send_timeout = send_timeout
+        host[:session].receive_timeout = receive_timeout
         begin
           return perform_request(host[:session], host[:base_url] + uri, method, data)
         rescue AlgoliaProtocolError => e
@@ -370,27 +372,16 @@ module Algolia
     private
 
     # This method returns a thread-local array of sessions
-    #
-    # Since the underlying httpclient library resets the connections pool
-    # if you change any of its attributes, we cannot change the timeout
-    # of an HTTP session dynamically. That being said, having 1 pool per
-    # timeout appears to be the only acceptable solution
-    def thread_local_hosts(read, connect_timeout, send_timeout, receive_timeout)
-      thread_local_var = read ? :algolia_search_hosts : :algolia_hosts
-      Thread.current[thread_local_var] ||= {}
-      Thread.current[thread_local_var]["#{self.hash}:#{connect_timeout}-#{send_timeout}-#{receive_timeout}"] ||= (read ? search_hosts : hosts).map do |host|
+    def thread_local_hosts(read)
+      Thread.current[read ? :algolia_search_hosts : :algolia_hosts] ||= (read ? search_hosts : hosts).map do |host|
         client = HTTPClient.new
         client.ssl_config.ssl_version = @ssl_version if @ssl && @ssl_version
-        hinfo = {
+        client.transparent_gzip_decompression = true
+        client.ssl_config.add_trust_ca File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'resources', 'ca-bundle.crt'))
+        {
           :base_url => "http#{@ssl ? 's' : ''}://#{host}",
           :session => client
         }
-        hinfo[:session].transparent_gzip_decompression = true
-        hinfo[:session].connect_timeout = connect_timeout
-        hinfo[:session].send_timeout = send_timeout
-        hinfo[:session].receive_timeout = receive_timeout
-        hinfo[:session].ssl_config.add_trust_ca File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'resources', 'ca-bundle.crt'))
-        hinfo
       end
     end
 

data/lib/algolia/version.rb

@@ -1,3 +1,3 @@
 module Algolia
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

data/lib/algoliasearch.rb

@@ -8,7 +8,14 @@ require "rubygems"
 require "bundler/setup"
 
 require 'json'
-require 'httpclient'
+if !defined?(RUBY_ENGINE) && defined?(RUBY_VERSION) && RUBY_VERSION == '1.8.7'
+  # work-around a limitation from nahi/httpclient, using the undefined RUBY_ENGINE constant
+  RUBY_ENGINE = 'ruby1.8'
+  require 'httpclient'
+  Object.send(:remove_const, :RUBY_ENGINE)
+else
+  require 'httpclient'
+end
 require 'date'
 require 'cgi'
 

data/spec/client_spec.rb

@@ -738,7 +738,13 @@ describe 'Client' do
     key = Algolia.generate_secured_api_key('my_api_key', :tagFilters => '(public,user1)')
     key.should eq(Base64.encode64("#{OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), 'my_api_key', 'tagFilters=%28public%2Cuser1%29')}tagFilters=%28public%2Cuser1%29").gsub("\n", ''))
     key = Algolia.generate_secured_api_key('182634d8894831d5dbce3b3185c50881', :tagFilters => '(public,user1)', :userToken => 42)
-    key.should eq('OGYwN2NlNTdlOGM2ZmM4MjA5NGM0ZmYwNTk3MDBkNzMzZjQ0MDI3MWZjNTNjM2Y3YTAzMWM4NTBkMzRiNTM5YnRhZ0ZpbHRlcnM9JTI4cHVibGljJTJDdXNlcjElMjkmdXNlclRva2VuPTQy')
+    # in ruby 1.8.7, the map iteration doesn't have the same ordering,
+    # making the hash slightly different
+    expected_keys = [
+      'ZDU0N2YzZjA3NGZkZGM2OTUxNzY3NzhkZDI3YWFkMjhhNzU5OTBiOGIyYTgyYzFmMjFjZTY4NTA0ODNiN2I1ZnVzZXJUb2tlbj00MiZ0YWdGaWx0ZXJzPSUyOHB1YmxpYyUyQ3VzZXIxJTI5',
+      'OGYwN2NlNTdlOGM2ZmM4MjA5NGM0ZmYwNTk3MDBkNzMzZjQ0MDI3MWZjNTNjM2Y3YTAzMWM4NTBkMzRiNTM5YnRhZ0ZpbHRlcnM9JTI4cHVibGljJTJDdXNlcjElMjkmdXNlclRva2VuPTQy'
+    ]
+    expected_keys.include?(key).should eq(true)
   end
 
   it 'Check attributes multipleQueries' do
@@ -894,23 +900,25 @@ describe 'Client' do
     @index.search_synonyms('')['nbHits'].should eq(0)
   end
 
-  context 'DNS timeout' do
-    before(:all) do
-      @client = Algolia::Client.new :application_id => ENV['ALGOLIA_APPLICATION_ID'], :api_key => ENV['ALGOLIA_API_KEY'],
-        :hosts => [
-          "#{ENV['ALGOLIA_APPLICATION_ID']}.algolia.biz",
-          "#{ENV['ALGOLIA_APPLICATION_ID']}.algolia.net",
-          "#{ENV['ALGOLIA_APPLICATION_ID']}-1.algolianet.com",
-          "#{ENV['ALGOLIA_APPLICATION_ID']}-2.algolianet.com",
-          "#{ENV['ALGOLIA_APPLICATION_ID']}-3.algolianet.com"
-        ],
-        :connect_timeout => 5
-    end
+  if ENV['TRAVIS'].to_s != "true"
+    context 'DNS timeout' do
+      before(:all) do
+        @client = Algolia::Client.new :application_id => ENV['ALGOLIA_APPLICATION_ID'], :api_key => ENV['ALGOLIA_API_KEY'],
+          :hosts => [
+            "#{ENV['ALGOLIA_APPLICATION_ID']}.algolia.biz",
+            "#{ENV['ALGOLIA_APPLICATION_ID']}.algolia.net",
+            "#{ENV['ALGOLIA_APPLICATION_ID']}-1.algolianet.com",
+            "#{ENV['ALGOLIA_APPLICATION_ID']}-2.algolianet.com",
+            "#{ENV['ALGOLIA_APPLICATION_ID']}-3.algolianet.com"
+          ],
+          :connect_timeout => 5
+      end
 
-    it "should fallback to the 2nd host after a few seconds" 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
+      it "should fallback to the 2nd host after a few seconds" 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
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Ruby client for the algolia.com REST API