twilio-ruby 5.0.0.rc26 → 5.0.0

data/lib/twilio-ruby/util.rb

@@ -1,7 +1,7 @@
 module Twilio
   module Util
     def url_encode(hash)
-      hash.to_a.map {|p| p.map {|e| CGI.escape get_string(e)}.join '='}.join '&'
+      hash.to_a.map { |p| p.map { |e| CGI.escape get_string(e) }.join '=' }.join '&'
     end
 
     def get_string(obj)

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-    VERSION = '5.0.0.rc26'
+  VERSION = '5.0.0'.freeze
 end

data/spec/framework/serialize_spec.rb

@@ -2,59 +2,47 @@ require 'spec_helper'
 
 describe Twilio do
   describe 'prefixed_collapsible_map' do
-
     it 'should serialize nil' do
       actual = Twilio.prefixed_collapsible_map(nil, 'Prefix')
       expect(actual).to eq({})
     end
 
     it 'should serialize a single key' do
-      actual = Twilio.prefixed_collapsible_map({
-        'foo' => 'bar'
-      }, 'Prefix')
-      expect(actual).to eq({
-        'Prefix.foo' => 'bar'
-      })
+      actual = Twilio.prefixed_collapsible_map({ 'foo' => 'bar' }, 'Prefix')
+      expect(actual).to eq('Prefix.foo' => 'bar')
     end
 
     it 'should serialize nested key' do
       actual = Twilio.prefixed_collapsible_map({
-        'foo' => {
-          'bar' => 'baz'
-        }
-      }, 'Prefix')
-      expect(actual).to eq({
-        'Prefix.foo.bar' => 'baz'
-      })
+                                                 'foo' => {
+                                                   'bar' => 'baz'
+                                                 }
+                                               }, 'Prefix')
+      expect(actual).to eq('Prefix.foo.bar' => 'baz')
     end
 
     it 'should serialize multiple keys' do
       actual = Twilio.prefixed_collapsible_map({
-        'watson' => {
-          'language' => 'en',
-          'alice' => 'bob'
-        },
-          'foo' => 'bar'
-      }, 'Prefix')
-      expect(actual).to eq({
-        'Prefix.watson.language' => 'en',
-        'Prefix.watson.alice' => 'bob',
-        'Prefix.foo' => 'bar'
-      })
+                                                 'watson' => {
+                                                   'language' => 'en',
+                                                   'alice' => 'bob'
+                                                 },
+                                                 'foo' => 'bar'
+                                               }, 'Prefix')
+      expect(actual).to eq('Prefix.watson.language' => 'en',
+                           'Prefix.watson.alice' => 'bob',
+                           'Prefix.foo' => 'bar')
     end
 
     it 'should serialize list' do
       actual = Twilio.prefixed_collapsible_map(['foo', 'bar'], 'Prefix')
       expect(actual).to eq({})
     end
-
-
   end
 
   describe 'serialize_object' do
-
     it 'should jsonify hashes' do
-      actual = Twilio.serialize_object({twilio: "rocks"})
+      actual = Twilio.serialize_object({ twilio: "rocks" })
       expect(actual).to eq('{"twilio":"rocks"}')
     end
 
@@ -67,6 +55,5 @@ describe Twilio do
       actual = Twilio.serialize_object(123)
       expect(actual).to eq(123)
     end
-
   end
 end

data/spec/holodeck/holodeck.rb

@@ -21,10 +21,10 @@ class Holodeck
     end
 
     def ==(other)
-      method.upcase == other.method.upcase &&
-      url == other.url &&
-      params == other.params &&
-      data == other.data
+      method.casecmp(other.method.upcase).zero? &&
+        url == other.url &&
+        params == other.params &&
+        data == other.data
     end
 
     def to_s
@@ -43,7 +43,7 @@ class Holodeck
     @response = response
   end
 
-  def request(host, port, method, url, params={}, data={}, headers={}, auth=nil, timeout=nil)
+  def request(host, port, method, url, params = {}, data = {}, headers = {}, auth = nil, _timeout = nil)
     @requests << Request.new(
       method: method,
       url: url,
@@ -52,7 +52,7 @@ class Holodeck
       headers: headers,
       auth: auth
     )
-    return @response
+    @response
   end
 
   def has_request?(request)

data/spec/jwt/access_token_spec.rb

