twilio-ruby 5.40.3 → 5.74.1

data/lib/twilio-ruby/rest/notify/v1/service/binding.rb

@@ -18,7 +18,7 @@ module Twilio
             # Initialize the BindingList
             # @param [Version] version Version that contains the resource
             # @param [String] service_sid The SID of the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource) the resource
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource] the resource
             #   is associated with.
             # @return [BindingList] BindingList
             def initialize(version, service_sid: nil)
@@ -32,8 +32,8 @@ module Twilio
             ##
             # Create the BindingInstance
             # @param [String] identity The `identity` value that uniquely identifies the new
-            #   resource's [User](https://www.twilio.com/docs/chat/rest/user-resource) within
-            #   the [Service](https://www.twilio.com/docs/notify/api/service-resource). Up to 20
+            #   resource's {User}[https://www.twilio.com/docs/chat/rest/user-resource] within
+            #   the {Service}[https://www.twilio.com/docs/notify/api/service-resource]. Up to 20
             #   Bindings can be created for the same Identity in a given Service.
             # @param [binding.BindingType] binding_type The transport technology to use for
             #   the Binding. Can be: `apn`, `fcm`, `gcm`, `sms`, or `facebook-messenger`.
@@ -41,17 +41,18 @@ module Twilio
             #   token. For FCM and GCM, the registration token. For SMS, a phone number in E.164
             #   format. For Facebook Messenger, the Messenger ID of the user or a phone number
             #   in E.164 format.
-            # @param [String] tag A tag that can be used to select the Bindings to notify.
-            #   Repeat this parameter to specify more than one tag, up to a total of 20 tags.
+            # @param [Array[String]] tag A tag that can be used to select the Bindings to
+            #   notify. Repeat this parameter to specify more than one tag, up to a total of 20
+            #   tags.
             # @param [String] notification_protocol_version The protocol version to use to
             #   send the notification. This defaults to the value of
             #   `default_xxxx_notification_protocol_version` for the protocol in the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource). The current
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource]. The current
             #   version is `"3"` for `apn`, `fcm`, and `gcm` type Bindings. The parameter is not
             #   applicable to `sms` and `facebook-messenger` type Bindings as the data format is
             #   fixed.
             # @param [String] credential_sid The SID of the
-            #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource)
+            #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource]
             #   resource to be used to send notifications to this Binding. If present, this
             #   overrides the Credential specified in the Service resource. Applies to only
             #   `apn`, `fcm`, and `gcm` type Bindings.
@@ -81,12 +82,12 @@ module Twilio
             #   date. Specify the date in GMT and format as `YYYY-MM-DD`.
             # @param [Date] end_date Only include usage that occurred on or before this date.
             #   Specify the date in GMT and format as `YYYY-MM-DD`.
-            # @param [String] identity The
-            #   [User](https://www.twilio.com/docs/chat/rest/user-resource)'s `identity` value
+            # @param [Array[String]] identity The
+            #   {User}[https://www.twilio.com/docs/chat/rest/user-resource]'s `identity` value
             #   of the resources to read.
-            # @param [String] tag Only list Bindings that have all of the specified Tags. The
-            #   following implicit tags are available: `all`, `apn`, `fcm`, `gcm`, `sms`,
-            #   `facebook-messenger`. Up to 5 tags are allowed.
+            # @param [Array[String]] tag Only list Bindings that have all of the specified
+            #   Tags. The following implicit tags are available: `all`, `apn`, `fcm`, `gcm`,
+            #   `sms`, `facebook-messenger`. Up to 5 tags are allowed.
             # @param [Integer] limit Upper limit for the number of records to return. stream()
             #    guarantees to never return more than limit.  Default is no limit
             # @param [Integer] page_size Number of records to fetch per request, when
@@ -113,12 +114,12 @@ module Twilio
             #   date. Specify the date in GMT and format as `YYYY-MM-DD`.
             # @param [Date] end_date Only include usage that occurred on or before this date.
             #   Specify the date in GMT and format as `YYYY-MM-DD`.
-            # @param [String] identity The
-            #   [User](https://www.twilio.com/docs/chat/rest/user-resource)'s `identity` value
+            # @param [Array[String]] identity The
+            #   {User}[https://www.twilio.com/docs/chat/rest/user-resource]'s `identity` value
             #   of the resources to read.
