twilio-ruby 5.0.0.rc24 → 5.0.0.rc25

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

@@ -10,6 +10,8 @@ module Twilio
       attr_accessor :name
       attr_accessor :indent
 
+      alias_method :to_xml, :to_s
+
       def initialize(indent: false, **keyword_args)
         @name = self.class.name.split('::').last
         @indent = indent
@@ -30,11 +32,7 @@ module Twilio
         result[0].downcase + result[1..result.length]
       end
 
-      def to_s()
-        self.to_xml_str
-      end
-
-      def to_xml_str(xml_declaration = true)
+      def to_s(xml_declaration = true)
         xml = self.xml.to_s(:indent => self.indent)
 
         return ('<?xml version="1.0" encoding="UTF-8"?>' + xml) if xml_declaration

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

@@ -7,6 +7,7 @@ module Twilio
       def initialize()
         super()
         self.name = 'Response'
+        yield(self) if block_given?
       end
 
       # Create a <Dial> element
@@ -28,33 +29,37 @@ module Twilio
       # == Returns:
       # A <Response> element with a <Dial> child element
       def dial(
-        number,
-        action: nil,
-        method: nil,
-        timeout: nil,
-        hangup_on_star: nil,
-        time_limit: nil,
-        caller_id: nil,
-        record: nil,
-        trim: nil,
-        recording_status_callback: nil,
-        recording_status_callback_method: nil,
-        **keyword_args)
-
-        self.append(Dial.new(
-          number: number,
-          action: action,
-          method: method,
-          timeout: timeout,
-          hangup_on_star: hangup_on_star,
-          time_limit: time_limit,
-          caller_id: caller_id,
-          record: record,
-          trim: trim,
-          recording_status_callback: recording_status_callback,
-          recording_status_callback_method: recording_status_callback_method,
-          **keyword_args
-        ))
+          number,
+          action: nil,
+          method: nil,
+          timeout: nil,
+          hangup_on_star: nil,
+          time_limit: nil,
+          caller_id: nil,
+          record: nil,
+          trim: nil,
+          recording_status_callback: nil,
+          recording_status_callback_method: nil,
+          **keyword_args)
+
+        dial = Dial.new(
+            number: number,
+            action: action,
+            method: method,
+            timeout: timeout,
+            hangup_on_star: hangup_on_star,
+            time_limit: time_limit,
+            caller_id: caller_id,
+            record: record,
+            trim: trim,
+            recording_status_callback: recording_status_callback,
+            recording_status_callback_method: recording_status_callback_method,
+            **keyword_args
+        )
+
+        yield(dial) if block_given?
+
+        self.append(dial)
       end
 
       # Create an <Echo> element
@@ -90,7 +95,7 @@ module Twilio
         workflow_sid: nil,
         **keyword_args)
 
-        self.append(Enqueue.new(
+        enqueue = Enqueue.new(
           name,
           action: action,
           method: method,
@@ -98,7 +103,11 @@ module Twilio
           wait_url_method: wait_url_method,
           workflow_sid: workflow_sid,
           **keyword_args
-        ))
+        )
+
+        yield(enqueue) if block_given?
+
+        self.append(enqueue)
       end
 
       # Create a <Gather> element
@@ -133,7 +142,7 @@ module Twilio
         acknowledge_sound_url: nil,
         **keyword_args)
 
-        self.append(Gather.new(
+        gather = Gather.new(
           action: action,
           method: method,
           timeout: timeout,
@@ -146,7 +155,11 @@ module Twilio
           barge_in: barge_in,
           acknowledge_sound_url: acknowledge_sound_url,
           **keyword_args
-        ))
+        )
+
+        yield(gather) if block_given?
+
+        self.append(gather)
       end
 
       # Create a <Hangup> element
@@ -187,7 +200,12 @@ module Twilio
       # == Returns:
       # A <Response> element with a <Play> child element
       def play(url: nil, loop: nil, digits: nil, **keyword_args)
-        append(Play.new(url: url, loop: loop, digits: digits, **keyword_args))
+        self.append(Play.new(
+          url: url,
+          loop: loop,
+          digits: digits,
+          **keyword_args
+        ))
       end
 
       # Create a <Record> element
@@ -221,7 +239,6 @@ module Twilio
         transcribe: nil,
         transcribe_callback: nil,
         **keyword_args)
