twilio-ruby 5.0.0.alpha1 → 5.0.0.rc2

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

@@ -2,7 +2,7 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 module Twilio
   module REST
@@ -15,39 +15,37 @@ module Twilio
             # @param [Version] version Version that contains the resource
             # @param [String] account_sid A 34 character string that uniquely identifies this
             #   resource.
+            
             # @return [UsageList] UsageList
             def initialize(version, account_sid: nil)
               super(version)
-
+              
               # Path Solution
               @solution = {
                   account_sid: account_sid
               }
-
+              
               # Components
               @records = nil
               @triggers = nil
             end
-
+            
             ##
             # Access the records
-            # @return [RecordList]
-            # @return [RecordContext]
+            # @return [RecordList] RecordList
             def records
               @records ||= RecordList.new(
                   @version,
                   account_sid: @solution[:account_sid],
               )
             end
-
+            
             ##
             # Access the triggers
             # @param [String] sid The usage-trigger Sid that uniquely identifies this resource
-            # @return [TriggerList]
-            # @return [TriggerContext] if sid was passed.
+            
+            # @return [TriggerList] TriggerList
             def triggers(sid=:unset)
-              raise ArgumentError, 'sid cannot be nil' if sid.nil?
-
               if sid != :unset
                 return TriggerContext.new(
                     @version,
@@ -55,53 +53,57 @@ module Twilio
                     sid,
                 )
               end
-
+              
                 @triggers ||= TriggerList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
             end
-
+            
             ##
             # Provide a user friendly representation
             def to_s
               '#<Twilio.Api.V2010.UsageList>'
             end
           end
-
+        
           class UsagePage < Page
             ##
             # Initialize the UsagePage
             # @param [Version] version Version that contains the resource
             # @param [Response] response Response from the API
             # @param [Hash] solution Path solution for the resource
+            # @param [String] account_sid A 34 character string that uniquely identifies this
+            #   resource.
+            
             # @return [UsagePage] UsagePage
             def initialize(version, response, solution)
               super(version, response)
-
+              
               # Path Solution
               @solution = solution
             end
-
+            
             ##
             # Build an instance of UsageInstance
             # @param [Hash] payload Payload response from the API
+            
             # @return [UsageInstance] UsageInstance
             def get_instance(payload)
