twilio-ruby 5.20.0 → 5.47.0

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

@@ -3,7 +3,7 @@
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
 #       /       /
-# 
+#
 # frozen_string_literal: true
 
 require 'spec_helper.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',
@@ -33,10 +32,58 @@ describe 'UsageRecord' do
           "usage_records": [
               {
                   "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                  "commands": {},
-                  "data": {},
+                  "commands": {
+                      "billing_units": "USD",
+                      "billed": 0,
+                      "total": 3,
+                      "from_sim": 1,
+                      "to_sim": 2,
+                      "home": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 3,
+                          "from_sim": 1,
+                          "to_sim": 2
+                      },
+                      "national_roaming": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 0,
+                          "from_sim": 0,
+                          "to_sim": 0
+                      },
+                      "international_roaming": []
+                  },
+                  "data": {
+                      "billing_units": "USD",
+                      "billed": 0.35,
+                      "total": 3494609,
+                      "upload": 731560,
+                      "download": 2763049,
+                      "units": "bytes",
+                      "home": {
+                          "billing_units": "USD",
+                          "billed": 0.35,
+                          "total": 3494609,
+                          "upload": 731560,
+                          "download": 2763049,
+                          "units": "bytes"
+                      },
+                      "national_roaming": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 0,
+                          "upload": 0,
+                          "download": 0,
+                          "units": "bytes"
+                      },
+                      "international_roaming": []
+                  },
                   "sim_sid": "DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                  "period": {}
+                  "period": {
+                      "start": "2015-07-30T20:00:00Z",
+                      "end": "2015-07-30T20:00:00Z"
+                  }
               },
               {
                   "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -47,13 +94,13 @@ describe 'UsageRecord' do
               }
           ],
           "meta": {
-              "first_page_url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords?PageSize=50&Page=0",
+              "first_page_url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords?Start=2015-07-30T20%3A00%3A00Z&End=2015-07-30T20%3A00%3A00Z&PageSize=50&Page=0",
               "key": "usage_records",
               "next_page_url": null,
               "page": 0,
               "page_size": 50,
               "previous_page_url": null,
-              "url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords?PageSize=50&Page=0"
+              "url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords?Start=2015-07-30T20%3A00%3A00Z&End=2015-07-30T20%3A00%3A00Z&PageSize=50&Page=0"
           }
       }
       ]

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

@@ -3,7 +3,7 @@
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
 #       /       /
-# 
+#
 # frozen_string_literal: true
 
 require 'spec_helper.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',
@@ -54,6 +53,7 @@ describe 'Sim' do
           "iccid": "iccid",
           "e_id": "e_id",
           "status": "new",
+          "reset_status": null,
           "url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "ip_address": "192.168.1.1"
       }
@@ -72,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',
@@ -87,13 +86,13 @@ describe 'Sim' do
       {
           "sims": [],
           "meta": {
-              "first_page_url": "https://wireless.twilio.com/v1/Sims?PageSize=50&Page=0",
+              "first_page_url": "https://wireless.twilio.com/v1/Sims?Status=new&Iccid=iccid&RatePlan=rate_plan&PageSize=50&Page=0",
               "key": "sims",
               "next_page_url": null,
               "page": 0,
               "page_size": 50,
               "previous_page_url": null,
-              "url": "https://wireless.twilio.com/v1/Sims?PageSize=50&Page=0"
+              "url": "https://wireless.twilio.com/v1/Sims?Status=new&Iccid=iccid&RatePlan=rate_plan&PageSize=50&Page=0"
           }
       }
       ]
@@ -128,6 +127,7 @@ describe 'Sim' do
                   "iccid": "iccid",
                   "e_id": "e_id",
                   "status": "new",
+                  "reset_status": "resetting",
                   "sms_fallback_method": "http_method",
                   "sms_fallback_url": "http://www.example.com",
                   "sms_method": "http_method",
@@ -141,13 +141,13 @@ describe 'Sim' do
               }
           ],
           "meta": {
-              "first_page_url": "https://wireless.twilio.com/v1/Sims?PageSize=50&Page=0",
+              "first_page_url": "https://wireless.twilio.com/v1/Sims?Status=new&Iccid=iccid&RatePlan=rate_plan&PageSize=50&Page=0",
               "key": "sims",
               "next_page_url": null,
               "page": 0,
               "page_size": 50,
               "previous_page_url": null,
-              "url": "https://wireless.twilio.com/v1/Sims?PageSize=50&Page=0"
+              "url": "https://wireless.twilio.com/v1/Sims?Status=new&Iccid=iccid&RatePlan=rate_plan&PageSize=50&Page=0"
           }
       }
       ]