-
         self.append(Record.new(
           action: action,
           method: method,
@@ -305,7 +322,6 @@ module Twilio
         action: nil,
         status_callback: nil,
         **keyword_args)
-
         self.append(Sms.new(
           body,
           to: to,
@@ -333,6 +349,7 @@ module Twilio
         if !(number.nil?)
           @value = number
         end
+        yield(self) if block_given?
       end
 
       # Create a <Client> element
@@ -356,7 +373,6 @@ module Twilio
         status_callback_method: nil,
         status_callback: nil,
         **keyword_args)
-
         self.append(Client.new(
           name,
           method: method,
@@ -409,7 +425,6 @@ module Twilio
         recording_status_callback: nil,
         recording_status_callback_method: nil,
         **keyword_args)
-
         self.append(Conference.new(
           name,
           muted: muted,
@@ -454,7 +469,6 @@ module Twilio
         status_callback_event: nil,
         status_callback_method: nil,
         **keyword_args)
-
         self.append(Number.new(
           number,
           send_digits: send_digits,
@@ -486,7 +500,6 @@ module Twilio
         reservation_sid: nil,
         post_work_activity_sid: nil,
         **keyword_args)
-
         self.append(Queue.new(
           queue_name,
           url: url,
@@ -506,7 +519,7 @@ module Twilio
       # == Returns:
       # A <Dial> element with a <Sim> child element
       def sim(sid, **keyword_args)
-        self.append(Sim.new(sid,**keyword_args))
+        self.append(Sim.new(sid, **keyword_args))
       end
 
       # Create a <Sip> element
@@ -534,7 +547,6 @@ module Twilio
         status_callback_event: nil,
         status_callback_method: nil,
         **keyword_args)
-
         self.append(Sip.new(
           uri,
           username: username,
@@ -671,6 +683,7 @@ module Twilio
       def initialize(name, **keyword_args)
         super(**keyword_args)
         @value = name
+        yield(self) if block_given?
       end
 
       # Create a <Task> element
@@ -717,6 +730,7 @@ module Twilio
       # A <Gather> element
       def initialize(**keyword_args)
         super(**keyword_args)
+        yield(self) if block_given?
       end
 
       # Create a <Say> element
@@ -737,7 +751,6 @@ module Twilio
         language: nil,
         voice: nil,
         **keyword_args)
-
         self.append(Say.new(
           body,
           loop: loop,
@@ -758,7 +771,12 @@ module Twilio
       # == Returns:
       # A <Gather> element with a <Play> child element
       def play(url: nil, loop: nil, digits: nil, **keyword_args)
-        append(Play.new(url: url, loop: loop, digits: digits, **keyword_args))
+        self.append(Play.new(
+          url: url,
+          loop: loop,
+          digits: digits,
+          **keyword_args
+        ))
       end
 
       # Create a <Pause> element

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-    VERSION = '5.0.0.rc24'
+    VERSION = '5.0.0.rc25'
 end

data/spec/integration/api/v2010/account/call/recording_spec.rb

@@ -37,7 +37,13 @@ describe 'Recording' do
           "duration": "6",
           "price": null,
           "sid": "REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-          "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
+          "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
+          "encryption_type": "public-key",
+          "encryption_details": {
+              "encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
+              "encryption_iv": "8I2hhNIYNTrwxfHk"
+          }
       }
       ]
     ))
@@ -119,7 +125,13 @@ describe 'Recording' do
                   "duration": "6",
                   "price": null,
                   "sid": "REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                  "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
+                  "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
+                  "encryption_type": "public-key",
+                  "encryption_details": {
+                      "encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                      "encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
+                      "encryption_iv": "8I2hhNIYNTrwxfHk"
+                  }
               }
           ],
           "start": 0,

data/spec/integration/api/v2010/account/recording_spec.rb

@@ -40,7 +40,13 @@ describe 'Recording' do
           "status": "completed",
           "channels": 1,
           "source": "Trunking",
-          "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
+          "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
+          "encryption_type": "public-key",
+          "encryption_details": {
+              "encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
+              "encryption_iv": "8I2hhNIYNTrwxfHk"
+          }
       }
       ]
     ))
@@ -122,7 +128,13 @@ describe 'Recording' do
                   "status": "completed",
                   "channels": 1,
                   "source": "Trunking",
-                  "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
+                  "uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
+                  "encryption_type": "public-key",
+                  "encryption_details": {
+                      "encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                      "encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
+                      "encryption_iv": "8I2hhNIYNTrwxfHk"
+                  }
               }
           ],
           "start": 0,

data/spec/integration/messaging/v1/service/phone_number_spec.rb

@@ -50,6 +50,34 @@ describe 'PhoneNumber' do
     expect(actual).to_not eq(nil)
   end
 