-            # @param [String] tag Only list Bindings that have all of the specified Tags. The
-            #   following implicit tags are available: `all`, `apn`, `fcm`, `gcm`, `sms`,
-            #   `facebook-messenger`. Up to 5 tags are allowed.
+            # @param [Array[String]] tag Only list Bindings that have all of the specified
+            #   Tags. The following implicit tags are available: `all`, `apn`, `fcm`, `gcm`,
+            #   `sms`, `facebook-messenger`. Up to 5 tags are allowed.
             # @param [Integer] limit Upper limit for the number of records to return. stream()
             #    guarantees to never return more than limit. Default is no limit.
             # @param [Integer] page_size Number of records to fetch per request, when
@@ -161,12 +162,12 @@ module Twilio
             #   date. Specify the date in GMT and format as `YYYY-MM-DD`.
             # @param [Date] end_date Only include usage that occurred on or before this date.
             #   Specify the date in GMT and format as `YYYY-MM-DD`.
-            # @param [String] identity The
-            #   [User](https://www.twilio.com/docs/chat/rest/user-resource)'s `identity` value
+            # @param [Array[String]] identity The
+            #   {User}[https://www.twilio.com/docs/chat/rest/user-resource]'s `identity` value
             #   of the resources to read.
-            # @param [String] tag Only list Bindings that have all of the specified Tags. The
-            #   following implicit tags are available: `all`, `apn`, `fcm`, `gcm`, `sms`,
-            #   `facebook-messenger`. Up to 5 tags are allowed.
+            # @param [Array[String]] tag Only list Bindings that have all of the specified
+            #   Tags. The following implicit tags are available: `all`, `apn`, `fcm`, `gcm`,
+            #   `sms`, `facebook-messenger`. Up to 5 tags are allowed.
             # @param [String] page_token PageToken provided by the API
             # @param [Integer] page_number Page Number, this value is simply for client state
             # @param [Integer] page_size Number of records to return, defaults to 50
@@ -245,7 +246,7 @@ module Twilio
             # Initialize the BindingContext
             # @param [Version] version Version that contains the resource
             # @param [String] service_sid The SID of the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource) to fetch the
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource] to fetch the
             #   resource from.
             # @param [String] sid The Twilio-provided string that uniquely identifies the
             #   Binding resource to fetch.
@@ -297,7 +298,7 @@ module Twilio
             # @param [Version] version Version that contains the resource
             # @param [Hash] payload payload that contains response from Twilio
             # @param [String] service_sid The SID of the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource) the resource
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource] the resource
             #   is associated with.
             # @param [String] sid The Twilio-provided string that uniquely identifies the
             #   Binding resource to fetch.
@@ -406,7 +407,7 @@ module Twilio
             end
 
             ##
-            # @return [String] The list of tags associated with this Binding
+            # @return [Array[String]] The list of tags associated with this Binding
             def tags
               @properties['tags']
             end

data/lib/twilio-ruby/rest/notify/v1/service/notification.rb

@@ -18,7 +18,7 @@ module Twilio
             # Initialize the NotificationList
             # @param [Version] version Version that contains the resource
             # @param [String] service_sid The SID of the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource) the resource
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource] the resource
             #   is associated with.
             # @return [NotificationList] NotificationList
             def initialize(version, service_sid: nil)
@@ -63,8 +63,8 @@ module Twilio
             #   from deliveries to those channels.
             # @param [Hash] data The custom key-value pairs of the notification's payload. For
             #   FCM and GCM, this value translates to `data` in the FCM and GCM payloads. FCM
-            #   and GCM [reserve certain
-            #   keys](https://firebase.google.com/docs/cloud-messaging/http-server-ref) that
+            #   and GCM {reserve certain
+            #   keys}[https://firebase.google.com/docs/cloud-messaging/http-server-ref] that
             #   cannot be used in those channels. For APNS, attributes of `data` are inserted
             #   into the APNS payload as custom properties outside of the `aps` dictionary. In
             #   all channels, we reserve keys that start with `twi_` for future use. Custom keys
