twilio-ruby 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af2bf820a3fb5e86dac192777b9fa9033838f58
-  data.tar.gz: 9c2a731cf45ccc73b532590f8c557facb6831cce
+  metadata.gz: c74ddae744865799fc9de4d040d7e76e03a00af5
+  data.tar.gz: c2c329a9cf5fa999f5f8b5aab65ad2b9eceb1e37
 SHA512:
-  metadata.gz: 3ea412fd75b56cd6c192b945a8cb24539137cab3c1d0efe1a6a9d4d503e3b02f6b06b2a7d1905f6d1d1375209b06fe6c9cd6c12a6c886f6bd2942d4da1d6afaf
-  data.tar.gz: 3b5d3ad04265157711e657703e3768ee1140d58b8a927a3f6b152a16881a86308a95a3dbe1ef85d4e85a3ce1e17e9d728150fdf2cf8d711e99af02bbfe28d5d3
+  metadata.gz: 384d64e79b01344c0e645ba553cf43bedf760d5e392e020cff47adfdbd1bdf1de0cb590a0f9d4819468b8a63a66e914a7832af03685a4f231241b848d7fba000
+  data.tar.gz: d4a1539831a044d612d2fae57b888ee45384208ac68a9af3841e79f438d64eee5cc060c3156a3997ede480303b3edf63b7136f16203e7597ba90bbb17960850e

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 bundler_args: --without development
+
 rvm:
   - ruby-head
   - 2.4.0
@@ -9,5 +10,11 @@ rvm:
   - 2.2.0
   - 2.1
   - 2.0.0
+
 matrix:
   fast_finish: true
+
+before_install:
+  # Bundler on Travis may be too out of date
+  # Update bundler to a recent version.
+  - gem install bundler

data/CHANGES.md

@@ -1,6 +1,10 @@
 twilio-ruby changelog
 =====================
 
+[2017-09-08] Version 5.2.2
+---------------------------
+- Add configurable timeout to HttpClient
+
 [2017-09-01] Version 5.2.1
 ---------------------------
 **Sync**

data/README.md