+  it "receives create_with_capabilities responses" do
+    @holodeck.mock(Twilio::TwilioResponse.new(
+        201,
+      %q[
+      {
+          "sid": "PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "service_sid": "MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "date_created": "2015-07-30T20:12:31Z",
+          "date_updated": "2015-07-30T20:12:33Z",
+          "phone_number": "+987654321",
+          "country_code": "US",
+          "capabilities": [
+              "MMS",
+              "SMS",
+              "Voice"
+          ],
+          "url": "https://messaging.twilio.com/v1/Services/MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/PhoneNumbers/PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+      }
+      ]
+    ))
+
+    actual = @client.messaging.v1.services("MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
+                                 .phone_numbers.create(phone_number_sid: "PNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+
+    expect(actual).to_not eq(nil)
+  end
+
   it "can delete" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
 

data/spec/integration/messaging/v1/service_spec.rb

@@ -47,6 +47,7 @@ describe 'Service' do
           "scan_message_content": "inherit",
           "area_code_geomatch": true,
           "validity_period": 600,
+          "synchronous_validation": true,
           "links": {
               "phone_numbers": "https://messaging.twilio.com/v1/Services/MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/PhoneNumbers",
               "short_codes": "https://messaging.twilio.com/v1/Services/MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/ShortCodes",
@@ -92,6 +93,7 @@ describe 'Service' do
           "smart_encoding": false,
           "fallback_to_long_code": true,
           "scan_message_content": "inherit",
+          "synchronous_validation": true,
           "area_code_geomatch": true,
           "validity_period": 600,
           "inbound_request_url": "https://www.example.com",
@@ -157,6 +159,7 @@ describe 'Service' do
                   "area_code_geomatch": true,
                   "validity_period": 600,
                   "scan_message_content": "inherit",
+                  "synchronous_validation": true,
                   "inbound_request_url": "https://www.example.com/",
                   "inbound_method": "POST",
                   "fallback_url": null,
@@ -216,6 +219,7 @@ describe 'Service' do
           "area_code_geomatch": true,
           "validity_period": 600,
           "scan_message_content": "inherit",
+          "synchronous_validation": true,
           "links": {
               "phone_numbers": "https://messaging.twilio.com/v1/Services/MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/PhoneNumbers",
               "short_codes": "https://messaging.twilio.com/v1/Services/MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/ShortCodes",

data/spec/integration/notify/v1/service/notification_spec.rb

@@ -59,4 +59,39 @@ describe 'Notification' do
 
     expect(actual).to_not eq(nil)
   end
+
+  it "receives create_direct_notification responses" do
+    @holodeck.mock(Twilio::TwilioResponse.new(
+        201,
+      %q[
+      {
+          "sid": "NOb8021351170b4e1286adaac3fdd6d082",
+          "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "service_sid": "IS699b53e02da45a1ba9d13b7d7d2766af",
+          "date_created": "2016-03-24T23:42:28Z",
+          "identities": [],
+          "tags": [],
+          "segments": [],
+          "priority": "high",
+          "ttl": 2419200,
+          "title": null,
+          "body": "body",
+          "sound": null,
+          "action": null,
+          "data": null,
+          "apn": null,
+          "fcm": null,
+          "gcm": null,
+          "sms": null,
+          "facebook_messenger": null,
+          "alexa": null
+      }
+      ]
+    ))
+
+    actual = @client.notify.v1.services("ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
+                              .notifications.create()
+
+    expect(actual).to_not eq(nil)
+  end
 end

data/spec/integration/video/v1/recording_spec.rb

@@ -92,6 +92,51 @@ describe 'Recording' do
     expect(actual).to_not eq(nil)
   end
 
+  it "receives read_results responses" do
+    @holodeck.mock(Twilio::TwilioResponse.new(
+        200,
+      %q[
+      {
+          "recordings": [
+              {
+                  "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "status": "completed",
+                  "date_created": "2015-07-30T20:00:00Z",
+                  "sid": "RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "source_sid": "MTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "size": 23,
+                  "type": "audio",
+                  "duration": 10,
+                  "container_format": "mka",
+                  "codec": "OPUS",
+                  "grouping_sids": {
+                      "room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                      "participant_sid": "PAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+                  },
+                  "url": "https://video.twilio.com/v1/Recordings/RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "links": {
+                      "media": "https://video.twilio.com/v1/Recordings/RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Media"
+                  }
+              }
+          ],
+          "meta": {
+              "page": 0,
+              "page_size": 50,
+              "first_page_url": "https://video.twilio.com/v1/Recordings?PageSize=50&Page=0",
+              "previous_page_url": null,
+              "url": "https://video.twilio.com/v1/Recordings?PageSize=50&Page=0",
+              "next_page_url": null,
+              "key": "recordings"
+          }
+      }
+      ]
+    ))
+
+    actual = @client.video.v1.recordings.list()
+
+    expect(actual).to_not eq(nil)
+  end
+
   it "can delete" do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))