@@ -75,23 +75,23 @@ module Twilio
             #   attributes in the generic payload for APNS Bindings. This property maps to the
             #   APNS `Payload` item, therefore the `aps` key must be used to change standard
             #   attributes. Adds custom key-value pairs to the root of the dictionary. See the
-            #   [APNS
-            #   documentation](https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html)
+            #   {APNS
+            #   documentation}[https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html]
             #   for more details. We reserve keys that start with `twi_` for future use. Custom
             #   keys that start with `twi_` are not allowed.
             # @param [Hash] gcm The GCM-specific payload that overrides corresponding
             #   attributes in the generic payload for GCM Bindings.  This property maps to the
-            #   root JSON dictionary. See the [GCM
-            #   documentation](https://firebase.google.com/docs/cloud-messaging/http-server-ref)
+            #   root JSON dictionary. See the {GCM
+            #   documentation}[https://firebase.google.com/docs/cloud-messaging/http-server-ref]
             #   for more details. Target parameters `to`, `registration_ids`, and
             #   `notification_key` are not allowed. We reserve keys that start with `twi_` for
             #   future use. Custom keys that start with `twi_` are not allowed. GCM also
-            #   [reserves certain
-            #   keys](https://firebase.google.com/docs/cloud-messaging/http-server-ref).
+            #   {reserves certain
+            #   keys}[https://firebase.google.com/docs/cloud-messaging/http-server-ref].
             # @param [Hash] sms The SMS-specific payload that overrides corresponding
             #   attributes in the generic payload for SMS Bindings.  Each attribute in this
             #   value maps to the corresponding `form` parameter of the Twilio
-            #   [Message](https://www.twilio.com/docs/sms/send-messages) resource.  These
+            #   {Message}[https://www.twilio.com/docs/sms/send-messages] resource.  These
             #   parameters of the Message resource are supported in snake case format: `body`,
             #   `media_urls`, `status_callback`, and `max_price`.  The `status_callback`
             #   parameter overrides the corresponding parameter in the messaging service, if
@@ -99,32 +99,32 @@ module Twilio
             # @param [Hash] facebook_messenger Deprecated.
             # @param [Hash] fcm The FCM-specific payload that overrides corresponding
             #   attributes in the generic payload for FCM Bindings. This property maps to the
-            #   root JSON dictionary. See the [FCM
-            #   documentation](https://firebase.google.com/docs/cloud-messaging/http-server-ref#downstream)
+            #   root JSON dictionary. See the {FCM
+            #   documentation}[https://firebase.google.com/docs/cloud-messaging/http-server-ref#downstream]
             #   for more details. Target parameters `to`, `registration_ids`, `condition`, and
             #   `notification_key` are not allowed in this parameter. We reserve keys that start
             #   with `twi_` for future use. Custom keys that start with `twi_` are not allowed.
-            #   FCM also [reserves certain
-            #   keys](https://firebase.google.com/docs/cloud-messaging/http-server-ref), which
+            #   FCM also {reserves certain
+            #   keys}[https://firebase.google.com/docs/cloud-messaging/http-server-ref], which
             #   cannot be used in that channel.
-            # @param [String] segment The Segment resource is deprecated. Use the `tag`
+            # @param [Array[String]] segment The Segment resource is deprecated. Use the `tag`
             #   parameter, instead.
             # @param [Hash] alexa Deprecated.
-            # @param [String] to_binding The destination address specified as a JSON string.
-            #   Multiple `to_binding` parameters can be included but the total size of the
-            #   request entity should not exceed 1MB. This is typically sufficient for 10,000
-            #   phone numbers.
+            # @param [Array[String]] to_binding The destination address specified as a JSON
+            #   string.  Multiple `to_binding` parameters can be included but the total size of
+            #   the request entity should not exceed 1MB. This is typically sufficient for
+            #   10,000 phone numbers.
             # @param [String] delivery_callback_url URL to send webhooks.