@@ -128,9 +128,3 @@ describe Twilio::JWT::AccessToken do
     end
   end
 end
-
-
-
-
-
-

data/spec/jwt/client_capability_spec.rb

@@ -74,7 +74,7 @@ describe Twilio::JWT::ClientCapability do
     it 'complete payload' do
       @incomingScope = Twilio::JWT::ClientCapability::IncomingClientScope.new('test-client-name')
       @clientCapability.add_scope(@incomingScope)
-      payload, _ = ::JWT.decode @clientCapability.to_s, 'authToken', true, {:algorithm=>'HS256'}
+      payload, _ = ::JWT.decode(@clientCapability.to_s, 'authToken', true, { algorithm: 'HS256' })
       escope = 'scope:client:incoming?clientName=test-client-name'
       expect(payload['iss']).to eq('accountSid')
       expect(payload['scope']).to eq(escope)
@@ -99,6 +99,6 @@ describe Twilio::JWT::Scope do
       include Twilio::JWT::Scope
     end
     @dummyScope = DummyScope.new
-    expect{@dummyScope._generate_payload}.to raise_error(RuntimeError)
+    expect { @dummyScope._generate_payload }.to raise_error(RuntimeError)
   end
-end
+end

data/spec/jwt/task_router_spec.rb

@@ -42,25 +42,23 @@ describe 'TaskRouter ' do
     describe 'policy' do
       it 'initialize' do
         @policy = Twilio::JWT::TaskRouterCapability::Policy.new('test-url',
-                                          'GET',
-                                          true,
-                                          {'test-post-key'=>'test-post-value'},
-                                          {'test-query-key'=>'test-query-value'}
-        )
+                                                                'GET',
+                                                                true,
+                                                                { 'test-post-key' => 'test-post-value' },
+                                                                'test-query-key' => 'test-query-value')
 
-        payload = Hash[@policy._generate_payload.map{ |k, v| [k.to_s, v] }]
+        payload = Hash[@policy._generate_payload.map { |k, v| [k.to_s, v] }]
         check_policy('GET',
                      'test-url',
                      payload,
-                     post_filter: {'test-post-key'=>'test-post-value'},
-                     query_filter: {'test-query-key'=>'test-query-value'},
-                     allow: true )
+                     post_filter: { 'test-post-key' => 'test-post-value' },
+                     query_filter: { 'test-query-key' => 'test-query-value' },
+                     allow: true)
       end
     end
 
     describe Twilio::JWT::TaskRouterCapability::TaskRouterUtils do
       describe 'urls' do
-
         it 'workspaces' do
           expected_url = 'https://taskrouter.twilio.com/v1/Workspaces'
           expect(Twilio::JWT::TaskRouterCapability::TaskRouterUtils.workspaces).to eq(expected_url)
