twilio-ruby 5.0.0.alpha1 → 5.0.0.rc2

data/lib/twilio-ruby/rest/api.rb

@@ -2,7 +2,7 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 module Twilio
   module REST
@@ -11,219 +11,111 @@ module Twilio
       # Initialize the Api Domain
       def initialize(twilio)
         super
-
+        
         @base_url = 'https://api.twilio.com'
         @host = 'api.twilio.com'
         @port = 443
-
+        
         # Versions
         @v2010 = nil
       end
-
+      
       ##
       # Version v2010 of api
       def v2010
         @v2010 ||= V2010.new self
       end
-
+      
       ##
       # Account provided as the authenticating account
       def account
         self.v2010.account
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountList]
-      def accounts(sid=:unset)
-        self.v2010.accounts(sid)
+      
+      def accounts
+        self.v2010.accounts
       end
-
-      ##
-      # @param [String] sid The sid
-      # @return [Twilio::REST::Api::V2010::AccountContext::AddressInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::AddressList]
+      
       def addresses(sid=:unset)
         self.account.addresses(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ApplicationInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ApplicationList]
+      
       def applications(sid=:unset)
         self.account.applications(sid)
       end
-
-      ##
-      # @param [String] connect_app_sid The unique id of the Connect App that was
-      #   authorized.
-      # @return [Twilio::REST::Api::V2010::AccountContext::AuthorizedConnectAppInstance] if connect_app_sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::AuthorizedConnectAppList]
+      
       def authorized_connect_apps(connect_app_sid=:unset)
         self.account.authorized_connect_apps(connect_app_sid)
       end
-
-      ##
-      # @param [String] country_code The ISO Country code to lookup phone numbers for.
-      # @return [Twilio::REST::Api::V2010::AccountContext::AvailablePhoneNumberCountryInstance] if country_code was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::AvailablePhoneNumberCountryList]
+      
       def available_phone_numbers(country_code=:unset)
         self.account.available_phone_numbers(country_code)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::CallInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::CallList]
+      
       def calls(sid=:unset)
         self.account.calls(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   conference.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ConferenceInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ConferenceList]
+      
       def conferences(sid=:unset)
         self.account.conferences(sid)
       end
-
-      ##
-      # @param [String] sid The unique id of this Connect App.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ConnectAppInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ConnectAppList]
+      
       def connect_apps(sid=:unset)
         self.account.connect_apps(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::IncomingPhoneNumberInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::IncomingPhoneNumberList]
+      
       def incoming_phone_numbers(sid=:unset)
         self.account.incoming_phone_numbers(sid)
       end
-
-      ##
-      # @param [String] sid The sid
-      # @return [Twilio::REST::Api::V2010::AccountContext::KeyInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::KeyList]
-      def keys(sid=:unset)
-        self.account.keys(sid)
-      end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::MessageInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::MessageList]
+      
       def messages(sid=:unset)
         self.account.messages(sid)
       end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::NewKeyInstance]
-      def new_keys
-        self.account.new_keys()
-      end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::NewSigningKeyInstance]
-      def new_signing_keys
-        self.account.new_signing_keys()
-      end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::NotificationInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::NotificationList]
+      
       def notifications(sid=:unset)
         self.account.notifications(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::OutgoingCallerIdInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::OutgoingCallerIdList]
+      
       def outgoing_caller_ids(sid=:unset)
         self.account.outgoing_caller_ids(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this queue.
-      # @return [Twilio::REST::Api::V2010::AccountContext::QueueInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::QueueList]
+      
       def queues(sid=:unset)
         self.account.queues(sid)
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::RecordingInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::RecordingList]
+      
       def recordings(sid=:unset)
         self.account.recordings(sid)
       end
-
-      ##
-      # @param [String] sid The sid
-      # @return [Twilio::REST::Api::V2010::AccountContext::SigningKeyInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::SigningKeyList]
-      def signing_keys(sid=:unset)
-        self.account.signing_keys(sid)
+      
+      def sandbox
+        self.account.sandbox()
       end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::SipInstance]
+      
       def sip
         self.account.sip()
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ShortCodeInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::ShortCodeList]
-      def short_codes(sid=:unset)
-        self.account.short_codes(sid)
+      
+      def sms
+        self.account.sms()
       end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::TokenInstance]
+      
       def tokens
         self.account.tokens()
       end