-            # @param [String] identity The `identity` value that uniquely identifies the new
-            #   resource's [User](https://www.twilio.com/docs/chat/rest/user-resource) within
-            #   the [Service](https://www.twilio.com/docs/notify/api/service-resource). Delivery
-            #   will be attempted only to Bindings with an Identity in this list. No more than
-            #   20 items are allowed in this list.
-            # @param [String] tag A tag that selects the Bindings to notify. Repeat this
-            #   parameter to specify more than one tag, up to a total of 5 tags. The implicit
-            #   tag `all` is available to notify all Bindings in a Service instance. Similarly,
-            #   the implicit tags `apn`, `fcm`, `gcm`, `sms` and `facebook-messenger` are
-            #   available to notify all Bindings in a specific channel.
+            # @param [Array[String]] identity The `identity` value that uniquely identifies
+            #   the new resource's {User}[https://www.twilio.com/docs/chat/rest/user-resource]
+            #   within the {Service}[https://www.twilio.com/docs/notify/api/service-resource].
+            #   Delivery will be attempted only to Bindings with an Identity in this list. No
+            #   more than 20 items are allowed in this list.
+            # @param [Array[String]] tag A tag that selects the Bindings to notify. Repeat
+            #   this parameter to specify more than one tag, up to a total of 5 tags. The
+            #   implicit tag `all` is available to notify all Bindings in a Service instance.
+            #   Similarly, the implicit tags `apn`, `fcm`, `gcm`, `sms` and `facebook-messenger`
+            #   are available to notify all Bindings in a specific channel.
             # @return [NotificationInstance] Created NotificationInstance
             def create(body: :unset, priority: :unset, ttl: :unset, title: :unset, sound: :unset, action: :unset, data: :unset, apn: :unset, gcm: :unset, sms: :unset, facebook_messenger: :unset, fcm: :unset, segment: :unset, alexa: :unset, to_binding: :unset, delivery_callback_url: :unset, identity: :unset, tag: :unset)
               data = Twilio::Values.of({
@@ -199,7 +199,7 @@ module Twilio
             # @param [Version] version Version that contains the resource
             # @param [Hash] payload payload that contains response from Twilio
             # @param [String] service_sid The SID of the
-            #   [Service](https://www.twilio.com/docs/notify/api/service-resource) the resource
+            #   {Service}[https://www.twilio.com/docs/notify/api/service-resource] the resource
             #   is associated with.
             # @return [NotificationInstance] NotificationInstance
             def initialize(version, payload, service_sid: nil)
@@ -215,7 +215,7 @@ module Twilio
                   'tags' => payload['tags'],
                   'segments' => payload['segments'],
                   'priority' => payload['priority'],
-                  'ttl' => payload['ttl'].to_i,
+                  'ttl' => payload['ttl'] == nil ? payload['ttl'] : payload['ttl'].to_i,
                   'title' => payload['title'],
                   'body' => payload['body'],
                   'sound' => payload['sound'],
@@ -255,19 +255,19 @@ module Twilio
             end
 
             ##
-            # @return [String] The list of identity values of the Users to notify
+            # @return [Array[String]] The list of identity values of the Users to notify
             def identities
               @properties['identities']
             end
 
             ##
-            # @return [String] The tags that select the Bindings to notify
+            # @return [Array[String]] The tags that select the Bindings to notify
             def tags
               @properties['tags']
             end
 
             ##
-            # @return [String] The list of Segments to notify
+            # @return [Array[String]] The list of Segments to notify
             def segments
               @properties['segments']
             end

data/lib/twilio-ruby/rest/notify/v1/service.rb

@@ -30,31 +30,31 @@ module Twilio
           # @param [String] friendly_name A descriptive string that you create to describe
           #   the resource. It can be up to 64 characters long.
           # @param [String] apn_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for APN Bindings.
           # @param [String] gcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for GCM Bindings.
-          # @param [String] messaging_service_sid The SID of the [Messaging
-          #   Service](https://www.twilio.com/docs/sms/send-messages#messaging-services) to
+          # @param [String] messaging_service_sid The SID of the {Messaging
+          #   Service}[https://www.twilio.com/docs/sms/send-messages#messaging-services] to
           #   use for SMS Bindings. This parameter must be set in order to send SMS
           #   notifications.
           # @param [String] facebook_messenger_page_id Deprecated.
           # @param [String] default_apn_notification_protocol_version The protocol version
           #   to use for sending APNS notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] default_gcm_notification_protocol_version The protocol version
           #   to use for sending GCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] fcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for FCM Bindings.
           # @param [String] default_fcm_notification_protocol_version The protocol version
           #   to use for sending FCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [Boolean] log_enabled Whether to log notifications. Can be: `true` or
           #   `false` and the default is `true`.
           # @param [String] alexa_skill_id Deprecated.
@@ -253,31 +253,31 @@ module Twilio
           # @param [String] friendly_name A descriptive string that you create to describe
           #   the resource. It can be up to 64 characters long.
           # @param [String] apn_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for APN Bindings.
           # @param [String] gcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for GCM Bindings.
-          # @param [String] messaging_service_sid The SID of the [Messaging
-          #   Service](https://www.twilio.com/docs/sms/send-messages#messaging-services) to
+          # @param [String] messaging_service_sid The SID of the {Messaging
+          #   Service}[https://www.twilio.com/docs/sms/send-messages#messaging-services] to
           #   use for SMS Bindings. This parameter must be set in order to send SMS
           #   notifications.
           # @param [String] facebook_messenger_page_id Deprecated.
           # @param [String] default_apn_notification_protocol_version The protocol version
           #   to use for sending APNS notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] default_gcm_notification_protocol_version The protocol version
           #   to use for sending GCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] fcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for FCM Bindings.
           # @param [String] default_fcm_notification_protocol_version The protocol version
           #   to use for sending FCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [Boolean] log_enabled Whether to log notifications. Can be: `true` or
           #   `false` and the default is `true`.
           # @param [String] alexa_skill_id Deprecated.
@@ -546,31 +546,31 @@ module Twilio
           # @param [String] friendly_name A descriptive string that you create to describe
           #   the resource. It can be up to 64 characters long.
           # @param [String] apn_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for APN Bindings.
           # @param [String] gcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for GCM Bindings.
-          # @param [String] messaging_service_sid The SID of the [Messaging
-          #   Service](https://www.twilio.com/docs/sms/send-messages#messaging-services) to
+          # @param [String] messaging_service_sid The SID of the {Messaging
+          #   Service}[https://www.twilio.com/docs/sms/send-messages#messaging-services] to
           #   use for SMS Bindings. This parameter must be set in order to send SMS
           #   notifications.
           # @param [String] facebook_messenger_page_id Deprecated.
           # @param [String] default_apn_notification_protocol_version The protocol version
           #   to use for sending APNS notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] default_gcm_notification_protocol_version The protocol version
           #   to use for sending GCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [String] fcm_credential_sid The SID of the
-          #   [Credential](https://www.twilio.com/docs/notify/api/credential-resource) to use
+          #   {Credential}[https://www.twilio.com/docs/notify/api/credential-resource] to use
           #   for FCM Bindings.
           # @param [String] default_fcm_notification_protocol_version The protocol version
           #   to use for sending FCM notifications. Can be overridden on a Binding by Binding
           #   basis when creating a
-          #   [Binding](https://www.twilio.com/docs/notify/api/binding-resource) resource.
+          #   {Binding}[https://www.twilio.com/docs/notify/api/binding-resource] resource.
           # @param [Boolean] log_enabled Whether to log notifications. Can be: `true` or
           #   `false` and the default is `true`.
           # @param [String] alexa_skill_id Deprecated.

data/lib/twilio-ruby/rest/notify/v1.rb

@@ -26,11 +26,12 @@ module Twilio
         # @return [Twilio::REST::Notify::V1::CredentialList]
         def credentials(sid=:unset)
           if sid.nil?
-            raise ArgumentError, 'sid cannot be nil'
-          elsif sid == :unset
-            @credentials ||= CredentialList.new self
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @credentials ||= CredentialList.new self
           else
-            CredentialContext.new(self, sid)
+              CredentialContext.new(self, sid)
           end
         end
 
@@ -41,11 +42,12 @@ module Twilio
         # @return [Twilio::REST::Notify::V1::ServiceList]
         def services(sid=:unset)
           if sid.nil?
-            raise ArgumentError, 'sid cannot be nil'
-          elsif sid == :unset
-            @services ||= ServiceList.new self
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @services ||= ServiceList.new self
           else
-            ServiceContext.new(self, sid)
+              ServiceContext.new(self, sid)
           end
         end