twilio-ruby 5.0.0.alpha1 → 5.0.0.rc2

data/spec/integration/trunking/v1/trunk/phone_number_spec.rb

@@ -2,19 +2,19 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 require 'spec_helper.rb'
 
 describe 'PhoneNumber' do
   it "can fetch" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                          .phone_numbers("PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").fetch()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -63,21 +63,21 @@ describe 'PhoneNumber' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                                 .phone_numbers("PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").fetch()
-
+    
     expect(actual).to_not eq(nil)
   end
 
   it "can delete" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                          .phone_numbers("PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").delete()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -91,21 +91,21 @@ describe 'PhoneNumber' do
         204,
       nil,
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                                 .phone_numbers("PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").delete()
-
+    
     expect(actual).to eq(true)
   end
 
   it "can create" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                          .phone_numbers.create(phone_number_sid: "PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {
         'PhoneNumberSid' => "PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
     }
@@ -157,21 +157,21 @@ describe 'PhoneNumber' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                                 .phone_numbers.create(phone_number_sid: "PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
-
+    
     expect(actual).to_not eq(nil)
   end
 
   it "can read" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                          .phone_numbers.list()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -233,10 +233,10 @@ describe 'PhoneNumber' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                                 .phone_numbers.list()
-
+    
     expect(actual).to_not eq(nil)
   end
 
@@ -258,10 +258,10 @@ describe 'PhoneNumber' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                                 .phone_numbers.list()
-
+    
     expect(actual).to_not eq(nil)
   end
 end

data/spec/integration/trunking/v1/trunk_spec.rb

@@ -2,18 +2,18 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 require 'spec_helper.rb'
 
 describe 'Trunk' do
   it "can fetch" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").fetch()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -52,19 +52,19 @@ describe 'Trunk' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").fetch()
-
+    
     expect(actual).to_not eq(nil)
   end
 
   it "can delete" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").delete()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -78,19 +78,19 @@ describe 'Trunk' do
         204,
       nil,
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").delete()
-
+    
     expect(actual).to eq(true)
   end
 
   it "can create" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks.create()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -129,19 +129,19 @@ describe 'Trunk' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks.create()
-
+    
     expect(actual).to_not eq(nil)
   end
 
   it "can read" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks.list()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -193,9 +193,9 @@ describe 'Trunk' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks.list()
-
+    
     expect(actual).to_not eq(nil)
   end
 
@@ -217,19 +217,19 @@ describe 'Trunk' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks.list()
-
+    
     expect(actual).to_not eq(nil)
   end
 
   it "can update" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
-
+    
     expect {
       @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").update()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
     values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
@@ -268,9 +268,9 @@ describe 'Trunk' do
       }
       ]
     ))
-
+    
     actual = @client.trunking.v1.trunks("TRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").update()
-
+    
     expect(actual).to_not eq(nil)
   end
 end

data/spec/rack/twilio_webhook_authentication_spec.rb

@@ -3,38 +3,38 @@ require 'rack/mock'
 
 describe Rack::TwilioWebhookAuthentication do
   before do
-    @app = ->(_env) { [200, { 'Content-Type' => 'text/plain' }, ['Hello']] }
+    @app = lambda {|env| [200, {'Content-Type' => 'text/plain'}, ['Hello']] }
   end
 
   describe 'new' do
     it 'should initialize with an app, auth token and a path' do
-      expect do
+      expect {
         Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/)
-      end.not_to raise_error
+      }.not_to raise_error
     end
 
     it 'should initialize with an app, auth token and paths' do
-      expect do
+      expect {
         Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/, /\/sms/)
-      end.not_to raise_error
+      }.not_to raise_error
     end
 
     it 'should initialize with an app, dynamic token and paths' do
-      expect do
+      expect {
         Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/, /\/sms/)
-      end.not_to raise_error
+      }.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 = 12_345
+      account_sid = 12345
       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(Twilio::Util::RequestValidator).to receive(:new).with(auth_token).and_return(request_validator)
       expect(request_validator).to receive(:validate).and_return(true)
       request = Rack::MockRequest.env_for('/voice')
       status, headers, body = @middleware.call(request)
@@ -44,18 +44,20 @@ 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
-      expect(Twilio::Security::RequestValidator).to_not receive(:validate)
+      expect(Twilio::Util::RequestValidator).to_not receive(:validate)
       request = Rack::MockRequest.env_for('/sms')
       status, headers, body = @middleware.call(request)
       expect(status).to be(200)
     end
 
     it 'should allow a request through if it validates' do