-
-      ##
-      # @param [String] sid A 34 character string that uniquely identifies this
-      #   resource.
-      # @return [Twilio::REST::Api::V2010::AccountContext::TranscriptionInstance] if sid was passed.
-      # @return [Twilio::REST::Api::V2010::AccountContext::TranscriptionList]
+      
       def transcriptions(sid=:unset)
         self.account.transcriptions(sid)
       end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::UsageInstance]
+      
       def usage
         self.account.usage()
       end
-
-      ##
-      # @return [Twilio::REST::Api::V2010::AccountContext::ValidationRequestInstance]
+      
       def validation_requests
         self.account.validation_requests()
       end
-
+      
       ##
       # Provide a user friendly representation
       def to_s

data/lib/twilio-ruby/rest/api/v2010.rb

@@ -2,7 +2,7 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 module Twilio
   module REST
@@ -16,130 +16,111 @@ module Twilio
           @accounts = nil
           @account = nil
         end
-
-        ##
-        # @param [String] sid The Account Sid that uniquely identifies the account to
-        #   fetch
-        # @return [Twilio::REST::Api::V2010::AccountInstance] if sid was passed.
-        # @return [Twilio::REST::Api::V2010::AccountList]
+        
         def accounts(sid=:unset)
-          if sid.nil?
-            raise ArgumentError, 'sid cannot be nil'
-          elsif sid == :unset
+          if sid == :unset
             @accounts ||= AccountList.new self
           else
             AccountContext.new(self, sid)
           end
         end
-
+        
         ##
         # Account provided as the authenticating account
         def account
           @account ||= AccountContext.new(self, @domain.client.account_sid)
         end
-
+        
         ##
         # Setter to override the primary account
         def account=(value)
           @account = value
         end
-
+        
         def addresses(sid=:unset)
           self.account.addresses(sid)
         end
-
+        
         def applications(sid=:unset)
           self.account.applications(sid)
         end
-
+        
         def authorized_connect_apps(connect_app_sid=:unset)
           self.account.authorized_connect_apps(connect_app_sid)
         end
-
+        
         def available_phone_numbers(country_code=:unset)
           self.account.available_phone_numbers(country_code)
         end
-
+        
         def calls(sid=:unset)
           self.account.calls(sid)
         end
-
+        
         def conferences(sid=:unset)
           self.account.conferences(sid)
         end
-
+        
         def connect_apps(sid=:unset)
           self.account.connect_apps(sid)
         end
-
+        
         def incoming_phone_numbers(sid=:unset)
           self.account.incoming_phone_numbers(sid)
         end
-
-        def keys(sid=:unset)
-          self.account.keys(sid)
-        end
-
+        
         def messages(sid=:unset)
           self.account.messages(sid)
         end
-
-        def new_keys
-          self.account.new_keys()
-        end
-
-        def new_signing_keys
-          self.account.new_signing_keys()
-        end
-
+        
         def notifications(sid=:unset)
           self.account.notifications(sid)
         end
-
+        
         def outgoing_caller_ids(sid=:unset)
           self.account.outgoing_caller_ids(sid)
         end
-
+        
         def queues(sid=:unset)
           self.account.queues(sid)
         end
-
+        
         def recordings(sid=:unset)
           self.account.recordings(sid)
         end
-
-        def signing_keys(sid=:unset)
-          self.account.signing_keys(sid)
+        
+        def sandbox
+          self.account.sandbox()
         end
-
+        
         def sip
           self.account.sip()
         end
-
-        def short_codes(sid=:unset)
-          self.account.short_codes(sid)
+        
+        def sms
+          self.account.sms()
         end
-
+        
         def tokens
           self.account.tokens()
         end
-
+        
         def transcriptions(sid=:unset)
           self.account.transcriptions(sid)
         end
-
+        
         def usage
           self.account.usage()
         end
-
+        
         def validation_requests
           self.account.validation_requests()
         end
-
+        
         ##
         # Provide a user friendly representation
         def to_s
-          '<Twilio::REST::Api::V2010>'
+          #<Twilio::REST::Api::V2010>
         end
       end
     end

data/lib/twilio-ruby/rest/api/v2010/account.rb

@@ -2,7 +2,7 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 module Twilio
   module REST
@@ -12,38 +12,40 @@ module Twilio
           ##
           # Initialize the AccountList
           # @param [Version] version Version that contains the resource