@@ -150,28 +148,25 @@ describe 'TaskRouter ' do
           expected_url = 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Workers/WT123/Reservations/**'
           expect(Twilio::JWT::TaskRouterCapability::TaskRouterUtils.all_reservations('WK123', 'WT123')).to eq(expected_url)
         end
-
       end
 
       describe 'default policies' do
         it 'default web_socket_policies' do
           @policies = Twilio::JWT::TaskRouterCapability::TaskRouterUtils.web_socket_policies('AC123', 'CI123')
-          get, post = @policies.map{|policy| policy._generate_payload}
-          check_policy('GET', 'https://event-bridge.twilio.com/v1/wschannels/AC123/CI123', Hash[get.map{ |k, v| [k.to_s, v]}])
-          check_policy('POST', 'https://event-bridge.twilio.com/v1/wschannels/AC123/CI123', Hash[post.map{ |k, v| [k.to_s, v]}])
+          get, post = @policies.map(&:_generate_payload)
+          check_policy('GET', 'https://event-bridge.twilio.com/v1/wschannels/AC123/CI123', Hash[get.map { |k, v| [k.to_s, v] }])
+          check_policy('POST', 'https://event-bridge.twilio.com/v1/wschannels/AC123/CI123', Hash[post.map { |k, v| [k.to_s, v] }])
         end
 
         it 'default worker policies' do
           @policies = Twilio::JWT::TaskRouterCapability::TaskRouterUtils.worker_policies('WK123', 'WT123')
-          payload = @policies.map{|policy| policy._generate_payload}
-          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Activities', Hash[payload[0].map{ |k, v| [k.to_s, v]}])
-          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Tasks/**', Hash[payload[1].map{ |k, v| [k.to_s, v]}])
-          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Workers/WT123/Reservations/**', Hash[payload[2].map{ |k, v| [k.to_s, v]}])
-          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Workers/WT123', Hash[payload[3].map{ |k, v| [k.to_s, v]}])
+          payload = @policies.map(&:_generate_payload)
+          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Activities', Hash[payload[0].map { |k, v| [k.to_s, v] }])
+          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Tasks/**', Hash[payload[1].map { |k, v| [k.to_s, v] }])
+          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Workers/WT123/Reservations/**', Hash[payload[2].map { |k, v| [k.to_s, v] }])
+          check_policy('GET', 'https://taskrouter.twilio.com/v1/Workspaces/WK123/Workers/WT123', Hash[payload[3].map { |k, v| [k.to_s, v] }])
         end
       end
     end
   end
 end
-
-

data/spec/rack/twilio_webhook_authentication_spec.rb

@@ -3,36 +3,36 @@ require 'rack/mock'
 
 describe Rack::TwilioWebhookAuthentication do
   before do
-    @app = lambda {|env| [200, {'Content-Type' => 'text/plain'}, ['Hello']] }
+    @app = ->(_env) { [200, { 'Content-Type' => 'text/plain' }, ['Hello']] }
   end
 
   describe 'new' do
     it 'should initialize with an app, auth token and a path' do
-      expect {
+      expect do
         Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/)
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it 'should initialize with an app, auth token and paths' do
-      expect {
+      expect do
         Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/, /\/sms/)
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it 'should initialize with an app, dynamic token and paths' do
-      expect {
+      expect do
         Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/, /\/sms/)
-      }.not_to raise_error
+      end.not_to raise_error
     end
   end
 
   describe 'calling against one path with dynamic auth token' do
     it 'should allow a request through if it validates' do
       auth_token = 'qwerty'
-      account_sid = 12345
+      account_sid = 12_345
       expect_any_instance_of(Rack::Request).to receive(:post?).and_return(true)
-      expect_any_instance_of(Rack::Request).to receive(:POST).and_return({'AccountSid' => account_sid})
-      @middleware = Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/) { |asid| auth_token}
+      expect_any_instance_of(Rack::Request).to receive(:POST).and_return({ 'AccountSid' => account_sid })
+      @middleware = Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/) { |asid| auth_token }
       request_validator = double('RequestValidator')
       expect(Twilio::Security::RequestValidator).to receive(:new).with(auth_token).and_return(request_validator)
       expect(request_validator).to receive(:validate).and_return(true)
@@ -44,9 +44,7 @@ describe Rack::TwilioWebhookAuthentication do
 
   describe 'calling against one path' do
     before do
-      @middleware = Rack::TwilioWebhookAuthentication.new(
-        @app, 'ABC', /\/voice/
-      )
+      @middleware = Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/)
     end
 
     it 'should not intercept when the path doesn\'t match' do
@@ -77,9 +75,7 @@ describe Rack::TwilioWebhookAuthentication do
 
   describe 'calling against many paths' do
     before do
-      @middleware = Rack::TwilioWebhookAuthentication.new(
-        @app, 'ABC', /\/voice/, /\/sms/
-      )
+      @middleware = Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/, /\/sms/)
     end
 
     it 'should not intercept when the path doesn\'t match' do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bundler'
 Bundler.setup
 
-Dir.glob(File.expand_path("../support/**/*.rb", __FILE__), &method(:require))
+Dir.glob(File.expand_path('../support/**/*.rb', __FILE__), &method(:require))
 
 require_relative './holodeck/holodeck.rb'
 require_relative './holodeck/hologram.rb'
@@ -17,7 +17,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    @client = Twilio::REST::Client.new('AC' + 'a'*32, 'AUTHTOKEN')
+    @client = Twilio::REST::Client.new('AC' + 'a' * 32, 'AUTHTOKEN')
     @holodeck = Holodeck.new
     @client.http_client = @holodeck
   end

data/spec/support/fakeweb.rb

@@ -1,2 +1,2 @@
 require 'fakeweb'
-FakeWeb.allow_net_connect = false
+FakeWeb.allow_net_connect = false

data/spec/twiml/voice_response_spec.rb

