swiftype 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11f2ce09ccdf271510c73431424c332a41182b9
-  data.tar.gz: e83507c697bbca3b65df19a806b9a99d93881d2b
+  metadata.gz: 13981a414b87f3820b0561ce55e22014311c1766
+  data.tar.gz: 1f68d66bba5aea0b1d5beeed4a253deabd942502
 SHA512:
-  metadata.gz: 0cafb2792d12bdc1bbfef1e814c9c050a88318b17252e149f2caf989bc8a2baeeb5bd28a901cb46f17a7ef47d924195a8fe68dd230c5c428ca80585e2e14d814
-  data.tar.gz: 51c46e6e9f9bdc2f2055338bb5bb6e552908e177bbbf9c2a4fdf23c286da0e5f6f8ce16f3d13fb025c259ae3538695c954651e0192e25b8bd600d6eac87be7bf
+  metadata.gz: ec53f7d6df041432268ca9061bb3a49aab3a170a23b43f2d9c4bd0b2e1ea75cf1eac8b13e6d7ecc8de8195a7c4fd3860e206c2c7a28f9766f152ebb0c571fb04
+  data.tar.gz: 1ca58366f50297910aeb7f3086f31c4c561db38ec4c820dd30abcad36eb98e4c8260d16ccd785880c9f4d5a3b46e6f67844e62b2c975938110bdbcea91eb441f

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 script: rspec
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-19mode
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby
+jdk:
+  - oraclejdk8
 
 before_install:
   - gem update --system

data/lib/swiftype/client.rb

@@ -5,6 +5,8 @@ require 'swiftype/request'
 module Swiftype
   # API client for the {Swiftype API}[https://swiftype.com/documentation/overview].
   class Client
+    DEFAULT_TIMEOUT = 15
+
     include Swiftype::Request
 
     def self.configure(&block)
@@ -17,8 +19,8 @@ module Swiftype
     # @param options [Hash] a hash of configuration options that will override what is set on the Swiftype class.
     # @option options [String] :api_key an API Key to use for this client
     # @option options [String] :platform_access_token a user's access token, will be used instead of API key for authenticating requests
-    # @option options [Numeric] :overall_timeout overall timeout for requests in seconds
-    # @option options [Numeric] :open_timeout the number of seconds Net::HTTP
+    # @option options [Numeric] :overall_timeout overall timeout for requests in seconds (default: 15s)
+    # @option options [Numeric] :open_timeout the number of seconds Net::HTTP (default: 15s)
     #   will wait while opening a connection before raising a Timeout::Error
 
     def initialize(options={})
@@ -34,11 +36,11 @@ module Swiftype
     end
 
     def open_timeout
-      @options[:open_timeout]
+      @options[:open_timeout] || DEFAULT_TIMEOUT
     end
 
     def overall_timeout
-      @options[:overall_timeout].to_f
+      (@options[:overall_timeout] || DEFAULT_TIMEOUT).to_f
     end
 
 

data/lib/swiftype/request.rb

@@ -53,30 +53,28 @@ module Swiftype
     #
     # @raise [Timeout::Error] when the timeout expires
     def request(method, path, params={})
-      uri = URI.parse("#{Swiftype.endpoint}#{path}")
-
-      request = build_request(method, uri, params)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = open_timeout
-
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.ca_file = File.join(File.dirname(__FILE__), '..', 'data', 'ca-bundle.crt')
-      end
-
-      response = nil
       Timeout.timeout(overall_timeout) do
+        uri = URI.parse("#{Swiftype.endpoint}#{path}")
+
+        request = build_request(method, uri, params)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = open_timeout
+        http.read_timeout = overall_timeout
+
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http.ca_file = File.join(File.dirname(__FILE__), '..', 'data', 'ca-bundle.crt')
+          http.ssl_timeout = open_timeout
+        end
+
         response = http.request(request)
+        handle_errors(response)
+        JSON.parse(response.body) if response.body && response.body.strip != ''
       end
-
-      handle_errors(response)
-
-      JSON.parse(response.body) if response.body && response.body.strip != ''
     end
 
     private
-
     def handle_errors(response)
       case response
       when Net::HTTPSuccess

data/lib/swiftype/version.rb

@@ -1,3 +1,3 @@
 module Swiftype
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/client_spec.rb

@@ -93,8 +93,8 @@ describe Swiftype::Client do
         context 'without timeout specified' do
           let(:options) { Hash.new }
           it 'omits the option' do
-            expect(options_client.overall_timeout).to eq(0.0)
-            expect(Timeout).to receive(:timeout).with(0.0).and_call_original
+            expect(options_client.overall_timeout).to eq(Swiftype::Client::DEFAULT_TIMEOUT.to_f)
+            expect(Timeout).to receive(:timeout).with(Swiftype::Client::DEFAULT_TIMEOUT.to_f).and_call_original
             VCR.use_cassette(:engine_search) do
               options_client.search(engine_slug, 'cat')
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swiftype
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Quin Hoxie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Official gem for accessing the Swiftype Search API