@@ -165,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',
@@ -195,6 +194,91 @@ describe 'Sim' do
           "iccid": "iccid",
           "e_id": "e_id",
           "status": "new",
+          "reset_status": null,
+          "sms_fallback_method": "http_method",
+          "sms_fallback_url": "http://www.example.com",
+          "sms_method": "http_method",
+          "sms_url": "http://www.example.com",
+          "voice_fallback_method": "http_method",
+          "voice_fallback_url": "http://www.example.com",
+          "voice_method": "http_method",
+          "voice_url": "http://www.example.com",
+          "url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "ip_address": "192.168.1.30"
+      }
+      ]
+    ))
+
+    actual = @client.wireless.v1.sims('DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').update()
+
+    expect(actual).to_not eq(nil)
+  end
+
+  it "receives update_move_to_subaccount responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "account_sid": "ACbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+          "unique_name": "unique_name",
+          "commands_callback_method": "http_method",
+          "commands_callback_url": "http://www.example.com",
+          "date_created": "2015-07-30T20:00:00Z",
+          "date_updated": "2015-07-30T20:00:00Z",
+          "friendly_name": "friendly_name",
+          "links": {
+              "data_sessions": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/DataSessions",
+              "rate_plan": "https://wireless.twilio.com/v1/RatePlans/WPbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "usage_records": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords"
+          },
+          "rate_plan_sid": "WPbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+          "sid": "DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "iccid": "iccid",
+          "e_id": "e_id",
+          "status": "new",
+          "reset_status": null,
+          "sms_fallback_method": "http_method",
+          "sms_fallback_url": "http://www.example.com",
+          "sms_method": "http_method",
+          "sms_url": "http://www.example.com",
+          "voice_fallback_method": "http_method",
+          "voice_fallback_url": "http://www.example.com",
+          "voice_method": "http_method",
+          "voice_url": "http://www.example.com",
+          "url": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "ip_address": "192.168.1.30"
+      }
+      ]
+    ))
+
+    actual = @client.wireless.v1.sims('DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').update()
+
+    expect(actual).to_not eq(nil)
+  end
+
+  it "receives update_reset_connectivity responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "unique_name": "unique_name",
+          "commands_callback_method": "http_method",
+          "commands_callback_url": "http://www.example.com",
+          "date_created": "2015-07-30T20:00:00Z",
+          "date_updated": "2015-07-30T20:00:00Z",
+          "friendly_name": "friendly_name",
+          "links": {
+              "data_sessions": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/DataSessions",
+              "rate_plan": "https://wireless.twilio.com/v1/RatePlans/WPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "usage_records": "https://wireless.twilio.com/v1/Sims/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/UsageRecords"
+          },
+          "rate_plan_sid": "WPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "sid": "DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "iccid": "iccid",
+          "e_id": "e_id",
+          "status": "active",
+          "reset_status": "resetting",
           "sms_fallback_method": "http_method",
           "sms_fallback_url": "http://www.example.com",
           "sms_method": "http_method",
@@ -221,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

