twilio-ruby 5.34.1 → 5.39.0

data/spec/integration/voice/v1/dialing_permissions/settings_spec.rb

@@ -17,7 +17,6 @@ describe 'Settings' do
                       .settings().fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -50,7 +49,6 @@ describe 'Settings' do
                       .settings().update()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'post',

data/spec/integration/voice/v1/ip_record_spec.rb

@@ -54,7 +54,6 @@ describe 'IpRecord' do
       @client.voice.v1.ip_records('ILXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -91,7 +90,6 @@ describe 'IpRecord' do
       @client.voice.v1.ip_records.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -165,7 +163,6 @@ describe 'IpRecord' do
       @client.voice.v1.ip_records('ILXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').update()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'post',
@@ -202,7 +199,6 @@ describe 'IpRecord' do
       @client.voice.v1.ip_records('ILXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'delete',

data/spec/integration/voice/v1/source_ip_mapping_spec.rb

@@ -55,7 +55,6 @@ describe 'SourceIpMapping' do
       @client.voice.v1.source_ip_mappings('IBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -90,7 +89,6 @@ describe 'SourceIpMapping' do
       @client.voice.v1.source_ip_mappings.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -198,7 +196,6 @@ describe 'SourceIpMapping' do
       @client.voice.v1.source_ip_mappings('IBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'delete',

data/spec/integration/wireless/v1/command_spec.rb

@@ -16,7 +16,6 @@ describe 'Command' do
       @client.wireless.v1.commands('DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -83,7 +82,6 @@ describe 'Command' do
       @client.wireless.v1.commands.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -268,7 +266,6 @@ describe 'Command' do
       @client.wireless.v1.commands('DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'delete',

data/spec/integration/wireless/v1/rate_plan_spec.rb

@@ -16,7 +16,6 @@ describe 'RatePlan' do
       @client.wireless.v1.rate_plans.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -105,7 +104,6 @@ describe 'RatePlan' do
       @client.wireless.v1.rate_plans('WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -157,7 +155,6 @@ describe 'RatePlan' do
       @client.wireless.v1.rate_plans.create()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'post',
@@ -209,7 +206,6 @@ describe 'RatePlan' do
       @client.wireless.v1.rate_plans('WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').update()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'post',
@@ -261,7 +257,6 @@ describe 'RatePlan' do
       @client.wireless.v1.rate_plans('WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'delete',

data/spec/integration/wireless/v1/sim/data_session_spec.rb

@@ -17,7 +17,6 @@ describe 'DataSession' do
                          .data_sessions.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',

data/spec/integration/wireless/v1/sim/usage_record_spec.rb

@@ -17,7 +17,6 @@ describe 'UsageRecord' do
                          .usage_records.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',

data/spec/integration/wireless/v1/sim_spec.rb

@@ -16,7 +16,6 @@ describe 'Sim' do
       @client.wireless.v1.sims('DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -73,7 +72,6 @@ describe 'Sim' do
       @client.wireless.v1.sims.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
@@ -167,7 +165,6 @@ describe 'Sim' do
       @client.wireless.v1.sims('DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').update()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'post',
@@ -308,7 +305,6 @@ describe 'Sim' do
       @client.wireless.v1.sims('DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'delete',

data/spec/integration/wireless/v1/usage_record_spec.rb

@@ -16,7 +16,6 @@ describe 'UsageRecord' do
       @client.wireless.v1.usage_records.list()
     }.to raise_exception(Twilio::REST::TwilioError)
 
-    values = {}
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',

data/spec/rest/client_spec.rb

@@ -49,75 +49,185 @@ describe Twilio::REST::TrunkingClient do
 end
 
 describe Twilio::REST::Client do
-  before do
-    Twilio.configure do |config|
-      config.account_sid = 'someSid'
-      config.auth_token = 'someToken'
-      config.http_client = 'someClient'
+  context 'configuration' do
+    before do
+      Twilio.configure do |config|
+        config.account_sid = 'someSid'
+        config.auth_token = 'someToken'
+        config.http_client = 'someClient'
+        config.region = 'someRegion'
+        config.edge = 'someEdge'
+      end
     end
-  end
 
-  it 'uses the global configuration by default' do
-    @client = Twilio::REST::Client.new
-    expect(@client.account_sid).to eq('someSid')
-    expect(@client.auth_token).to eq('someToken')
-    expect(@client.http_client).to eq('someClient')
-  end
+    it 'uses the global configuration by default' do
+      @client = Twilio::REST::Client.new
+      expect(@client.account_sid).to eq('someSid')
+      expect(@client.auth_token).to eq('someToken')
+      expect(@client.http_client).to eq('someClient')
+      expect(@client.region).to eq('someRegion')
+      expect(@client.edge).to eq('someEdge')
+    end
 
-  it 'uses the arguments over global configuration' do
-    @client = Twilio::REST::Client.new('myUser', 'myPassword', nil, nil, 'myClient')
-    expect(@client.account_sid).to eq('myUser')
-    expect(@client.auth_token).to eq('myPassword')
-    expect(@client.http_client).to eq('myClient')
-  end
+    it 'uses the arguments over global configuration' do
+      @client = Twilio::REST::Client.new('myUser', 'myPassword', nil, 'myRegion', 'myClient')
+      @client.edge = 'myEdge'
+      expect(@client.account_sid).to eq('myUser')
+      expect(@client.auth_token).to eq('myPassword')
+      expect(@client.http_client).to eq('myClient')
+      expect(@client.region).to eq('myRegion')
+      expect(@client.edge).to eq('myEdge')
+    end
 
-  it 'successfully validates the working SSL certificate' do
-    @holodeck.mock Twilio::Response.new(200, '')
-    expect { @client.validate_ssl_certificate }.not_to raise_error
-  end
+    class MyVersion < Twilio::REST::Version
+      def initialize(domain)
+        super
+        @version = 'v1'
+      end
+    end
 
-  it 'fails to validate broken SSL certificates' do
-    @holodeck.mock Twilio::Response.new(504, '')
-    expect { @client.validate_ssl_certificate }.to raise_error(Twilio::REST::RestError)
+    class MyDomain < Twilio::REST::Domain
+      def initialize(client)
+        super
+        @host = 'twilio.com'
+        @base_url = 'https://twilio.com'
+        @port = 443
+      end
+    end
   end
 
-  it 'translates bad request error params' do
-    @domain = MyDomain.new(@client)
-    @version = MyVersion.new(@domain)
-    @error_message = '{
-                        "code": 20001,
-                        "message": "Bad request",
-                        "more_info": "https://www.twilio.com/docs/errors/20001",
-                        "status": 400,
-                        "details": {
-                            "foo":"bar"
-                    }}'
-    @holodeck.mock Twilio::Response.new(400, @error_message)
-    expect {
-      @version.fetch('GET', 'http://foobar.com')
-    }.to raise_error { |error|
-      expect(error).to be_a(Twilio::REST::RestError)
-      expect(error.status_code).to eq(400)
-      expect(error.code).to eq(20_001)
-      expect(error.details).to eq({ 'foo' => 'bar' })
-      expect(error.error_message).to eq('Bad request')
-      expect(error.more_info).to eq('https://www.twilio.com/docs/errors/20001')
-    }
-  end
+  context 'validation' do
+    before do
+      Twilio.configure do |config|
+        config.account_sid = 'someSid'
+        config.auth_token = 'someToken'
+        config.http_client = 'someClient'
+        config.region = nil
+        config.edge = nil
+      end
+    end
 
-  class MyVersion < Twilio::REST::Version
-    def initialize(domain)
-      super
-      @version = 'v1'
+    it 'successfully validates the working SSL certificate' do
+      @holodeck.mock Twilio::Response.new(200, '')
+      expect { @client.validate_ssl_certificate }.not_to raise_error
+    end
+
+    it 'fails to validate broken SSL certificates' do
+      @holodeck.mock Twilio::Response.new(504, '')
+      expect { @client.validate_ssl_certificate }.to raise_error(Twilio::REST::RestError)
+    end
+
+    it 'translates bad request error params' do
+      @domain = MyDomain.new(@client)
+      @version = MyVersion.new(@domain)
+      @error_message = '{
+                          "code": 20001,
+                          "message": "Bad request",
+                          "more_info": "https://www.twilio.com/docs/errors/20001",
+                          "status": 400,
+                          "details": {
+                              "foo":"bar"
+                      }}'
+      @holodeck.mock Twilio::Response.new(400, @error_message)
+      expect {
+        @version.fetch('GET', 'http://foobar.com')
+      }.to raise_error { |error|
+        expect(error).to be_a(Twilio::REST::RestError)
+        expect(error.status_code).to eq(400)
+        expect(error.code).to eq(20_001)
+        expect(error.details).to eq({ 'foo' => 'bar' })
+        expect(error.error_message).to eq('Bad request')
+        expect(error.more_info).to eq('https://www.twilio.com/docs/errors/20001')
+      }
     end
   end
 
-  class MyDomain < Twilio::REST::Domain
-    def initialize(client)
-      super
-      @host = 'twilio.com'
-      @base_url = 'https://twilio.com'
-      @port = 443
+  describe '#build_uri' do
+    before(:all) do
+      Twilio.configure do |config|
+        config.account_sid = 'username'
+        config.auth_token = 'password'
+        config.region = nil
+        config.edge = nil
+      end
+    end
+
+    context 'no region or edge in url' do
+      it "doesn't set region or edge" do
+        @client = Twilio::REST::Client.new
+        expect(@client.build_uri('https://api.twilio.com')).to eq('https://api.twilio.com')
+      end
+
+      it 'uses the default region if edge set' do
+        @client = Twilio::REST::Client.new
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.twilio.com')).to eq('https://api.edge.us1.twilio.com')
+      end
+
+      it 'sets region' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        expect(@client.build_uri('https://api.twilio.com')).to eq('https://api.region.twilio.com')
+      end
+
+      it 'sets region and edge' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.twilio.com')).to eq('https://api.edge.region.twilio.com')
+      end
+    end
+
+    context 'region in url' do
+      it 'uses url region' do
+        @client = Twilio::REST::Client.new
+        expect(@client.build_uri('https://api.urlRegion.twilio.com')).to eq('https://api.urlRegion.twilio.com')
+      end
+
+      it 'uses client edge and url region' do
+        @client = Twilio::REST::Client.new
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.urlRegion.twilio.com')).to eq('https://api.edge.urlRegion.twilio.com')
+      end
+
+      it 'prefers client region' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        expect(@client.build_uri('https://api.urlRegion.twilio.com')).to eq('https://api.region.twilio.com')
+      end
+
+      it 'uses client edge and prefers client region' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.urlRegion.twilio.com')).to eq('https://api.edge.region.twilio.com')
+      end
+    end
+
+    context 'region and edge in url' do
+      it 'uses url region and edge' do
+        @client = Twilio::REST::Client.new
+        expect(@client.build_uri('https://api.urlEdge.urlRegion.twilio.com')).to eq('https://api.urlEdge.urlRegion.twilio.com')
+      end
+
+      it 'prefers client edge' do
+        @client = Twilio::REST::Client.new
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.urlEdge.urlRegion.twilio.com')).to eq('https://api.edge.urlRegion.twilio.com')
+      end
+
+      it 'prefers client region' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        expect(@client.build_uri('https://api.urlEdge.urlRegion.twilio.com')).to eq('https://api.urlEdge.region.twilio.com')
+      end
+
+      it 'prefers client region and edge' do
+        @client = Twilio::REST::Client.new
+        @client.region = 'region'
+        @client.edge = 'edge'
+        expect(@client.build_uri('https://api.urlEdge.urlRegion.twilio.com')).to eq('https://api.edge.region.twilio.com')
+      end
     end
   end
 end

data/spec/util/configuration_spec.rb

@@ -18,4 +18,16 @@ describe Twilio::Util::Configuration do
     config.http_client = 'someClient'
     expect(config.http_client).to eq('someClient')
   end
+
+  it 'should have a region attribute' do
+    config = Twilio::Util::Configuration.new
+    config.region = 'someRegion'
+    expect(config.region).to eq('someRegion')
+  end
+
+  it 'should have an edge attribute' do
+    config = Twilio::Util::Configuration.new
+    config.edge = 'someEdge'
+    expect(config.edge).to eq('someEdge')
+  end
 end