+          
           # @return [AccountList] AccountList
           def initialize(version)
             super(version)
-
+            
             # Path Solution
             @solution = {}
             @uri = "/Accounts.json"
           end
-
+          
           ##
           # Retrieve a single page of AccountInstance records from the API.
           # Request is executed immediately.
           # @param [String] friendly_name A human readable description of the account to
           #   create, defaults to `SubAccount Created at {YYYY-MM-DD HH:MM meridian}`
+          
           # @return [AccountInstance] Newly created AccountInstance
-          def create(friendly_name: :unset)
-            data = Twilio::Values.of({
+          def create(friendly_name: nil)
+            data = {
                 'FriendlyName' => friendly_name,
-            })
-
+            }
+            
             payload = @version.create(
                 'POST',
                 @uri,
                 data: data
             )
-
-            AccountInstance.new(
+            
+            return AccountInstance.new(
                 @version,
                 payload,
             )
           end
-
+          
           ##
           # Lists AccountInstance records from the API as a list.
           # Unlike stream(), this operation is eager and will load `limit` records into
@@ -57,8 +59,9 @@ module Twilio
           #  the default value of 50 records.  If no page_size is                      defined
           #  but a limit is defined, stream() will attempt to read                      the
           #  limit with the most efficient page size,                      i.e. min(limit, 1000)
+          
           # @return [Array] Array of up to limit results
-          def list(friendly_name: :unset, status: :unset, limit: nil, page_size: nil)
+          def list(friendly_name: nil, status: nil, limit: nil, page_size: nil)
             self.stream(
                 friendly_name: friendly_name,
                 status: status,
@@ -66,7 +69,7 @@ module Twilio
                 page_size: page_size
             ).entries
           end
-
+          
           ##
           # Streams AccountInstance records from the API as an Enumerable.
           # This operation lazily loads records as efficiently as possible until the limit
@@ -80,35 +83,45 @@ module Twilio
           #  the default value of 50 records.                      If no page_size is defined
           #                       but a limit is defined, stream() will attempt to                      read the
           #  limit with the most efficient page size,                       i.e. min(limit, 1000)
+          
           # @return [Enumerable] Enumerable that will yield up to limit results
-          def stream(friendly_name: :unset, status: :unset, limit: nil, page_size: nil)
+          def stream(friendly_name: nil, status: nil, limit: nil, page_size: nil)
             limits = @version.read_limits(limit, page_size)
-
+            
             page = self.page(
                 friendly_name: friendly_name,
                 status: status,
-                page_size: limits[:page_size],
+                page_size: limits['page_size'],
             )
-
-            @version.stream(page, limit: limits[:limit], page_limit: limits[:page_limit])
+            
+            @version.stream(page, limit: limits['limit'], page_limit: limits['page_limit'])
           end
-
+          
           ##
           # When passed a block, yields AccountInstance records from the API.
           # This operation lazily loads records as efficiently as possible until the limit
           # is reached.
+          # @param [String] friendly_name Filter accounts where the friendly name exactly
+          #   matches the desired FriendlyName
+          # @param [account.Status] status Only show accounts with the given Status
+          # @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                       not set will use
+          #  the default value of 50 records.                      If no page_size is defined
+          #                       but a limit is defined, stream() will attempt to read the
+          #                       limit with the most efficient page size, i.e. min(limit, 1000)
           def each
             limits = @version.read_limits
-
+            
             page = self.page(
-                page_size: limits[:page_size],
+                page_size: limits['page_size'],
             )
-
+            
             @version.stream(page,
-                            limit: limits[:limit],
-                            page_limit: limits[:page_limit]).each {|x| yield x}
+                            limit: limits['limit'],
+                            page_limit: limits['page_limit']).each {|x| yield x}
           end
-
+          
           ##
           # Retrieve a single page of AccountInstance records from the API.
           # Request is executed immediately.
@@ -118,91 +131,95 @@ module Twilio
           # @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
+          
           # @return [Page] Page of AccountInstance
-          def page(friendly_name: :unset, status: :unset, page_token: :unset, page_number: :unset, page_size: :unset)
-            params = Twilio::Values.of({
+          def page(friendly_name: nil, status: nil, page_token: nil, page_number: nil, page_size: nil)
+            params = {
                 'FriendlyName' => friendly_name,
                 'Status' => status,
                 'PageToken' => page_token,
                 'Page' => page_number,
                 'PageSize' => page_size,
-            })
+            }
             response = @version.page(
                 'GET',
                 @uri,
                 params
             )