@@ -43,8 +43,9 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Say></Say></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Say/></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Say></Say></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Say/></Response>'))
     end
 
     it 'should allow populated say' do
@@ -90,8 +91,9 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play></Play></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play/></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play></Play></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play/></Response>'))
     end
 
     it 'should play hello' do
@@ -114,8 +116,9 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play digits="w123"></Play></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play digits="w123"/></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play digits="w123"></Play></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Play digits="w123"/></Response>'))
     end
   end
 
@@ -129,21 +132,21 @@ describe Twilio::TwiML::VoiceResponse do
 
     it 'should allow action and method' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.record action: 'example.com', method: 'GET'
+      r.record(action: 'example.com', method: 'GET')
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Record action="example.com" method="GET"/></Response>')
     end
 
     it 'should allow max_length, finish_on_key, and timeout' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.record timeout: 4, finish_on_key: '#', max_length: 30
+      r.record(timeout: 4, finish_on_key: '#', max_length: 30)
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Record finishOnKey="#" maxLength="30" timeout="4"/></Response>')
     end
 
     it 'should allow transcribe' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.record transcribe_callback: 'example.com'
+      r.record(transcribe_callback: 'example.com')
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Record transcribeCallback="example.com"/></Response>')
     end
@@ -156,20 +159,21 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect></Redirect></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect/></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect></Redirect></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect/></Response>'))
     end
 
     it 'should allow method' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.redirect 'example.com', method: 'POST'
+      r.redirect('example.com', method: 'POST')
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect method="POST">example.com</Redirect></Response>')
     end
 
     it 'should allow method and params' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.redirect 'example.com?id=34&action=hey', method: 'POST'
+      r.redirect('example.com?id=34&action=hey', method: 'POST')
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Redirect method="POST">example.com?id=34&amp;action=hey</Redirect></Response>')
     end
@@ -209,8 +213,9 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Sms></Sms></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Sms/></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Sms></Sms></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Sms/></Response>'))
     end
 
     it 'should allow SMS body' do
@@ -222,7 +227,7 @@ describe Twilio::TwiML::VoiceResponse do
 
     it 'should allow to, from, action, and status_callback' do
       r = Twilio::TwiML::VoiceResponse.new
-      r.sms('Hello, World', to: 1231231234, from: 3453453456, status_callback: 'example.com?id=34&action=hey')
+      r.sms('Hello, World', to: 1_231_231_234, from: 3_453_453_456, status_callback: 'example.com?id=34&action=hey')
 
       expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Sms from="3453453456" statusCallback="example.com?id=34&amp;action=hey" to="1231231234">Hello, World</Sms></Response>')
     end
@@ -317,7 +322,7 @@ describe Twilio::TwiML::VoiceResponse do
 
     it 'should allow Enqueue.task with a dictionary and appending Enqueue' do
       e = Twilio::TwiML::Enqueue.new(nil, workflow_sid: '123123123')
-      e.task({account_sid: 'AC123123123'})
+      e.task({ account_sid: 'AC123123123' })
 
       r = Twilio::TwiML::VoiceResponse.new
       r.append(e)
@@ -413,8 +418,9 @@ describe Twilio::TwiML::VoiceResponse do
 
       # For Ruby 2.0, 2.1, 2.2 both opening and closing tags are generated
       # Ruby 2.4 generates an empty tag
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Client></Client></Dial></Response>')
-                    .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Client/></Dial></Response>'))
+      expect(r.to_s)
+        .to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Client></Client></Dial></Response>')
+        .or(eq('<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Client/></Dial></Response>'))
     end
 
     it 'should allow populated Dial.client' do
@@ -455,7 +461,14 @@ describe Twilio::TwiML::VoiceResponse do
       r = Twilio::TwiML::VoiceResponse.new
       r.append(g)
 
-      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?><Response><Gather><Say>Hey</Say><Play>hey.mp3</Play><Pause/></Gather></Response>')
+      expect(r.to_s).to eq('<?xml version="1.0" encoding="UTF-8"?>' \
+                             '<Response>' \
+                               '<Gather>' \
+                                 '<Say>Hey</Say>' \
+                                 '<Play>hey.mp3</Play>' \
+                                 '<Pause/>' \
+                               '</Gather>' \
+                             '</Response>')
     end
   end
 end