-              UsageInstance.new(
+              return UsageInstance.new(
                   @version,
                   payload,
-                  account_sid: @solution[:account_sid],
+                  account_sid: @solution['account_sid'],
               )
             end
-
+            
             ##
             # Provide a user friendly representation
             def to_s
               '<Twilio.Api.V2010.UsagePage>'
             end
           end
-
+        
           class UsageInstance < InstanceResource
             ##
             # Initialize the UsageInstance
@@ -109,11 +111,12 @@ module Twilio
             # @param [Hash] payload payload that contains response from Twilio
             # @param [String] account_sid A 34 character string that uniquely identifies this
             #   resource.
+            
             # @return [UsageInstance] UsageInstance
             def initialize(version, payload, account_sid: nil)
               super(version)
             end
-
+            
             ##
             # Provide a user friendly representation
             def to_s

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

@@ -2,7 +2,7 @@
 # This code was generated by
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
-#       /       /
+#       /       /       
 
 module Twilio
   module REST
@@ -16,16 +16,17 @@ module Twilio
               # @param [Version] version Version that contains the resource
               # @param [String] account_sid A 34 character string that uniquely identifies this
               #   resource.
+              
               # @return [RecordList] RecordList
               def initialize(version, account_sid: nil)
                 super(version)
-
+                
                 # Path Solution
                 @solution = {
                     account_sid: account_sid
                 }
                 @uri = "/Accounts/#{@solution[:account_sid]}/Usage/Records.json"
-
+                
                 # Components
                 @all_time = nil
                 @daily = nil
@@ -36,260 +37,265 @@ module Twilio
                 @yearly = nil
                 @yesterday = nil
               end
-
+              
               ##
               # Lists RecordInstance records from the API as a list.
               # Unlike stream(), this operation is eager and will load `limit` records into
               # memory before returning.
               # @param [yesterday.Category] category Only include usage of a given category
-              # @param [Date] start_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, StartDate=-30days, which will make StartDate 30
-              #   days before today
-              # @param [Date] end_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, EndDate=+30days, which will make EndDate 30 days
-              #   from today
+              # @param [Time] start_date_before Filter by start date
+              # @param [Time] start_date Filter by start date
+              # @param [Time] start_date_after: Filter by start date
+              # @param [Time] end_date_before Filter by end date
+              # @param [Time] end_date Filter by end date
+              # @param [Time] end_date_after: Filter by end date
               # @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)
+              
               # @return [Array] Array of up to limit results
-              def list(category: :unset, start_date: :unset, end_date: :unset, limit: nil, page_size: nil)
+              def list(category: nil, start_date_before: nil, start_date: nil, start_date_after: nil, end_date_before: nil, end_date: nil, end_date_after: nil, limit: nil, page_size: nil)
                 self.stream(
                     category: category,
+                    start_date_before: start_date_before,
                     start_date: start_date,
+                    start_date_after: start_date_after,
+                    end_date_before: end_date_before,
                     end_date: end_date,
+                    end_date_after: end_date_after,
                     limit: limit,
                     page_size: page_size
                 ).entries
               end
-
+              
               ##
               # Streams RecordInstance records from the API as an Enumerable.
               # This operation lazily loads records as efficiently as possible until the limit
               # is reached.
               # @param [yesterday.Category] category Only include usage of a given category
-              # @param [Date] start_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, StartDate=-30days, which will make StartDate 30
-              #   days before today
-              # @param [Date] end_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, EndDate=+30days, which will make EndDate 30 days
-              #   from today
+              # @param [Time] start_date_before Filter by start date
+              # @param [Time] start_date Filter by start date
+              # @param [Time] start_date_after: Filter by start date
+              # @param [Time] end_date_before Filter by end date
+              # @param [Time] end_date Filter by end date
+              # @param [Time] end_date_after: Filter by end date
               # @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)
+              
               # @return [Enumerable] Enumerable that will yield up to limit results
-              def stream(category: :unset, start_date: :unset, end_date: :unset, limit: nil, page_size: nil)
+              def stream(category: nil, start_date_before: nil, start_date: nil, start_date_after: nil, end_date_before: nil, end_date: nil, end_date_after: nil, limit: nil, page_size: nil)
                 limits = @version.read_limits(limit, page_size)
-
+                
                 page = self.page(
                     category: category,
+                    start_date_before: start_date_before,
                     start_date: start_date,
+                    start_date_after: start_date_after,
+                    end_date_before: end_date_before,
                     end_date: end_date,
-                    page_size: limits[:page_size],
+                    end_date_after: end_date_after,
+                    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 RecordInstance records from the API.
               # This operation lazily loads records as efficiently as possible until the limit
               # is reached.
+              # @param [yesterday.Category] category Only include usage of a given category
+              # @param [Time] start_date_before Filter by start date
+              # @param [Time] start_date Filter by start date
+              # @param [Time] start_date_after: Filter by start date
+              # @param [Time] end_date_before Filter by end date
+              # @param [Time] end_date Filter by end date
+              # @param [Time] end_date_after: Filter by end date
+              # @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 RecordInstance records from the API.
               # Request is executed immediately.
               # @param [yesterday.Category] category Only include usage of a given category
-              # @param [Date] start_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, StartDate=-30days, which will make StartDate 30
-              #   days before today
-              # @param [Date] end_date Only include usage that has occurred on or after this
-              #   date. Format is YYYY-MM-DD in GTM. As a convenience, you can also specify
-              #   offsets to today, for example, EndDate=+30days, which will make EndDate 30 days
-              #   from today
+              # @param [Time] start_date_before Filter by start date
+              # @param [Time] start_date Filter by start date
+              # @param [Time] start_date_after: Filter by start date
+              # @param [Time] end_date_before Filter by end date
+              # @param [Time] end_date Filter by end date
+              # @param [Time] end_date_after: Filter by end date
               # @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 RecordInstance
-              def page(category: :unset, start_date: :unset, end_date: :unset, page_token: :unset, page_number: :unset, page_size: :unset)
-                params = Twilio::Values.of({
+              def page(category: nil, start_date_before: nil, start_date: nil, start_date_after: nil, end_date_before: nil, end_date: nil, end_date_after: nil, page_token: nil, page_number: nil, page_size: nil)
+                params = {
                     'Category' => category,
-                    'StartDate' => Twilio.serialize_iso8601_date(start_date),
-                    'EndDate' => Twilio.serialize_iso8601_date(end_date),
+                    'StartDate<' => Twilio.serialize_iso8601(start_date_before),
+                    'StartDate' => Twilio.serialize_iso8601(start_date),
+                    'StartDate>' => Twilio.serialize_iso8601(start_date_after),
+                    'EndDate<' => Twilio.serialize_iso8601(end_date_before),
+                    'EndDate' => Twilio.serialize_iso8601(end_date),
+                    'EndDate>' => Twilio.serialize_iso8601(end_date_after),
                     'PageToken' => page_token,
                     'Page' => page_number,
                     'PageSize' => page_size,
-                })
+                }
                 response = @version.page(
                     'GET',
                     @uri,
                     params
                 )
-                RecordPage.new(@version, response, @solution)
+                return RecordPage.new(@version, response, @solution)
               end
-
-              ##
-              # Retrieve a single page of RecordInstance records from the API.
-              # Request is executed immediately.
-              # @param [String] target_url API-generated URL for the requested results page
-              # @return [Page] Page of RecordInstance
-              def get_page(target_url)
-                response = @version.domain.request(
-                    'GET',
-                    target_url
-                )
-                RecordPage.new(@version, response, @solution)
-              end
-
+              
               ##
               # Access the all_time
-              # @return [AllTimeList]
-              # @return [AllTimeContext]
+              # @return [AllTimeList] AllTimeList
               def all_time
                 @all_time ||= AllTimeList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the daily
-              # @return [DailyList]
-              # @return [DailyContext]
+              # @return [DailyList] DailyList
               def daily
                 @daily ||= DailyList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the last_month
-              # @return [LastMonthList]
-              # @return [LastMonthContext]
+              # @return [LastMonthList] LastMonthList
               def last_month
                 @last_month ||= LastMonthList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the monthly
-              # @return [MonthlyList]
-              # @return [MonthlyContext]
+              # @return [MonthlyList] MonthlyList
               def monthly
                 @monthly ||= MonthlyList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the this_month
-              # @return [ThisMonthList]
-              # @return [ThisMonthContext]
+              # @return [ThisMonthList] ThisMonthList
               def this_month
                 @this_month ||= ThisMonthList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the today
-              # @return [TodayList]
-              # @return [TodayContext]
+              # @return [TodayList] TodayList
               def today
                 @today ||= TodayList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the yearly
-              # @return [YearlyList]
-              # @return [YearlyContext]
+              # @return [YearlyList] YearlyList
               def yearly
                 @yearly ||= YearlyList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Access the yesterday
-              # @return [YesterdayList]
-              # @return [YesterdayContext]
+              # @return [YesterdayList] YesterdayList
               def yesterday
                 @yesterday ||= YesterdayList.new(
                     @version,
                     account_sid: @solution[:account_sid],
                 )
               end
-
+              
               ##
               # Provide a user friendly representation
               def to_s
                 '#<Twilio.Api.V2010.RecordList>'
               end
             end
-
+          
             class RecordPage < Page
               ##
               # Initialize the RecordPage
               # @param [Version] version Version that contains the resource
               # @param [Response] response Response from the API
               # @param [Hash] solution Path solution for the resource
+              # @param [String] account_sid A 34 character string that uniquely identifies this
+              #   resource.
+              
               # @return [RecordPage] RecordPage
               def initialize(version, response, solution)
                 super(version, response)
-
+                
                 # Path Solution
                 @solution = solution
               end
-
+              
               ##
               # Build an instance of RecordInstance
               # @param [Hash] payload Payload response from the API
+              
               # @return [RecordInstance] RecordInstance
               def get_instance(payload)
-                RecordInstance.new(
+                return RecordInstance.new(
                     @version,
                     payload,
-                    account_sid: @solution[:account_sid],
+                    account_sid: @solution['account_sid'],
                 )
               end
-
+              
               ##
               # Provide a user friendly representation
               def to_s
                 '<Twilio.Api.V2010.RecordPage>'
               end
             end
-
+          
             class RecordInstance < InstanceResource
               ##
               # Initialize the RecordInstance
@@ -297,10 +303,11 @@ module Twilio
               # @param [Hash] payload payload that contains response from Twilio
               # @param [String] account_sid A 34 character string that uniquely identifies this
               #   resource.
+              
               # @return [RecordInstance] RecordInstance
               def initialize(version, payload, account_sid: nil)
                 super(version)
-
+                
                 # Marshaled Properties
                 @properties = {
                     'account_sid' => payload['account_sid'],
@@ -309,101 +316,73 @@ module Twilio
                     'count' => payload['count'],
                     'count_unit' => payload['count_unit'],
                     'description' => payload['description'],
-                    'end_date' => Twilio.deserialize_iso8601_date(payload['end_date']),
+                    'end_date' => Twilio.deserialize_iso8601(payload['end_date']),
                     'price' => payload['price'].to_f,
                     'price_unit' => payload['price_unit'],
-                    'start_date' => Twilio.deserialize_iso8601_date(payload['start_date']),
+                    'start_date' => Twilio.deserialize_iso8601(payload['start_date']),
                     'subresource_uris' => payload['subresource_uris'],
                     'uri' => payload['uri'],
                     'usage' => payload['usage'],
                     'usage_unit' => payload['usage_unit'],
                 }
               end
-
-              ##
-              # @return [String] The Account that accrued the usage
+              
               def account_sid
                 @properties['account_sid']
               end
-
-              ##
-              # @return [String] The api_version
+              
               def api_version
                 @properties['api_version']
               end
-
-              ##
-              # @return [yesterday.Category] The category of usage
+              
               def category
                 @properties['category']
               end
-
-              ##
-              # @return [String] The number of usage events (e.g. the number of calls).
+              
               def count
                 @properties['count']
               end
-
-              ##
-              # @return [String] The unit in which `Count` is measured
+              
               def count_unit
                 @properties['count_unit']
               end
-
-              ##
-              # @return [String] A human-readable description of the usage category.
+              
               def description
                 @properties['description']
               end
-
-              ##
-              # @return [Date] The last date usage is included in this record
+              
               def end_date
                 @properties['end_date']
               end
-
-              ##
-              # @return [String] The total price of the usage
+              
               def price
                 @properties['price']
               end
-
-              ##
-              # @return [String] The currency in which `Price` is measured
+              
               def price_unit
                 @properties['price_unit']
               end
-
-              ##
-              # @return [Date] The first date usage is included in this record
+              
               def start_date
                 @properties['start_date']
               end
-
-              ##
-              # @return [String] Subresources Uris for this UsageRecord
+              
               def subresource_uris
                 @properties['subresource_uris']
               end
-
-              ##
-              # @return [String] The URI for this resource
+              
               def uri
                 @properties['uri']
               end
-
-              ##
-              # @return [String] The amount of usage
+              
               def usage
                 @properties['usage']
               end
-
-              ##
-              # @return [String] The units in which `Usage` is measured
+              
               def usage_unit
                 @properties['usage_unit']
               end
-
+              
               ##
               # Provide a user friendly representation
               def to_s