-            AccountPage.new(@version, response, @solution)
+            return AccountPage.new(@version, response, @solution)
           end
-
+          
           ##
-          # Retrieve a single page of AccountInstance records from the API.
-          # Request is executed immediately.
-          # @param [String] target_url API-generated URL for the requested results page
-          # @return [Page] Page of AccountInstance
-          def get_page(target_url)
-            response = @version.domain.request(
-                'GET',
-                target_url
+          # Constructs a AccountContext
+          # @param [String] sid The Account Sid that uniquely identifies the account to
+          #   fetch
+          
+          # @return [AccountContext] AccountContext
+          def get(sid)
+            AccountContext.new(
+                @version,
+                sid: sid,
             )
-            AccountPage.new(@version, response, @solution)
           end
-
+          
           ##
           # Provide a user friendly representation
           def to_s
             '#<Twilio.Api.V2010.AccountList>'
           end
         end
-
+      
         class AccountPage < Page
           ##
           # Initialize the AccountPage
           # @param [Version] version Version that contains the resource
           # @param [Response] response Response from the API
           # @param [Hash] solution Path solution for the resource
+          
           # @return [AccountPage] AccountPage
           def initialize(version, response, solution)
             super(version, response)
-
+            
             # Path Solution
             @solution = solution
           end
-
+          
           ##
           # Build an instance of AccountInstance
           # @param [Hash] payload Payload response from the API
+          
           # @return [AccountInstance] AccountInstance
           def get_instance(payload)
-            AccountInstance.new(
+            return AccountInstance.new(
                 @version,
                 payload,
             )
           end
-
+          
           ##
           # Provide a user friendly representation
           def to_s
             '<Twilio.Api.V2010.AccountPage>'
           end
         end
-
+      
         class AccountContext < InstanceContext
           ##
           # Initialize the AccountContext
           # @param [Version] version Version that contains the resource
           # @param [String] sid The Account Sid that uniquely identifies the account to
           #   fetch
+          
           # @return [AccountContext] AccountContext
           def initialize(version, sid)
             super(version)
-
+            
             # Path Solution
             @solution = {
                 sid: sid,
             }
             @uri = "/Accounts/#{@solution[:sid]}.json"
-
+            
             # Dependents
             @addresses = nil
             @applications = nil
@@ -212,75 +229,70 @@ module Twilio
             @conferences = nil
             @connect_apps = nil
             @incoming_phone_numbers = nil
-            @keys = nil
             @messages = nil
-            @new_keys = nil
-            @new_signing_keys = nil
             @notifications = nil
             @outgoing_caller_ids = nil
             @queues = nil
             @recordings = nil
-            @signing_keys = nil
+            @sandbox = nil
             @sip = nil
-            @short_codes = nil
+            @sms = nil
             @tokens = nil
             @transcriptions = nil
             @usage = nil
             @validation_requests = nil
           end
-
+          
           ##
           # Fetch a AccountInstance
           # @return [AccountInstance] Fetched AccountInstance
           def fetch
-            params = Twilio::Values.of({})
-
+            params = {}
+            
             payload = @version.fetch(
                 'GET',
                 @uri,
                 params,
             )
-
-            AccountInstance.new(
+            
+            return AccountInstance.new(
                 @version,
                 payload,
-                sid: @solution[:sid],
+                sid: @solution['sid'],
             )
           end
-
+          
           ##
           # Update the AccountInstance
           # @param [String] friendly_name Update the human-readable description of this
           #   Account
           # @param [account.Status] status Alter the status of this account with a given
           #   Status
+          
           # @return [AccountInstance] Updated AccountInstance
-          def update(friendly_name: :unset, status: :unset)
-            data = Twilio::Values.of({
+          def update(friendly_name: nil, status: nil)
+            data = {
                 'FriendlyName' => friendly_name,
                 'Status' => status,
-            })
-
+            }
+            
             payload = @version.update(
                 'POST',
                 @uri,
                 data: data,
             )
-
-            AccountInstance.new(
+            
+            return AccountInstance.new(
                 @version,
                 payload,
-                sid: @solution[:sid],
+                sid: @solution['sid'],
             )
           end
-
+          
           ##
           # Access the addresses
-          # @return [AddressList]
-          # @return [AddressContext] if sid was passed.
+          # @return [AddressList] AddressList
           def addresses(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return AddressContext.new(
                   @version,
@@ -288,24 +300,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @addresses
               @addresses = AddressList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @addresses
           end
-
+          
           ##
           # Access the applications
-          # @return [ApplicationList]
-          # @return [ApplicationContext] if sid was passed.
+          # @return [ApplicationList] ApplicationList
           def applications(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return ApplicationContext.new(
                   @version,
@@ -313,24 +322,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @applications
               @applications = ApplicationList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @applications
           end
-
+          
           ##
           # Access the authorized_connect_apps
-          # @return [AuthorizedConnectAppList]
-          # @return [AuthorizedConnectAppContext] if connect_app_sid was passed.
+          # @return [AuthorizedConnectAppList] AuthorizedConnectAppList
           def authorized_connect_apps(connect_app_sid=:unset)
-            raise ArgumentError, 'connect_app_sid cannot be nil' if connect_app_sid.nil?
-
             if connect_app_sid != :unset
               return AuthorizedConnectAppContext.new(
                   @version,
@@ -338,24 +344,21 @@ module Twilio
                   connect_app_sid,
               )
             end
-
+            
             unless @authorized_connect_apps
               @authorized_connect_apps = AuthorizedConnectAppList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @authorized_connect_apps
           end
-
+          
           ##
           # Access the available_phone_numbers
-          # @return [AvailablePhoneNumberCountryList]
-          # @return [AvailablePhoneNumberCountryContext] if country_code was passed.
+          # @return [AvailablePhoneNumberCountryList] AvailablePhoneNumberCountryList
           def available_phone_numbers(country_code=:unset)
-            raise ArgumentError, 'country_code cannot be nil' if country_code.nil?
-
             if country_code != :unset
               return AvailablePhoneNumberCountryContext.new(
                   @version,
@@ -363,24 +366,21 @@ module Twilio
                   country_code,
               )
             end
-
+            
             unless @available_phone_numbers
               @available_phone_numbers = AvailablePhoneNumberCountryList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @available_phone_numbers
           end
-
+          
           ##
           # Access the calls
-          # @return [CallList]
-          # @return [CallContext] if sid was passed.
+          # @return [CallList] CallList
           def calls(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return CallContext.new(
                   @version,
@@ -388,24 +388,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @calls
               @calls = CallList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @calls
           end
-
+          
           ##
           # Access the conferences
-          # @return [ConferenceList]
-          # @return [ConferenceContext] if sid was passed.
+          # @return [ConferenceList] ConferenceList
           def conferences(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return ConferenceContext.new(
                   @version,
@@ -413,24 +410,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @conferences
               @conferences = ConferenceList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @conferences
           end
-
+          
           ##
           # Access the connect_apps
-          # @return [ConnectAppList]
-          # @return [ConnectAppContext] if sid was passed.
+          # @return [ConnectAppList] ConnectAppList
           def connect_apps(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return ConnectAppContext.new(
                   @version,
@@ -438,24 +432,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @connect_apps
               @connect_apps = ConnectAppList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @connect_apps
           end
-
+          
           ##
           # Access the incoming_phone_numbers
-          # @return [IncomingPhoneNumberList]
-          # @return [IncomingPhoneNumberContext] if sid was passed.
+          # @return [IncomingPhoneNumberList] IncomingPhoneNumberList
           def incoming_phone_numbers(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return IncomingPhoneNumberContext.new(
                   @version,
@@ -463,49 +454,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @incoming_phone_numbers
               @incoming_phone_numbers = IncomingPhoneNumberList.new(
                   @version,
-                  account_sid: @solution[:sid],
+                  owner_account_sid: @solution[:sid],
               )
             end
-
+            
             @incoming_phone_numbers
           end
-
-          ##
-          # Access the keys
-          # @return [KeyList]
-          # @return [KeyContext] if sid was passed.
-          def keys(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
-            if sid != :unset
-              return KeyContext.new(
-                  @version,
-                  @solution[:sid],
-                  sid,
-              )
-            end
-
-            unless @keys
-              @keys = KeyList.new(
-                  @version,
-                  account_sid: @solution[:sid],
-              )
-            end
-
-            @keys
-          end
-
+          
           ##
           # Access the messages
-          # @return [MessageList]
-          # @return [MessageContext] if sid was passed.
+          # @return [MessageList] MessageList
           def messages(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return MessageContext.new(
                   @version,
@@ -513,54 +476,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @messages
               @messages = MessageList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @messages
           end
-
-          ##
-          # Access the new_keys
-          # @return [NewKeyList]
-          # @return [NewKeyContext]
-          def new_keys
-            unless @new_keys
-              @new_keys = NewKeyList.new(
-                  @version,
-                  account_sid: @solution[:sid],
-              )
-            end
-
-            @new_keys
-          end
-
-          ##
-          # Access the new_signing_keys
-          # @return [NewSigningKeyList]
-          # @return [NewSigningKeyContext]
-          def new_signing_keys
-            unless @new_signing_keys
-              @new_signing_keys = NewSigningKeyList.new(
-                  @version,
-                  account_sid: @solution[:sid],
-              )
-            end
-
-            @new_signing_keys
-          end
-
+          
           ##
           # Access the notifications
-          # @return [NotificationList]
-          # @return [NotificationContext] if sid was passed.
+          # @return [NotificationList] NotificationList
           def notifications(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return NotificationContext.new(
                   @version,
@@ -568,24 +498,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @notifications
               @notifications = NotificationList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @notifications
           end
-
+          
           ##
           # Access the outgoing_caller_ids
-          # @return [OutgoingCallerIdList]
-          # @return [OutgoingCallerIdContext] if sid was passed.
+          # @return [OutgoingCallerIdList] OutgoingCallerIdList
           def outgoing_caller_ids(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return OutgoingCallerIdContext.new(
                   @version,
@@ -593,24 +520,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @outgoing_caller_ids
               @outgoing_caller_ids = OutgoingCallerIdList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @outgoing_caller_ids
           end
-
+          
           ##
           # Access the queues
-          # @return [QueueList]
-          # @return [QueueContext] if sid was passed.
+          # @return [QueueList] QueueList
           def queues(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return QueueContext.new(
                   @version,
@@ -618,24 +542,21 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @queues
               @queues = QueueList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @queues
           end
-
+          
           ##
           # Access the recordings
-          # @return [RecordingList]
-          # @return [RecordingContext] if sid was passed.
+          # @return [RecordingList] RecordingList
           def recordings(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return RecordingContext.new(
                   @version,
@@ -643,46 +564,30 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @recordings
               @recordings = RecordingList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @recordings
           end
-
+          
           ##
-          # Access the signing_keys
-          # @return [SigningKeyList]
-          # @return [SigningKeyContext] if sid was passed.
-          def signing_keys(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
-            if sid != :unset
-              return SigningKeyContext.new(
-                  @version,
-                  @solution[:sid],
-                  sid,
-              )
-            end
-
-            unless @signing_keys
-              @signing_keys = SigningKeyList.new(
-                  @version,
-                  account_sid: @solution[:sid],
-              )
-            end
-
-            @signing_keys
+          # Access the sandbox
+          # @return [SandboxList] SandboxList
+          def sandbox
+            return SandboxContext.new(
+                @version,
+                @solution[:sid],
+            )
           end
-
+          
           ##
           # Access the sip
-          # @return [SipList]
-          # @return [SipContext]
+          # @return [SipList] SipList
           def sip
             unless @sip
               @sip = SipList.new(
@@ -690,39 +595,27 @@ module Twilio
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @sip
           end
-
+          
           ##
-          # Access the short_codes
-          # @return [ShortCodeList]
-          # @return [ShortCodeContext] if sid was passed.
-          def short_codes(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
-            if sid != :unset
-              return ShortCodeContext.new(
-                  @version,
-                  @solution[:sid],
-                  sid,
-              )
-            end
-
-            unless @short_codes
-              @short_codes = ShortCodeList.new(
+          # Access the sms
+          # @return [SmsList] SmsList
+          def sms
+            unless @sms
+              @sms = SmsList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
-            @short_codes
+            
+            @sms
           end
-
+          
           ##
           # Access the tokens
-          # @return [TokenList]
-          # @return [TokenContext]
+          # @return [TokenList] TokenList
           def tokens
             unless @tokens
               @tokens = TokenList.new(
@@ -730,17 +623,14 @@ module Twilio
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @tokens
           end
-
+          
           ##
           # Access the transcriptions
-          # @return [TranscriptionList]
-          # @return [TranscriptionContext] if sid was passed.
+          # @return [TranscriptionList] TranscriptionList
           def transcriptions(sid=:unset)
-            raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
             if sid != :unset
               return TranscriptionContext.new(
                   @version,
@@ -748,21 +638,20 @@ module Twilio
                   sid,
               )
             end
-
+            
             unless @transcriptions
               @transcriptions = TranscriptionList.new(
                   @version,
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @transcriptions
           end
-
+          
           ##
           # Access the usage
-          # @return [UsageList]
-          # @return [UsageContext]
+          # @return [UsageList] UsageList
           def usage
             unless @usage
               @usage = UsageList.new(
@@ -770,14 +659,13 @@ module Twilio
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @usage
           end
-
+          
           ##
           # Access the validation_requests
-          # @return [ValidationRequestList]
-          # @return [ValidationRequestContext]
+          # @return [ValidationRequestList] ValidationRequestList
           def validation_requests
             unless @validation_requests
               @validation_requests = ValidationRequestList.new(
@@ -785,10 +673,10 @@ module Twilio
                   account_sid: @solution[:sid],
               )
             end
-
+            
             @validation_requests
           end
-
+          
           ##
           # Provide a user friendly representation
           def to_s
@@ -796,7 +684,7 @@ module Twilio
             "#<Twilio.Api.V2010.AccountContext #{context}>"
           end
         end
-
+      
         class AccountInstance < InstanceResource
           ##
           # Initialize the AccountInstance
@@ -804,10 +692,11 @@ module Twilio
           # @param [Hash] payload payload that contains response from Twilio
           # @param [String] sid The Account Sid that uniquely identifies the account to
           #   fetch
+          
           # @return [AccountInstance] AccountInstance
           def initialize(version, payload, sid: nil)
             super(version)
-
+            
             # Marshaled Properties
             @properties = {
                 'auth_token' => payload['auth_token'],
@@ -821,17 +710,19 @@ module Twilio
                 'type' => payload['type'],
                 'uri' => payload['uri'],
             }
-
+            
             # Context
             @instance_context = nil
             @params = {
                 'sid' => sid || @properties['sid'],
             }
           end
-
+          
           ##
           # Generate an instance context for the instance, the context is capable of
           # performing various actions.  All instance actions are proxied to the context
+          # @param [Version] version Version that contains the resource
+          
           # @return [AccountContext] AccountContext for this AccountInstance
           def context
             unless @instance_context
@@ -842,254 +733,213 @@ module Twilio
             end
             @instance_context
           end
-
-          ##
-          # @return [String] The authorization token for this account
+          
           def auth_token
             @properties['auth_token']
           end
-
-          ##
-          # @return [Time] The date this account was created
+          
           def date_created
             @properties['date_created']
           end
-
-          ##
-          # @return [Time] The date this account was last updated
+          
           def date_updated
             @properties['date_updated']
           end
-
-          ##
-          # @return [String] A human readable description of this account
+          
           def friendly_name
             @properties['friendly_name']
           end
-
-          ##
-          # @return [String] The unique 34 character id representing the parent of this account
+          
           def owner_account_sid
             @properties['owner_account_sid']
           end
-
-          ##
-          # @return [String] A 34 character string that uniquely identifies this resource.
+          
           def sid
             @properties['sid']
           end
-
-          ##
-          # @return [account.Status] The status of this account
+          
           def status
             @properties['status']
           end
-
-          ##
-          # @return [String] Account Instance Subresources
+          
           def subresource_uris
             @properties['subresource_uris']
           end
-
-          ##
-          # @return [account.Type] The type of this account
+          
           def type
             @properties['type']
           end
-
-          ##
-          # @return [String] The URI for this resource, relative to `https://api.twilio.com`
+          
           def uri
             @properties['uri']
           end
-
+          
           ##
           # Fetch a AccountInstance
           # @return [AccountInstance] Fetched AccountInstance
           def fetch
-            context.fetch
+            @context.fetch()
           end
-
+          
           ##
           # Update the AccountInstance
           # @param [String] friendly_name Update the human-readable description of this
           #   Account
           # @param [account.Status] status Alter the status of this account with a given
           #   Status
+          
           # @return [AccountInstance] Updated AccountInstance
-          def update(friendly_name: :unset, status: :unset)
-            context.update(
-                friendly_name: friendly_name,
+          def update(friendly_name: nil, status: nil)
+            @context.update(
                 status: status,
             )
           end
-
+          
           ##
           # Access the addresses
           # @return [addresses] addresses
           def addresses
-            context.addresses
+            @context.addresses
           end
-
+          
           ##
           # Access the applications
           # @return [applications] applications
           def applications
-            context.applications
+            @context.applications
           end
-
+          
           ##
           # Access the authorized_connect_apps
           # @return [authorized_connect_apps] authorized_connect_apps
           def authorized_connect_apps
-            context.authorized_connect_apps
+            @context.authorized_connect_apps
           end
-
+          
           ##
           # Access the available_phone_numbers
           # @return [available_phone_numbers] available_phone_numbers
           def available_phone_numbers
-            context.available_phone_numbers
+            @context.available_phone_numbers
           end
-
+          
           ##
           # Access the calls
           # @return [calls] calls
           def calls
-            context.calls
+            @context.calls
           end
-
+          
           ##
           # Access the conferences
           # @return [conferences] conferences
           def conferences
-            context.conferences
+            @context.conferences
           end
-
+          
           ##
           # Access the connect_apps
           # @return [connect_apps] connect_apps
           def connect_apps
-            context.connect_apps
+            @context.connect_apps
           end
-
+          
           ##
           # Access the incoming_phone_numbers
           # @return [incoming_phone_numbers] incoming_phone_numbers
           def incoming_phone_numbers
-            context.incoming_phone_numbers
-          end
-
-          ##
-          # Access the keys
-          # @return [keys] keys
-          def keys
-            context.keys
+            @context.incoming_phone_numbers
           end
-
+          
           ##
           # Access the messages
           # @return [messages] messages
           def messages
-            context.messages
-          end
-
-          ##
-          # Access the new_keys
-          # @return [new_keys] new_keys
-          def new_keys
-            context.new_keys
-          end
-
-          ##
-          # Access the new_signing_keys
-          # @return [new_signing_keys] new_signing_keys
-          def new_signing_keys
-            context.new_signing_keys
+            @context.messages
           end
-
+          
           ##
           # Access the notifications
           # @return [notifications] notifications
           def notifications
-            context.notifications
+            @context.notifications
           end
-
+          
           ##
           # Access the outgoing_caller_ids
           # @return [outgoing_caller_ids] outgoing_caller_ids
           def outgoing_caller_ids
-            context.outgoing_caller_ids
+            @context.outgoing_caller_ids
           end
-
+          
           ##
           # Access the queues
           # @return [queues] queues
           def queues
-            context.queues
+            @context.queues
           end
-
+          
           ##
           # Access the recordings
           # @return [recordings] recordings
           def recordings
-            context.recordings
+            @context.recordings
           end
-
+          
           ##
-          # Access the signing_keys
-          # @return [signing_keys] signing_keys
-          def signing_keys
-            context.signing_keys
+          # Access the sandbox
+          # @return [sandbox] sandbox
+          def sandbox
+            @context.sandbox
           end
-
+          
           ##
           # Access the sip
           # @return [sip] sip
           def sip
-            context.sip
+            @context.sip
           end
-
+          
           ##
-          # Access the short_codes
-          # @return [short_codes] short_codes
-          def short_codes
-            context.short_codes
+          # Access the sms
+          # @return [sms] sms
+          def sms
+            @context.sms
           end
-
+          
           ##
           # Access the tokens
           # @return [tokens] tokens
           def tokens
-            context.tokens
+            @context.tokens
           end
-
+          
           ##
           # Access the transcriptions
           # @return [transcriptions] transcriptions
           def transcriptions
-            context.transcriptions
+            @context.transcriptions
           end
-
+          
           ##
           # Access the usage
           # @return [usage] usage
           def usage
-            context.usage
+            @context.usage
           end
-
+          
           ##
           # Access the validation_requests
           # @return [validation_requests] validation_requests
           def validation_requests
-            context.validation_requests
+            @context.validation_requests
           end
-
+          
           ##
           # Provide a user friendly representation
           def to_s
-            values = @params.map{|k, v| "#{k}: #{v}"}.join(" ")
-            "<Twilio.Api.V2010.AccountInstance #{values}>"
+            context = @params.map{|k, v| "#{k}: #{v}"}.join(" ")
+            "<Twilio.Api.V2010.AccountInstance #{context}>"
           end
         end
       end