@@ -0,0 +1,110 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /
+#
+# frozen_string_literal: true
+
+require 'spec_helper.rb'
+
+describe 'UsageRecord' do
+  it "can read" do
+    @holodeck.mock(Twilio::Response.new(500, ''))
+
+    expect {
+      @client.wireless.v1.usage_records.list()
+    }.to raise_exception(Twilio::REST::TwilioError)
+
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'get',
+        url: 'https://wireless.twilio.com/v1/UsageRecords',
+    ))).to eq(true)
+  end
+
+  it "receives fetch responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "usage_records": [
+              {
+                  "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "commands": {
+                      "billing_units": "USD",
+                      "billed": 0,
+                      "total": 3,
+                      "from_sim": 1,
+                      "to_sim": 2,
+                      "home": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 3,
+                          "from_sim": 1,
+                          "to_sim": 2
+                      },
+                      "national_roaming": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 0,
+                          "from_sim": 0,
+                          "to_sim": 0
+                      },
+                      "international_roaming": []
+                  },
+                  "data": {
+                      "billing_units": "USD",
+                      "billed": 0.35,
+                      "total": 3494609,
+                      "upload": 731560,
+                      "download": 2763049,
+                      "units": "bytes",
+                      "home": {
+                          "billing_units": "USD",
+                          "billed": 0.35,
+                          "total": 3494609,
+                          "upload": 731560,
+                          "download": 2763049,
+                          "units": "bytes"
+                      },
+                      "national_roaming": {
+                          "billing_units": "USD",
+                          "billed": 0,
+                          "total": 0,
+                          "upload": 0,
+                          "download": 0,
+                          "units": "bytes"
+                      },
+                      "international_roaming": []
+                  },
+                  "period": {
+                      "start": "2015-07-30T20:00:00Z",
+                      "end": "2015-07-30T20:00:00Z"
+                  }
+              },
+              {
+                  "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "commands": {},
+                  "data": {},
+                  "period": {}
+              }
+          ],
+          "meta": {
+              "first_page_url": "https://wireless.twilio.com/v1/UsageRecords?Start=2015-07-30T20%3A00%3A00Z&End=2015-07-30T20%3A00%3A00Z&PageSize=50&Page=0",
+              "key": "usage_records",
+              "next_page_url": null,
+              "page": 0,
+              "page_size": 50,
+              "previous_page_url": null,
+              "url": "https://wireless.twilio.com/v1/UsageRecords?Start=2015-07-30T20%3A00%3A00Z&End=2015-07-30T20%3A00%3A00Z&PageSize=50&Page=0"
+          }
+      }
+      ]
+    ))
+
+    actual = @client.wireless.v1.usage_records.list()
+
+    expect(actual).to_not eq(nil)
+  end
+end

data/spec/jwt/access_token_spec.rb

@@ -14,10 +14,18 @@ describe Twilio::JWT::AccessToken do
       expect(payload['grants'].count).to eq(0)
     end
 
-    it 'should add the proper headers' do
+    it 'should add the proper headers without region' do
       scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123', 'secret'
       _, headers = JWT.decode scat.to_s, 'secret'
       expect(headers['cty']).to eq('twilio-fpa;v=1')
+      expect(headers['twr']).to be_nil
+    end
+
+    it 'should add the proper headers with region' do
+      scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123', 'secret', region: 'foo'
+      _, headers = JWT.decode scat.to_s, 'secret'
+      expect(headers['cty']).to eq('twilio-fpa;v=1')
+      expect(headers['twr']).to eq('foo')
     end
 
     it 'identity should exist in the grants' do

data/spec/rest/client_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'logger'
 
 describe Twilio::REST::ObsoleteClient do
   it 'raise an exception' do
@@ -49,13 +50,206 @@ describe Twilio::REST::TrunkingClient do
 end
 
 describe Twilio::REST::Client do
-  it 'successfully validates the working SSL certificate' do
-    @holodeck.mock Twilio::Response.new(200, '')
-    expect { @client.validate_ssl_certificate }.not_to raise_error
+  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'
+        config.logger = 'someLogger'
+      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')
+      expect(@client.region).to eq('someRegion')
+      expect(@client.edge).to eq('someEdge')
+      expect(@client.logger).to eq('someLogger')
+    end
+
+    it 'uses the arguments over global configuration' do
+      @client = Twilio::REST::Client.new('myUser', 'myPassword', nil, 'myRegion', 'myClient', 'myLogger')
+      @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')
+      expect(@client.logger).to eq('myLogger')
+    end
+
+    class MyVersion < Twilio::REST::Version
+      def initialize(domain)
+        super
+        @version = 'v1'
+      end
+    end
+
+    class MyDomain < Twilio::REST::Domain
+      def initialize(client)
+        super
+        @host = 'twilio.com'
+        @base_url = 'https://twilio.com'
+        @port = 443
+      end
+    end
+  end
+
+  context 'validation' do
+    before :all do
+      Twilio.configure do |config|
+        config.account_sid = 'someSid'
+        config.auth_token = 'someToken'
+        config.http_client = 'someClient'
+        config.region = nil
+        config.edge = nil
+        config.logger = nil
+      end
+    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
+
+    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
+
+  context 'logging' do
+    it 'logs the call details' do
+      @client.logger = Logger.new(STDOUT)
+      @holodeck.mock Twilio::Response.new(200, {})
+      expect {
+        @client.request('host', 'port', 'GET', 'http://foobar.com')
+      }.to output(/Host:foobar.com/).to_stdout_from_any_process
+    end
+
+    it 'does not log when the logger instance is not passed' do
+      @holodeck.mock Twilio::Response.new(200, {})
+      expect {
+        @client.request('host', 'port', 'GET', 'http://foobar.com')
+      }.to_not output(/Host:foobar.com/).to_stdout_from_any_process
+    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)
+  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