-      expect_any_instance_of(Twilio::Security::RequestValidator).to(
+      expect_any_instance_of(Twilio::Util::RequestValidator).to(
         receive(:validate).and_return(true)
       )
       request = Rack::MockRequest.env_for('/voice')
@@ -64,7 +66,7 @@ describe Rack::TwilioWebhookAuthentication do
     end
 
     it 'should short circuit a request to 403 if it does not validate' do
-      expect_any_instance_of(Twilio::Security::RequestValidator).to(
+      expect_any_instance_of(Twilio::Util::RequestValidator).to(
         receive(:validate).and_return(false)
       )
       request = Rack::MockRequest.env_for('/voice')
@@ -75,18 +77,20 @@ 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
-      expect(Twilio::Security::RequestValidator).to_not receive(:validate)
+      expect(Twilio::Util::RequestValidator).to_not receive(:validate)
       request = Rack::MockRequest.env_for('icesms')
       status, headers, body = @middleware.call(request)
       expect(status).to be(200)
     end
 
     it 'shold allow a request through if it validates' do
-      expect_any_instance_of(Twilio::Security::RequestValidator).to(
+      expect_any_instance_of(Twilio::Util::RequestValidator).to(
         receive(:validate).and_return(true)
       )
       request = Rack::MockRequest.env_for('/sms')
@@ -95,7 +99,7 @@ describe Rack::TwilioWebhookAuthentication do
     end
 
     it 'should short circuit a request to 403 if it does not validate' do
-      expect_any_instance_of(Twilio::Security::RequestValidator).to(
+      expect_any_instance_of(Twilio::Util::RequestValidator).to(
         receive(:validate).and_return(false)
       )
       request = Rack::MockRequest.env_for('/sms')

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/task_router_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe Twilio::TaskRouter::Capability do
+  describe 'with a capability' do
+    before :each do
+      @capability = Twilio::TaskRouter::Capability.new 'AC123', 'foobar', 'WS456', 'WK789'
+    end
+
+    it 'should return a valid jwt when #generate_token is called' do
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['policies']).not_to be_nil
+      expect(decoded['iss']).not_to be_nil
+      expect(decoded['exp']).not_to be_nil
+    end
+
+    it 'should properly set the iss key in the payload' do
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['iss']).to eq('AC123')
+    end
+
+    it 'should properly set exp based on the default 1-hour ttl' do
+      seconds = Time.now.to_i
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['exp']).to eq(seconds + 3600)
+    end
+
+    it 'should properly set exp based on the ttl arg to #generate_token' do
+      seconds = Time.now.to_i
+      ttl = rand 10000
+      token = @capability.generate_token ttl
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['exp']).to eq(seconds + ttl)
+    end
+
+    it 'should allow websocket operations and activity list fetches by default' do
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['policies'].size).to eq(3)
+      get_policy = {
+        "url" => 'https://event-bridge.twilio.com/v1/wschannels/AC123/WK789',
+        "method" => 'GET',
+        "query_filter" => {},
+        "post_filter" => {},
+        "allow" => true
+      }
+      expect(decoded['policies'][0]).to eq(get_policy)
+      post_policy = {
+        "url" => 'https://event-bridge.twilio.com/v1/wschannels/AC123/WK789',
+        "method" => 'POST',
+        "query_filter" => {},
+        "post_filter" => {},
+        "allow" => true
+      }
+      expect(decoded['policies'][1]).to eq(post_policy)
+
+      activities_policy = {
+        'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
+        'method' => 'GET',
+        'query_filter' => {},
+        'post_filter' => {},
+        'allow' => true
+      }
+      expect(decoded['policies'][2]).to eq(activities_policy)
+    end
+
+    it 'should add a policy when #allow_worker_activity_updates is called' do
+      @capability.allow_worker_activity_updates
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['policies'].size).to eq(4)
+      activity_policy = {
+        'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789',
+        'method' => 'POST',
+        'query_filter' => {},
+        'post_filter' => {'ActivitySid' => {'required' => true}},
+        'allow' => true
+      }
+      expect(decoded['policies'][-1]).to eq(activity_policy)
+    end
+
+    it 'should add a policy when #allow_worker_fetch_attributes is called' do
+      @capability.allow_worker_fetch_attributes
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['policies'].size).to eq(4)
+      worker_policy = {
+        'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789',
+        'method' => 'GET',
+        'query_filter' => {},
+        'post_filter' => {},
+        'allow' => true
+      }
+      expect(decoded['policies'][-1]).to eq(worker_policy)
+    end
+
+    it 'should add a policy when #allow_task_reservation_updates is called' do
+      @capability.allow_task_reservation_updates
+      token = @capability.generate_token
+      decoded, header = JWT.decode token, 'foobar'
+      expect(decoded['policies'].size).to eq(4)
+      task_policy = {
+        'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**',
+        'method' => 'POST',
+        'query_filter' => {},
+        'post_filter' => {'ReservationStatus' => {'required' => true}},
+        'allow' => true
+      }
+      expect(decoded['policies'][-1]).to eq(task_policy)
+    end
+  end
+end