@@ -1,7 +1,7 @@
 # twilio-ruby
 
 [![Build Status](http://img.shields.io/travis/twilio/twilio-ruby.svg)][travis]
-[![Gem Version](http://img.shields.io/gem/v/twilio-ruby.svg)][gem]
+[![Gem Version](http://img.shields.io/gem/v/twilio-ruby.svg)](https://rubygems.org/gems/twilio-ruby)
 [![Code Quality](http://img.shields.io/codeclimate/github/twilio/twilio-ruby.svg)][codeclimate]
 
 A module for using the Twilio REST API and generating valid [TwiML](http://www.twilio.com/docs/api/twiml/ "TwiML - Twilio Markup Language"). [Click here to read the full documentation.][documentation]
@@ -27,13 +27,13 @@ in-line code documentation here in the library.
 To install using [Bundler][bundler] grab the latest stable version:
 
 ```ruby
-gem 'twilio-ruby', '~> 5.2.1'
+gem 'twilio-ruby', '~> 5.2.2'
 ```
 
 To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
 
 ```bash
-gem install twilio-ruby -v 5.2.1
+gem install twilio-ruby -v 5.2.2
 ```
 
 To build and install the development branch yourself from the latest source:

data/lib/twilio-ruby/http/http_client.rb

@@ -4,14 +4,16 @@ module Twilio
   module HTTP
     class Client
       attr_accessor :adapter
-      attr_reader :last_response, :last_request
+      attr_reader :timeout, :last_response, :last_request
 
-      def initialize(proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil, ssl_ca_file = nil)
+      def initialize(proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil, ssl_ca_file = nil,
+                     timeout: nil)
         @proxy_addr = proxy_addr
         @proxy_port = proxy_port
         @proxy_user = proxy_user
         @proxy_pass = proxy_pass
         @ssl_ca_file = ssl_ca_file
+        @timeout = timeout
         @adapter = Faraday.default_adapter
       end
 
@@ -25,8 +27,8 @@ module Twilio
           if @proxy_addr
             f.proxy '#{@proxy_user}:#{@proxy_pass}@#{@proxy_addr}:#{@proxy_port}'
           end
-          f.options.open_timeout = request.timeout
-          f.options.timeout = request.timeout
+          f.options.open_timeout = request.timeout || @timeout
+          f.options.timeout = request.timeout || @timeout
         end
 
         @last_request = request

data/lib/twilio-ruby/twiml/voice_response.rb

@@ -66,6 +66,9 @@ module Twilio
       # action:: Action URL
       # method:: Action URL method
       # timeout:: Time to wait to gather input
+      # speech_timeout:: Time to wait to gather speech input and it should be either auto or a positive integer.
+      # max_speech_time:: Max allowed time for speech input
+      # profanity_filter:: Profanity Filter on speech
       # finish_on_key:: Finish gather on key
       # num_digits:: Number of digits to collect
       # partial_result_callback:: Partial result callback URL
@@ -74,8 +77,8 @@ module Twilio
       # hints:: Speech recognition hints
       # barge_in:: Stop playing media upon speech
       # keyword_args:: additional attributes
-      def gather(input: nil, action: nil, method: nil, timeout: nil, finish_on_key: nil, num_digits: nil, partial_result_callback: nil, partial_result_callback_method: nil, language: nil, hints: nil, barge_in: nil, **keyword_args)
-        gather = Gather.new(input: input, action: action, method: method, timeout: timeout, finish_on_key: finish_on_key, num_digits: num_digits, partial_result_callback: partial_result_callback, partial_result_callback_method: partial_result_callback_method, language: language, hints: hints, barge_in: barge_in, **keyword_args)
+      def gather(input: nil, action: nil, method: nil, timeout: nil, speech_timeout: nil, max_speech_time: nil, profanity_filter: nil, finish_on_key: nil, num_digits: nil, partial_result_callback: nil, partial_result_callback_method: nil, language: nil, hints: nil, barge_in: nil, **keyword_args)
+        gather = Gather.new(input: input, action: action, method: method, timeout: timeout, speech_timeout: speech_timeout, max_speech_time: max_speech_time, profanity_filter: profanity_filter, finish_on_key: finish_on_key, num_digits: num_digits, partial_result_callback: partial_result_callback, partial_result_callback_method: partial_result_callback_method, language: language, hints: hints, barge_in: barge_in, **keyword_args)
 
         yield(gather) if block_given?
         append(gather)

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-    VERSION = '5.2.1'
+    VERSION = '5.2.2'
 end

data/spec/http/http_client_spec.rb

@@ -6,6 +6,34 @@ describe Twilio::HTTP::Client do
     @client = Twilio::HTTP::Client.new
   end
 
+  it 'should allow setting a global timeout' do
+    @client = Twilio::HTTP::Client.new(timeout: 10)
+    @connection = Faraday::Connection.new
+
+    expect(Faraday).to receive(:new).and_yield(@connection).and_return(@connection)
+    allow_any_instance_of(Faraday::Connection).to receive(:send).and_return(double('response', status: 301, body: {}))
+
+    @client.request('host', 'port', 'GET', 'url', nil, nil, {}, ['a', 'b'])
+
+    expect(@client.timeout).to eq(10)
+    expect(@connection.options.open_timeout).to eq(10)
+    expect(@connection.options.timeout).to eq(10)
+  end
+
+  it 'should allow overriding timeout per request' do
+    @client = Twilio::HTTP::Client.new(timeout: 10)
+    @connection = Faraday::Connection.new
+
+    expect(Faraday).to receive(:new).and_yield(@connection).and_return(@connection)
+    allow_any_instance_of(Faraday::Connection).to receive(:send).and_return(double('response', status: 301, body: {}))
+
+    @client.request('host', 'port', 'GET', 'url', nil, nil, {}, ['a', 'b'], 20)
+
+    expect(@client.timeout).to eq(10)
+    expect(@connection.options.open_timeout).to eq(20)
+    expect(@connection.options.timeout).to eq(20)
+  end
+
   it 'should contain a last response' do
     expect(Faraday).to receive(:new).and_return(Faraday::Connection.new)
     allow_any_instance_of(Faraday::Connection).to receive(:send).and_return(double('response', status: 301, body: {}))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Twilio API Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby